fix: fix csv reading structure

Author: Hendrik Leuschner

ors-benchmark/src/main/java/org/heigit/ors/benchmark/BenchmarkEnums.java

@@ -7,6 +7,8 @@ public class BenchmarkEnums {
 
     // Constant for preference
     public static final String PREFERENCE = "preference";
+    public static final String METRICS = "metrics";
+    public static final String DURATION = "duration";
     // Constant for recommended
     public static final String RECOMMENDED = "recommended";
     public static final String OPTIONS = "options";
@@ -95,7 +97,7 @@ public static MatrixModes fromString(String value) {
 
         public List<String> getProfiles() {
             return switch (this) {
-                case ALGO_DIJKSTRA_MATRIX, ALGO_CORE_MATRIX, ALGO_RPHAST_MATRIX -> List.of("driving-car", "driving-hgv", "cycling-regular", "foot-walking");
+                case ALGO_DIJKSTRA_MATRIX, ALGO_CORE_MATRIX, ALGO_RPHAST_MATRIX -> List.of("driving-car");//, "driving-hgv", "cycling-regular", "foot-walking");
             };
         }
         /**
@@ -109,11 +111,11 @@ public List<String> getProfiles() {
          */
         public Map<String, Object> getRequestParams() {
             return switch (this) {
-                case ALGO_RPHAST_MATRIX -> Map.of(PREFERENCE, RECOMMENDED);
-                case ALGO_CORE_MATRIX -> Map.of(PREFERENCE,
-                        RECOMMENDED, OPTIONS, Map.of("dynamic_speeds", "true"));
-                case ALGO_DIJKSTRA_MATRIX -> Map.of(PREFERENCE,
-                        RECOMMENDED, OPTIONS, List.of(Map.of("dynamic_speeds", "false"), Map.of("avoid_features", List.of("ferries"))));
+                case ALGO_RPHAST_MATRIX -> Map.of(METRICS, List.of(DURATION));
+                case ALGO_CORE_MATRIX -> Map.of(METRICS,
+                        List.of(DURATION), OPTIONS, Map.of("dynamic_speeds", "true"));
+                case ALGO_DIJKSTRA_MATRIX -> Map.of(METRICS,
+                        List.of(DURATION), OPTIONS, Map.of("dynamic_speeds", "false", "avoid_features", List.of("ferries")));
 
             };
         }

ors-benchmark/src/main/java/org/heigit/ors/benchmark/Config.java

@@ -156,7 +156,7 @@ public List<DirectionsModes> getDirectionsModes() {
 
     public List<MatrixModes> getMatrixModes() {
         return matrixModes.isEmpty() ? List.of(ALGO_DIJKSTRA_MATRIX, ALGO_CORE_MATRIX, ALGO_RPHAST_MATRIX)
-                : directionsModes.stream()
+                : matrixModes.stream()
                 .map(MatrixModes::fromString)
                 .toList();
     }

ors-benchmark/src/main/java/org/heigit/ors/benchmark/MatrixAlgorithmLoadTest.java

@@ -1,6 +1,7 @@
 package org.heigit.ors.benchmark;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import io.gatling.javaapi.core.PopulationBuilder;
 import io.gatling.javaapi.core.ScenarioBuilder;
 import io.gatling.javaapi.core.Session;
@@ -11,6 +12,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -116,7 +118,6 @@ private String formatScenarioName(MatrixModes mode, String profile, boolean isPa
      * 
      * @param name       descriptive name for the scenario
      * @param sourceFile path to CSV file containing test coordinates
-     * @param config     test configuration parameters
      * @param mode       matrix calculation mode to test
      * @param profile    routing profile to test
      * @return ScenarioBuilder configured for matrix testing
@@ -156,117 +157,78 @@ private static HttpRequestActionBuilder createRequest(String name, MatrixModes m
             String profile) {
         return http(name)
                 .post("/v2/matrix/" + profile)
+                .header("Accept", "application/json;charset=UTF-8")
                 .body(StringBody(session -> createRequestBody(session, mode)))
                 .asJson()
                 .check(status().is(200));
     }
 
     /**
      * Creates the JSON request body for matrix API calls from CSV session data.
-     * 
+     *
      * @param session Gatling session containing CSV row data
      * @param mode    matrix calculation mode providing additional parameters
      * @return JSON string representation of the request body
-     * @throws RequestBodyCreationException if JSON serialization fails
+     * @throws RequestBodyCreationException if JSON serialization fails or data is missing
      */
     static String createRequestBody(Session session, MatrixModes mode) {
         try {
-            // Get the data from the CSV row
-            String coordinatesStr = (String) session.get("coordinates");
-            String sourcesStr = (String) session.get("sources");
-            String destinationsStr = (String) session.get("destinations");
-
-            Map<String, Object> requestBody = new java.util.HashMap<>(Map.of(
-                    "locations", parseCoordinatesFromString(coordinatesStr),
-                    "sources", parseIntegerArrayFromString(sourcesStr),
-                    "destinations", parseIntegerArrayFromString(destinationsStr)));
-
-            requestBody.putAll(mode.getRequestParams());
-            return objectMapper.writeValueAsString(requestBody);
-        } catch (JsonProcessingException e) {
-            throw new RequestBodyCreationException("Failed to create request body", e);
-        }
-    }
-
-    /**
-     * Parses coordinate pairs from CSV string format to nested list structure.
-     * 
-     * Converts strings like "[[8.695556, 49.392701], [8.684623, 49.398284]]"
-     * into List<List<Double>> format expected by the matrix API.
-     * 
-     * @param coordinatesStr string representation of coordinate array from CSV
-     * @return list of coordinate pairs as [longitude, latitude] arrays
-     * @throws RequestBodyCreationException if parsing fails or format is invalid
-     */
-    static List<List<Double>> parseCoordinatesFromString(String coordinatesStr) {
-        try {
-            if (coordinatesStr == null || coordinatesStr.trim().isEmpty()) {
-                throw new RequestBodyCreationException("Coordinates string is null or empty");
+            // 1) Retrieve the raw feeder values. Gatling will give us a List<String> for each column.
+            @SuppressWarnings("unchecked")
+            List<String> coordsList = (List<String>) session.get("coordinates");
+            @SuppressWarnings("unchecked")
+            List<String> sourcesList = (List<String>) session.get("sources");
+            @SuppressWarnings("unchecked")
+            List<String> destsList = (List<String>) session.get("destinations");
+
+            // 2) Fail fast if any column is missing or empty
+            if (coordsList == null || coordsList.isEmpty()) {
+                throw new RequestBodyCreationException("'coordinates' field is missing or empty in session");
             }
-
-            // Remove quotes if present
-            String cleaned = coordinatesStr.trim();
-            if (cleaned.startsWith("\"") && cleaned.endsWith("\"")) {
-                cleaned = cleaned.substring(1, cleaned.length() - 1);
+            if (sourcesList == null || sourcesList.isEmpty()) {
+                throw new RequestBodyCreationException("'sources' field is missing or empty in session");
             }
-
-            // Remove outer brackets
-            cleaned = cleaned.substring(2, cleaned.length() - 2);
-            String[] coordinatePairs = cleaned.split("\\], \\[");
-
-            List<List<Double>> locations = new ArrayList<>();
-            for (String pair : coordinatePairs) {
-                String[] values = pair.split(", ");
-                if (values.length != 2) {
-                    throw new RequestBodyCreationException("Invalid coordinate pair: " + pair);
-                }
-                double lon = Double.parseDouble(values[0]);
-                double lat = Double.parseDouble(values[1]);
-                locations.add(List.of(lon, lat));
-            }
-            return locations;
-        } catch (Exception e) {
-            throw new RequestBodyCreationException("Failed to parse coordinates: " + coordinatesStr, e);
-        }
-    }
-
-    /**
-     * Parses integer arrays from CSV string format.
-     * 
-     * Converts strings like "[0, 1, 2]" into List<Integer> format
-     * for sources and destinations parameters.
-     * 
-     * @param arrayStr string representation of integer array from CSV
-     * @return list of integers
-     * @throws RequestBodyCreationException if parsing fails or format is invalid
-     */
-    static List<Integer> parseIntegerArrayFromString(String arrayStr) {
-        try {
-            if (arrayStr == null || arrayStr.trim().isEmpty()) {
-                throw new RequestBodyCreationException("Array string is null or empty");
-            }
-
-            // Remove quotes if present
-            String cleaned = arrayStr.trim();
-            if (cleaned.startsWith("\"") && cleaned.endsWith("\"")) {
-                cleaned = cleaned.substring(1, cleaned.length() - 1);
+            if (destsList == null || destsList.isEmpty()) {
+                throw new RequestBodyCreationException("'destinations' field is missing or empty in session");
             }
 
-            // Remove brackets
-            cleaned = cleaned.substring(1, cleaned.length() - 1);
+            // 3) The first element of each List<String> is the actual JSON‐style value.
+            String coordinatesJson = coordsList.get(0);
+            String sourcesJson     = sourcesList.get(0);
+            String destsJson       = destsList.get(0);
+
+            logger.debug(
+                    "Raw CSV values → coordinatesJson: {}, sourcesJson: {}, destsJson: {}",
+                    coordinatesJson, sourcesJson, destsJson
+            );
+
+            // 4) Let Jackson parse "[[lon, lat], [lon, lat], …]" into List<List<Double>>
+            List<List<Double>> locations = objectMapper.readValue(
+                    coordinatesJson, new TypeReference<List<List<Double>>>() {}
+            );
+
+            // 5) Similarly parse "[0, 1, 2]" into List<Integer>
+            List<Integer> sources = objectMapper.readValue(
+                    sourcesJson, new TypeReference<List<Integer>>() {}
+            );
+            List<Integer> destinations = objectMapper.readValue(
+                    destsJson, new TypeReference<List<Integer>>() {}
+            );
+
+            // 6) Build the request body map and merge in any extra params from MatrixModes
+            Map<String, Object> requestBody = new HashMap<>(Map.of(
+                    "locations",    locations,
+                    "sources",      sources,
+                    "destinations", destinations
+            ));
+            requestBody.putAll(mode.getRequestParams());
 
-            if (cleaned.trim().isEmpty()) {
-                return new ArrayList<>();
-            }
+            // 7) Serialize to JSON and return
+            return objectMapper.writeValueAsString(requestBody);
 
-            String[] values = cleaned.split(", ");
-            List<Integer> result = new ArrayList<>();
-            for (String value : values) {
-                result.add(Integer.parseInt(value.trim()));
-            }
-            return result;
-        } catch (Exception e) {
-            throw new RequestBodyCreationException("Failed to parse integer array: " + arrayStr, e);
+        } catch (JsonProcessingException e) {
+            // Jackson failed to parse or serialize
+            throw new RequestBodyCreationException("Failed to serialize request body to JSON", e);
         }
     }
 }