From 9fbc2f3a14d00733cc05a9edc5294ebf32b77a1c Mon Sep 17 00:00:00 2001 From: js0ny Date: Sat, 22 Nov 2025 23:47:00 +0000 Subject: [PATCH] refractor: lint --- .../controller/DroneController.java | 4 ++-- .../service/DroneInfoService.java | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/github/js0ny/ilp_coursework/controller/DroneController.java b/src/main/java/io/github/js0ny/ilp_coursework/controller/DroneController.java index 84e1e28..4dabb58 100644 --- a/src/main/java/io/github/js0ny/ilp_coursework/controller/DroneController.java +++ b/src/main/java/io/github/js0ny/ilp_coursework/controller/DroneController.java @@ -89,8 +89,8 @@ public class DroneController { } @PostMapping("/queryAvailableDrones") - public int[] queryAvailableDrones(@RequestBody MedDispathRecDto[] records) { - return new int[] {}; + public String[] queryAvailableDrones(@RequestBody MedDispathRecDto[] records) { + return droneService.dronesMatchesRequirements(records); } @PostMapping("/calcDeliveryPath") diff --git a/src/main/java/io/github/js0ny/ilp_coursework/service/DroneInfoService.java b/src/main/java/io/github/js0ny/ilp_coursework/service/DroneInfoService.java index 99508d5..7acb2c7 100644 --- a/src/main/java/io/github/js0ny/ilp_coursework/service/DroneInfoService.java +++ b/src/main/java/io/github/js0ny/ilp_coursework/service/DroneInfoService.java @@ -2,6 +2,7 @@ package io.github.js0ny.ilp_coursework.service; import io.github.js0ny.ilp_coursework.data.AttrComparatorDto; import io.github.js0ny.ilp_coursework.data.DroneDto; +import io.github.js0ny.ilp_coursework.data.MedDispathRecDto; import io.github.js0ny.ilp_coursework.util.AttrOperator; import static io.github.js0ny.ilp_coursework.util.AttrComparator.isValueMatched; @@ -48,7 +49,7 @@ public class DroneInfoService { * * @param state determines the capability filtering * @return if {@code state} is true, return ids of drones with cooling - * capability, else without cooling + * capability, else without cooling * @see io.github.js0ny.ilp_coursework.controller.DroneController#getDronesWithCoolingCapability(boolean) */ public String[] dronesWithCooling(boolean state) { @@ -58,7 +59,7 @@ public class DroneInfoService { DroneDto[].class); if (drones == null) { - return new String[]{}; + return new String[] {}; } return Arrays.stream(drones) @@ -119,7 +120,8 @@ public class DroneInfoService { } /** - * Return an array of ids of drones which matches all given complex comparing rules + * Return an array of ids of drones which matches all given complex comparing + * rules * * @param attrComparators The filter rule with Name, Value and Operator * @return array of drone ids that matches all rules @@ -139,7 +141,7 @@ public class DroneInfoService { } } if (matchingDroneIds == null) { - return new String[]{}; + return new String[] {}; } return matchingDroneIds.toArray(String[]::new); } @@ -155,10 +157,10 @@ public class DroneInfoService { * @param attrVal the attribute value to filter on * @param op the comparison operator * @return array of drone ids matching the attribute name and value (filtered by - * {@code op}) + * {@code op}) * @see io.github.js0ny.ilp_coursework.util.AttrComparator#isValueMatched(JsonNode, - * String, - * AttrOperator) + * String, + * AttrOperator) */ private String[] dronesWithAttributeCompared(String attrName, String attrVal, AttrOperator op) { URI droneUrl = URI.create(baseUrl).resolve(dronesEndpoint); @@ -168,7 +170,7 @@ public class DroneInfoService { DroneDto[].class); if (drones == null) { - return new String[]{}; + return new String[] {}; } // Use Jackson's ObjectMapper to convert DroneDto to JsonNode for dynamic @@ -190,7 +192,7 @@ public class DroneInfoService { .toArray(String[]::new); } - public int[] dronesMatchesRequirements() { - return new int[]{}; + public String[] dronesMatchesRequirements(MedDispathRecDto[] rec) { + return new String[] {}; } }