From 15b342edffaec09a197704383a317d4da8a66580 Mon Sep 17 00:00:00 2001 From: litoral05 Date: Tue, 19 May 2026 17:19:58 +0100 Subject: [PATCH] Organize acquisition package structure --- .../backend/acquisition/AcquisitionController.java | 5 +++++ .../backend/acquisition/{ => block}/AcquisitionBlock.java | 2 +- .../acquisition/{ => block}/AcquisitionBlockPlanner.java | 4 +++- .../backend/acquisition/{ => block}/BlockPollingService.java | 5 ++++- .../acquisition/{ => capability}/ControllerCapabilities.java | 2 +- .../{ => capability}/ControllerCapabilitiesController.java | 2 +- .../{ => capability}/ControllerCapabilitiesReader.java | 3 ++- .../backend/acquisition/{ => plan}/AcquisitionPlan.java | 2 +- .../acquisition/{ => plan}/AcquisitionPlanBuilder.java | 5 ++++- .../acquisition/{ => polling}/AcquisitionPollResult.java | 2 +- .../acquisition/{ => polling}/AcquisitionPollingService.java | 5 ++++- .../acquisition/{ => telemetry}/SensorTelemetryReader.java | 4 +++- .../backend/acquisition/{ => telemetry}/TelemetryCache.java | 2 +- .../acquisition/{ => telemetry}/TelemetryController.java | 2 +- .../acquisition/{ => telemetry}/TelemetrySnapshot.java | 2 +- 15 files changed, 33 insertions(+), 14 deletions(-) rename src/main/java/com/litoralregas/backend/acquisition/{ => block}/AcquisitionBlock.java (74%) rename src/main/java/com/litoralregas/backend/acquisition/{ => block}/AcquisitionBlockPlanner.java (93%) rename src/main/java/com/litoralregas/backend/acquisition/{ => block}/BlockPollingService.java (94%) rename src/main/java/com/litoralregas/backend/acquisition/{ => capability}/ControllerCapabilities.java (86%) rename src/main/java/com/litoralregas/backend/acquisition/{ => capability}/ControllerCapabilitiesController.java (91%) rename src/main/java/com/litoralregas/backend/acquisition/{ => capability}/ControllerCapabilitiesReader.java (92%) rename src/main/java/com/litoralregas/backend/acquisition/{ => plan}/AcquisitionPlan.java (87%) rename src/main/java/com/litoralregas/backend/acquisition/{ => plan}/AcquisitionPlanBuilder.java (92%) rename src/main/java/com/litoralregas/backend/acquisition/{ => polling}/AcquisitionPollResult.java (84%) rename src/main/java/com/litoralregas/backend/acquisition/{ => polling}/AcquisitionPollingService.java (84%) rename src/main/java/com/litoralregas/backend/acquisition/{ => telemetry}/SensorTelemetryReader.java (93%) rename src/main/java/com/litoralregas/backend/acquisition/{ => telemetry}/TelemetryCache.java (94%) rename src/main/java/com/litoralregas/backend/acquisition/{ => telemetry}/TelemetryController.java (94%) rename src/main/java/com/litoralregas/backend/acquisition/{ => telemetry}/TelemetrySnapshot.java (82%) diff --git a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionController.java b/src/main/java/com/litoralregas/backend/acquisition/AcquisitionController.java index 1128384..30b3569 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionController.java +++ b/src/main/java/com/litoralregas/backend/acquisition/AcquisitionController.java @@ -1,5 +1,10 @@ package com.litoralregas.backend.acquisition; +import com.litoralregas.backend.acquisition.block.BlockPollingService; +import com.litoralregas.backend.acquisition.plan.AcquisitionPlan; +import com.litoralregas.backend.acquisition.plan.AcquisitionPlanBuilder; +import com.litoralregas.backend.acquisition.polling.AcquisitionPollResult; +import com.litoralregas.backend.acquisition.polling.AcquisitionPollingService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionBlock.java b/src/main/java/com/litoralregas/backend/acquisition/block/AcquisitionBlock.java similarity index 74% rename from src/main/java/com/litoralregas/backend/acquisition/AcquisitionBlock.java rename to src/main/java/com/litoralregas/backend/acquisition/block/AcquisitionBlock.java index 2984ee4..ef4f465 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionBlock.java +++ b/src/main/java/com/litoralregas/backend/acquisition/block/AcquisitionBlock.java @@ -1,4 +1,4 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.block; import java.util.List; diff --git a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionBlockPlanner.java b/src/main/java/com/litoralregas/backend/acquisition/block/AcquisitionBlockPlanner.java similarity index 93% rename from src/main/java/com/litoralregas/backend/acquisition/AcquisitionBlockPlanner.java rename to src/main/java/com/litoralregas/backend/acquisition/block/AcquisitionBlockPlanner.java index f910a97..893ae73 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionBlockPlanner.java +++ b/src/main/java/com/litoralregas/backend/acquisition/block/AcquisitionBlockPlanner.java @@ -1,5 +1,7 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.block; +import com.litoralregas.backend.acquisition.plan.AcquisitionPlan; +import com.litoralregas.backend.acquisition.plan.AcquisitionPlanBuilder; import com.litoralregas.backend.sensor.SensorDefinition; import com.litoralregas.backend.sensor.SensorDefinitionRepository; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/litoralregas/backend/acquisition/BlockPollingService.java b/src/main/java/com/litoralregas/backend/acquisition/block/BlockPollingService.java similarity index 94% rename from src/main/java/com/litoralregas/backend/acquisition/BlockPollingService.java rename to src/main/java/com/litoralregas/backend/acquisition/block/BlockPollingService.java index bcc02f3..e93275f 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/BlockPollingService.java +++ b/src/main/java/com/litoralregas/backend/acquisition/block/BlockPollingService.java @@ -1,5 +1,8 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.block; +import com.litoralregas.backend.acquisition.polling.AcquisitionPollResult; +import com.litoralregas.backend.acquisition.telemetry.TelemetryCache; +import com.litoralregas.backend.acquisition.telemetry.TelemetrySnapshot; import com.litoralregas.backend.modbus.LrModbusClient; import com.litoralregas.backend.modbus.ModbusReadResult; import com.litoralregas.backend.modbus.ModbusUnit; diff --git a/src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilities.java b/src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilities.java similarity index 86% rename from src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilities.java rename to src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilities.java index f979d58..3808e33 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilities.java +++ b/src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilities.java @@ -1,4 +1,4 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.capability; import java.time.Instant; diff --git a/src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilitiesController.java b/src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilitiesController.java similarity index 91% rename from src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilitiesController.java rename to src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilitiesController.java index aa40a25..c6e9ec6 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilitiesController.java +++ b/src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilitiesController.java @@ -1,4 +1,4 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.capability; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilitiesReader.java b/src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilitiesReader.java similarity index 92% rename from src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilitiesReader.java rename to src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilitiesReader.java index f38ce85..2837fd3 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/ControllerCapabilitiesReader.java +++ b/src/main/java/com/litoralregas/backend/acquisition/capability/ControllerCapabilitiesReader.java @@ -1,5 +1,6 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.capability; +import com.litoralregas.backend.acquisition.capability.ControllerCapabilities; import com.litoralregas.backend.modbus.LrModbusClient; import com.litoralregas.backend.modbus.ModbusReadResult; import com.litoralregas.backend.modbus.ModbusUnit; diff --git a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionPlan.java b/src/main/java/com/litoralregas/backend/acquisition/plan/AcquisitionPlan.java similarity index 87% rename from src/main/java/com/litoralregas/backend/acquisition/AcquisitionPlan.java rename to src/main/java/com/litoralregas/backend/acquisition/plan/AcquisitionPlan.java index eb92bbd..ab2fefb 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionPlan.java +++ b/src/main/java/com/litoralregas/backend/acquisition/plan/AcquisitionPlan.java @@ -1,4 +1,4 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.plan; import java.time.Instant; import java.util.List; diff --git a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionPlanBuilder.java b/src/main/java/com/litoralregas/backend/acquisition/plan/AcquisitionPlanBuilder.java similarity index 92% rename from src/main/java/com/litoralregas/backend/acquisition/AcquisitionPlanBuilder.java rename to src/main/java/com/litoralregas/backend/acquisition/plan/AcquisitionPlanBuilder.java index f4ea34e..026a06a 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionPlanBuilder.java +++ b/src/main/java/com/litoralregas/backend/acquisition/plan/AcquisitionPlanBuilder.java @@ -1,5 +1,8 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.plan; +import com.litoralregas.backend.acquisition.capability.ControllerCapabilities; +import com.litoralregas.backend.acquisition.capability.ControllerCapabilitiesReader; +import com.litoralregas.backend.acquisition.plan.AcquisitionPlan; import com.litoralregas.backend.sensor.SensorDefinition; import com.litoralregas.backend.sensor.SensorDefinitionRepository; import com.litoralregas.backend.sensor.SensorSourceType; diff --git a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionPollResult.java b/src/main/java/com/litoralregas/backend/acquisition/polling/AcquisitionPollResult.java similarity index 84% rename from src/main/java/com/litoralregas/backend/acquisition/AcquisitionPollResult.java rename to src/main/java/com/litoralregas/backend/acquisition/polling/AcquisitionPollResult.java index 984e18d..60ae1b8 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionPollResult.java +++ b/src/main/java/com/litoralregas/backend/acquisition/polling/AcquisitionPollResult.java @@ -1,4 +1,4 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.polling; import java.time.Instant; import java.util.List; diff --git a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionPollingService.java b/src/main/java/com/litoralregas/backend/acquisition/polling/AcquisitionPollingService.java similarity index 84% rename from src/main/java/com/litoralregas/backend/acquisition/AcquisitionPollingService.java rename to src/main/java/com/litoralregas/backend/acquisition/polling/AcquisitionPollingService.java index 91a8175..ead925f 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/AcquisitionPollingService.java +++ b/src/main/java/com/litoralregas/backend/acquisition/polling/AcquisitionPollingService.java @@ -1,5 +1,8 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.polling; +import com.litoralregas.backend.acquisition.telemetry.SensorTelemetryReader; +import com.litoralregas.backend.acquisition.plan.AcquisitionPlan; +import com.litoralregas.backend.acquisition.plan.AcquisitionPlanBuilder; import org.springframework.stereotype.Service; import java.time.Instant; diff --git a/src/main/java/com/litoralregas/backend/acquisition/SensorTelemetryReader.java b/src/main/java/com/litoralregas/backend/acquisition/telemetry/SensorTelemetryReader.java similarity index 93% rename from src/main/java/com/litoralregas/backend/acquisition/SensorTelemetryReader.java rename to src/main/java/com/litoralregas/backend/acquisition/telemetry/SensorTelemetryReader.java index c213ff8..5f9d971 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/SensorTelemetryReader.java +++ b/src/main/java/com/litoralregas/backend/acquisition/telemetry/SensorTelemetryReader.java @@ -1,5 +1,7 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.telemetry; +import com.litoralregas.backend.acquisition.telemetry.TelemetryCache; +import com.litoralregas.backend.acquisition.telemetry.TelemetrySnapshot; import com.litoralregas.backend.modbus.LrModbusClient; import com.litoralregas.backend.modbus.ModbusReadResult; import com.litoralregas.backend.modbus.ModbusUnit; diff --git a/src/main/java/com/litoralregas/backend/acquisition/TelemetryCache.java b/src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetryCache.java similarity index 94% rename from src/main/java/com/litoralregas/backend/acquisition/TelemetryCache.java rename to src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetryCache.java index 02d21f4..04c4762 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/TelemetryCache.java +++ b/src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetryCache.java @@ -1,4 +1,4 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.telemetry; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/litoralregas/backend/acquisition/TelemetryController.java b/src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetryController.java similarity index 94% rename from src/main/java/com/litoralregas/backend/acquisition/TelemetryController.java rename to src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetryController.java index a978701..be868b2 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/TelemetryController.java +++ b/src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetryController.java @@ -1,4 +1,4 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.telemetry; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/com/litoralregas/backend/acquisition/TelemetrySnapshot.java b/src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetrySnapshot.java similarity index 82% rename from src/main/java/com/litoralregas/backend/acquisition/TelemetrySnapshot.java rename to src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetrySnapshot.java index e322c58..7b1118d 100644 --- a/src/main/java/com/litoralregas/backend/acquisition/TelemetrySnapshot.java +++ b/src/main/java/com/litoralregas/backend/acquisition/telemetry/TelemetrySnapshot.java @@ -1,4 +1,4 @@ -package com.litoralregas.backend.acquisition; +package com.litoralregas.backend.acquisition.telemetry; import java.time.Instant;