From 8d899cc70c3a51e97adbf2a945093ae895f00749 Mon Sep 17 00:00:00 2001 From: hsiegeln <37154749+hsiegeln@users.noreply.github.com> Date: Thu, 2 Apr 2026 22:05:26 +0200 Subject: [PATCH] refactor: use HeartbeatRequest from cameleer3-common Replace local HeartbeatRequest DTO with the shared model from cameleer3-common. Message types exchanged between server and agent belong in the common module. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../server/app/controller/AgentRegistrationController.java | 6 +++--- .../com/cameleer3/server/app/dto/HeartbeatRequest.java | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 cameleer3-server-app/src/main/java/com/cameleer3/server/app/dto/HeartbeatRequest.java diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/AgentRegistrationController.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/AgentRegistrationController.java index 01191393..ffe863dd 100644 --- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/AgentRegistrationController.java +++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/controller/AgentRegistrationController.java @@ -7,7 +7,7 @@ import com.cameleer3.server.app.dto.AgentRefreshResponse; import com.cameleer3.server.app.dto.AgentRegistrationRequest; import com.cameleer3.server.app.dto.AgentRegistrationResponse; import com.cameleer3.server.app.dto.ErrorResponse; -import com.cameleer3.server.app.dto.HeartbeatRequest; +import com.cameleer3.common.model.HeartbeatRequest; import com.cameleer3.server.app.security.BootstrapTokenValidator; import com.cameleer3.server.core.admin.AuditCategory; import com.cameleer3.server.core.admin.AuditResult; @@ -203,10 +203,10 @@ public class AgentRegistrationController { return ResponseEntity.notFound().build(); } - if (request != null && request.routeStates() != null && !request.routeStates().isEmpty()) { + if (request != null && request.getRouteStates() != null && !request.getRouteStates().isEmpty()) { AgentInfo agent = registryService.findById(id); if (agent != null) { - for (var entry : request.routeStates().entrySet()) { + for (var entry : request.getRouteStates().entrySet()) { RouteStateRegistry.RouteState state = parseRouteState(entry.getValue()); if (state != null) { routeStateRegistry.setState(agent.applicationId(), entry.getKey(), state); diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/dto/HeartbeatRequest.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/dto/HeartbeatRequest.java deleted file mode 100644 index ddf0b93e..00000000 --- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/dto/HeartbeatRequest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cameleer3.server.app.dto; - -import java.util.Map; - -public record HeartbeatRequest( - Map routeStates -) {}