From c45c82409fa28ee5534d5b5ec31ba4ab5084ba8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20B=C3=B6rschig?= Date: Fri, 26 Jun 2026 16:33:55 +0200 Subject: [PATCH 1/3] style: fix includes source/dashboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marius Börschig --- .../dashboard/CreateDashboardInstance.cpp | 4 ++-- .../dashboard/CreateDashboardInstance.hpp | 2 +- .../source/dashboard/DashboardBulkUpdate.hpp | 2 +- SilKit/source/dashboard/DashboardInstance.cpp | 10 +++++----- SilKit/source/dashboard/DashboardInstance.hpp | 14 ++++++------- .../source/dashboard/DashboardUnavailable.cpp | 2 +- SilKit/source/dashboard/OatppHeaders.cpp | 2 +- SilKit/source/dashboard/SilKitEvent.hpp | 4 ++-- .../Test_DashboardSilKitEventQueue.cpp | 4 ++-- .../dashboard/client/DashboardComponents.hpp | 2 +- .../dashboard/client/DashboardRetryPolicy.cpp | 2 +- .../dashboard/client/DashboardRetryPolicy.hpp | 2 +- .../client/DashboardSystemApiClient.hpp | 8 ++++---- .../client/DashboardSystemServiceClient.cpp | 4 ++-- .../client/DashboardSystemServiceClient.hpp | 6 +++--- .../client/IDashboardSystemServiceClient.hpp | 8 ++++---- .../client/Mocks/MockBodyDecoder.hpp | 2 +- .../Mocks/MockDashboardSystemApiClient.hpp | 2 +- .../MockDashboardSystemServiceClient.hpp | 2 +- .../client/Mocks/MockInputStream.hpp | 2 +- .../client/Mocks/MockObjectMapper.hpp | 2 +- .../Test_DashboardSystemServiceClient.cpp | 4 ++-- SilKit/source/dashboard/dto/BulkUpdateDto.hpp | 8 ++++---- SilKit/source/dashboard/dto/DataSpecDto.hpp | 2 +- .../source/dashboard/dto/MatchingLabelDto.hpp | 2 +- .../dashboard/dto/ParticipantStatusDto.hpp | 2 +- SilKit/source/dashboard/dto/RpcSpecDto.hpp | 2 +- SilKit/source/dashboard/dto/ServiceDto.hpp | 2 +- .../dto/SimulationConfigurationDto.hpp | 2 +- .../dto/SimulationCreationRequestDto.hpp | 2 +- .../dto/SimulationCreationResponseDto.hpp | 2 +- .../source/dashboard/dto/SystemStatusDto.hpp | 2 +- .../dashboard/service/DashboardRestClient.cpp | 12 +++++------ .../dashboard/service/DashboardRestClient.hpp | 18 ++++++++--------- .../service/ISilKitToOatppMapper.hpp | 20 +++++++++---------- .../service/Mocks/MockSilKitToOatppMapper.hpp | 2 +- .../dashboard/service/SilKitToOatppMapper.cpp | 6 +++--- .../dashboard/service/SilKitToOatppMapper.hpp | 2 +- .../service/Test_DashboardRestClient.cpp | 8 ++++---- .../Test_DashboardSilKitToOatppMapper.cpp | 4 ++-- 40 files changed, 94 insertions(+), 94 deletions(-) diff --git a/SilKit/source/dashboard/CreateDashboardInstance.cpp b/SilKit/source/dashboard/CreateDashboardInstance.cpp index 51e39cd9b..50b036ae2 100644 --- a/SilKit/source/dashboard/CreateDashboardInstance.cpp +++ b/SilKit/source/dashboard/CreateDashboardInstance.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: MIT -#include "CreateDashboardInstance.hpp" -#include "DashboardInstance.hpp" +#include "dashboard/CreateDashboardInstance.hpp" +#include "dashboard/DashboardInstance.hpp" namespace VSilKit { diff --git a/SilKit/source/dashboard/CreateDashboardInstance.hpp b/SilKit/source/dashboard/CreateDashboardInstance.hpp index 097fa1e83..dc7cae2ee 100644 --- a/SilKit/source/dashboard/CreateDashboardInstance.hpp +++ b/SilKit/source/dashboard/CreateDashboardInstance.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IDashboardInstance.hpp" +#include "dashboard/IDashboardInstance.hpp" #include diff --git a/SilKit/source/dashboard/DashboardBulkUpdate.hpp b/SilKit/source/dashboard/DashboardBulkUpdate.hpp index 5d169b22a..b9143218b 100644 --- a/SilKit/source/dashboard/DashboardBulkUpdate.hpp +++ b/SilKit/source/dashboard/DashboardBulkUpdate.hpp @@ -6,7 +6,7 @@ #include "silkit/services/orchestration/OrchestrationDatatypes.hpp" -#include "SilKitEvent.hpp" +#include "dashboard/SilKitEvent.hpp" #include #include diff --git a/SilKit/source/dashboard/DashboardInstance.cpp b/SilKit/source/dashboard/DashboardInstance.cpp index f5679df39..79d6e1266 100644 --- a/SilKit/source/dashboard/DashboardInstance.cpp +++ b/SilKit/source/dashboard/DashboardInstance.cpp @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: MIT -#include "DashboardInstance.hpp" -#include "SilKitEvent.hpp" -#include "LockedQueue.hpp" -#include "SilKitToOatppMapper.hpp" -#include "DashboardRestClient.hpp" +#include "dashboard/DashboardInstance.hpp" +#include "dashboard/SilKitEvent.hpp" +#include "dashboard/LockedQueue.hpp" +#include "dashboard/service/SilKitToOatppMapper.hpp" +#include "dashboard/service/DashboardRestClient.hpp" namespace { diff --git a/SilKit/source/dashboard/DashboardInstance.hpp b/SilKit/source/dashboard/DashboardInstance.hpp index 997317b68..a01d27194 100644 --- a/SilKit/source/dashboard/DashboardInstance.hpp +++ b/SilKit/source/dashboard/DashboardInstance.hpp @@ -4,18 +4,18 @@ #pragma once -#include "IDashboardInstance.hpp" -#include "VAsioRegistry.hpp" +#include "dashboard/IDashboardInstance.hpp" +#include "core/vasio/VAsioRegistry.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include "client/DashboardSystemApiClient.hpp" #include "service/ISilKitToOatppMapper.hpp" -#include "SystemStateTracker.hpp" -#include "IRestClient.hpp" +#include "services/orchestration/SystemStateTracker.hpp" +#include "dashboard/IRestClient.hpp" -#include "LockedQueue.hpp" -#include "SilKitEvent.hpp" +#include "dashboard/LockedQueue.hpp" +#include "dashboard/SilKitEvent.hpp" #include #include diff --git a/SilKit/source/dashboard/DashboardUnavailable.cpp b/SilKit/source/dashboard/DashboardUnavailable.cpp index 969ad720b..68013ea3f 100644 --- a/SilKit/source/dashboard/DashboardUnavailable.cpp +++ b/SilKit/source/dashboard/DashboardUnavailable.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "CreateDashboardInstance.hpp" +#include "dashboard/CreateDashboardInstance.hpp" #include "silkit/participant/exception.hpp" namespace VSilKit { diff --git a/SilKit/source/dashboard/OatppHeaders.cpp b/SilKit/source/dashboard/OatppHeaders.cpp index 02119792f..ad6386b8b 100644 --- a/SilKit/source/dashboard/OatppHeaders.cpp +++ b/SilKit/source/dashboard/OatppHeaders.cpp @@ -2,4 +2,4 @@ // // SPDX-License-Identifier: MIT -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" diff --git a/SilKit/source/dashboard/SilKitEvent.hpp b/SilKit/source/dashboard/SilKitEvent.hpp index c700e2051..75bec52c1 100644 --- a/SilKit/source/dashboard/SilKitEvent.hpp +++ b/SilKit/source/dashboard/SilKitEvent.hpp @@ -5,8 +5,8 @@ #pragma once #include "silkit/services/orchestration/OrchestrationDatatypes.hpp" -#include "ServiceDatatypes.hpp" -#include "MetricsDatatypes.hpp" +#include "core/service/ServiceDatatypes.hpp" +#include "services/metrics/MetricsDatatypes.hpp" namespace VSilKit { diff --git a/SilKit/source/dashboard/Test_DashboardSilKitEventQueue.cpp b/SilKit/source/dashboard/Test_DashboardSilKitEventQueue.cpp index 1bbd4990a..4d83b95fd 100644 --- a/SilKit/source/dashboard/Test_DashboardSilKitEventQueue.cpp +++ b/SilKit/source/dashboard/Test_DashboardSilKitEventQueue.cpp @@ -7,8 +7,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "SilKitEvent.hpp" -#include "LockedQueue.hpp" +#include "dashboard/SilKitEvent.hpp" +#include "dashboard/LockedQueue.hpp" using namespace testing; using namespace VSilKit; diff --git a/SilKit/source/dashboard/client/DashboardComponents.hpp b/SilKit/source/dashboard/client/DashboardComponents.hpp index a45edcac6..de40c764e 100644 --- a/SilKit/source/dashboard/client/DashboardComponents.hpp +++ b/SilKit/source/dashboard/client/DashboardComponents.hpp @@ -8,7 +8,7 @@ #include #include -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/client/DashboardRetryPolicy.cpp b/SilKit/source/dashboard/client/DashboardRetryPolicy.cpp index 3814a0b03..009d3e8ec 100644 --- a/SilKit/source/dashboard/client/DashboardRetryPolicy.cpp +++ b/SilKit/source/dashboard/client/DashboardRetryPolicy.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -#include "DashboardRetryPolicy.hpp" +#include "dashboard/client/DashboardRetryPolicy.hpp" #include "silkit/SilKitMacros.hpp" diff --git a/SilKit/source/dashboard/client/DashboardRetryPolicy.hpp b/SilKit/source/dashboard/client/DashboardRetryPolicy.hpp index bb264c286..66f041612 100644 --- a/SilKit/source/dashboard/client/DashboardRetryPolicy.hpp +++ b/SilKit/source/dashboard/client/DashboardRetryPolicy.hpp @@ -6,7 +6,7 @@ #include -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/client/DashboardSystemApiClient.hpp b/SilKit/source/dashboard/client/DashboardSystemApiClient.hpp index a79de5e19..fd01e6c8e 100644 --- a/SilKit/source/dashboard/client/DashboardSystemApiClient.hpp +++ b/SilKit/source/dashboard/client/DashboardSystemApiClient.hpp @@ -4,11 +4,11 @@ #pragma once -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" -#include "SimulationCreationRequestDto.hpp" -#include "BulkUpdateDto.hpp" -#include "MetricsDto.hpp" +#include "dashboard/dto/SimulationCreationRequestDto.hpp" +#include "dashboard/dto/BulkUpdateDto.hpp" +#include "dashboard/dto/MetricsDto.hpp" #include OATPP_CODEGEN_BEGIN(ApiClient) diff --git a/SilKit/source/dashboard/client/DashboardSystemServiceClient.cpp b/SilKit/source/dashboard/client/DashboardSystemServiceClient.cpp index c3ecf3cd1..cf34d2a59 100644 --- a/SilKit/source/dashboard/client/DashboardSystemServiceClient.cpp +++ b/SilKit/source/dashboard/client/DashboardSystemServiceClient.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: MIT -#include "DashboardSystemServiceClient.hpp" +#include "dashboard/client/DashboardSystemServiceClient.hpp" -#include "LoggerMessage.hpp" +#include "services/logging/LoggerMessage.hpp" #include OATPP_CODEGEN_BEGIN(ApiClient) diff --git a/SilKit/source/dashboard/client/DashboardSystemServiceClient.hpp b/SilKit/source/dashboard/client/DashboardSystemServiceClient.hpp index 452bc7bf6..e0e72dc4f 100644 --- a/SilKit/source/dashboard/client/DashboardSystemServiceClient.hpp +++ b/SilKit/source/dashboard/client/DashboardSystemServiceClient.hpp @@ -4,13 +4,13 @@ #pragma once -#include "IDashboardSystemServiceClient.hpp" +#include "dashboard/client/IDashboardSystemServiceClient.hpp" #include -#include "ILoggerInternal.hpp" +#include "services/logging/ILoggerInternal.hpp" -#include "DashboardSystemApiClient.hpp" +#include "dashboard/client/DashboardSystemApiClient.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/client/IDashboardSystemServiceClient.hpp b/SilKit/source/dashboard/client/IDashboardSystemServiceClient.hpp index 117c8d402..d043111ff 100644 --- a/SilKit/source/dashboard/client/IDashboardSystemServiceClient.hpp +++ b/SilKit/source/dashboard/client/IDashboardSystemServiceClient.hpp @@ -4,10 +4,10 @@ #pragma once -#include "SimulationCreationRequestDto.hpp" -#include "SimulationCreationResponseDto.hpp" -#include "BulkUpdateDto.hpp" -#include "MetricsDto.hpp" +#include "dashboard/dto/SimulationCreationRequestDto.hpp" +#include "dashboard/dto/SimulationCreationResponseDto.hpp" +#include "dashboard/dto/BulkUpdateDto.hpp" +#include "dashboard/dto/MetricsDto.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/client/Mocks/MockBodyDecoder.hpp b/SilKit/source/dashboard/client/Mocks/MockBodyDecoder.hpp index 5037a83e4..b185726b4 100644 --- a/SilKit/source/dashboard/client/Mocks/MockBodyDecoder.hpp +++ b/SilKit/source/dashboard/client/Mocks/MockBodyDecoder.hpp @@ -6,7 +6,7 @@ #include "gmock/gmock-function-mocker.h" -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/client/Mocks/MockDashboardSystemApiClient.hpp b/SilKit/source/dashboard/client/Mocks/MockDashboardSystemApiClient.hpp index 06e531df5..17e4ab389 100644 --- a/SilKit/source/dashboard/client/Mocks/MockDashboardSystemApiClient.hpp +++ b/SilKit/source/dashboard/client/Mocks/MockDashboardSystemApiClient.hpp @@ -6,7 +6,7 @@ #include "gmock/gmock-function-mocker.h" -#include "DashboardSystemApiClient.hpp" +#include "dashboard/client/DashboardSystemApiClient.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/client/Mocks/MockDashboardSystemServiceClient.hpp b/SilKit/source/dashboard/client/Mocks/MockDashboardSystemServiceClient.hpp index a92c7d309..31f6ea4da 100644 --- a/SilKit/source/dashboard/client/Mocks/MockDashboardSystemServiceClient.hpp +++ b/SilKit/source/dashboard/client/Mocks/MockDashboardSystemServiceClient.hpp @@ -6,7 +6,7 @@ #include "gmock/gmock-function-mocker.h" -#include "IDashboardSystemServiceClient.hpp" +#include "dashboard/client/IDashboardSystemServiceClient.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/client/Mocks/MockInputStream.hpp b/SilKit/source/dashboard/client/Mocks/MockInputStream.hpp index 609e81b03..174ae20cb 100644 --- a/SilKit/source/dashboard/client/Mocks/MockInputStream.hpp +++ b/SilKit/source/dashboard/client/Mocks/MockInputStream.hpp @@ -4,7 +4,7 @@ #pragma once -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" struct MockInputStream : public oatpp::data::stream::InputStream { diff --git a/SilKit/source/dashboard/client/Mocks/MockObjectMapper.hpp b/SilKit/source/dashboard/client/Mocks/MockObjectMapper.hpp index 9d60f0d66..b243ad352 100644 --- a/SilKit/source/dashboard/client/Mocks/MockObjectMapper.hpp +++ b/SilKit/source/dashboard/client/Mocks/MockObjectMapper.hpp @@ -6,7 +6,7 @@ #include "gmock/gmock-function-mocker.h" -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp b/SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp index ea4c54203..9515a5ddc 100644 --- a/SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp +++ b/SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp @@ -14,9 +14,9 @@ #pragma warning(pop) #endif -#include "MockParticipant.hpp" +#include "core/mock/participant/MockParticipant.hpp" -#include "DashboardSystemServiceClient.hpp" +#include "dashboard/client/DashboardSystemServiceClient.hpp" #include "Mocks/MockBodyDecoder.hpp" #include "Mocks/MockDashboardSystemApiClient.hpp" #include "Mocks/MockInputStream.hpp" diff --git a/SilKit/source/dashboard/dto/BulkUpdateDto.hpp b/SilKit/source/dashboard/dto/BulkUpdateDto.hpp index 75a224523..51af4705c 100644 --- a/SilKit/source/dashboard/dto/BulkUpdateDto.hpp +++ b/SilKit/source/dashboard/dto/BulkUpdateDto.hpp @@ -4,10 +4,10 @@ #pragma once -#include "RpcSpecDto.hpp" -#include "DataSpecDto.hpp" -#include "ParticipantStatusDto.hpp" -#include "SystemStatusDto.hpp" +#include "dashboard/dto/RpcSpecDto.hpp" +#include "dashboard/dto/DataSpecDto.hpp" +#include "dashboard/dto/ParticipantStatusDto.hpp" +#include "dashboard/dto/SystemStatusDto.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/DataSpecDto.hpp b/SilKit/source/dashboard/dto/DataSpecDto.hpp index cfebd4394..fb4671245 100644 --- a/SilKit/source/dashboard/dto/DataSpecDto.hpp +++ b/SilKit/source/dashboard/dto/DataSpecDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "MatchingLabelDto.hpp" +#include "dashboard/dto/MatchingLabelDto.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/MatchingLabelDto.hpp b/SilKit/source/dashboard/dto/MatchingLabelDto.hpp index d014ca839..83bf9285a 100644 --- a/SilKit/source/dashboard/dto/MatchingLabelDto.hpp +++ b/SilKit/source/dashboard/dto/MatchingLabelDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/ParticipantStatusDto.hpp b/SilKit/source/dashboard/dto/ParticipantStatusDto.hpp index cec09e8f1..1cc05d480 100644 --- a/SilKit/source/dashboard/dto/ParticipantStatusDto.hpp +++ b/SilKit/source/dashboard/dto/ParticipantStatusDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/RpcSpecDto.hpp b/SilKit/source/dashboard/dto/RpcSpecDto.hpp index 195aa38fc..5149aa938 100644 --- a/SilKit/source/dashboard/dto/RpcSpecDto.hpp +++ b/SilKit/source/dashboard/dto/RpcSpecDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "MatchingLabelDto.hpp" +#include "dashboard/dto/MatchingLabelDto.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/ServiceDto.hpp b/SilKit/source/dashboard/dto/ServiceDto.hpp index 8009f349d..c51110165 100644 --- a/SilKit/source/dashboard/dto/ServiceDto.hpp +++ b/SilKit/source/dashboard/dto/ServiceDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/SimulationConfigurationDto.hpp b/SilKit/source/dashboard/dto/SimulationConfigurationDto.hpp index 003fc5c5b..67da154d6 100644 --- a/SilKit/source/dashboard/dto/SimulationConfigurationDto.hpp +++ b/SilKit/source/dashboard/dto/SimulationConfigurationDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/SimulationCreationRequestDto.hpp b/SilKit/source/dashboard/dto/SimulationCreationRequestDto.hpp index 3f61e6c34..c34814007 100644 --- a/SilKit/source/dashboard/dto/SimulationCreationRequestDto.hpp +++ b/SilKit/source/dashboard/dto/SimulationCreationRequestDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "SimulationConfigurationDto.hpp" +#include "dashboard/dto/SimulationConfigurationDto.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/SimulationCreationResponseDto.hpp b/SilKit/source/dashboard/dto/SimulationCreationResponseDto.hpp index 874d04fb2..1fd8033e3 100644 --- a/SilKit/source/dashboard/dto/SimulationCreationResponseDto.hpp +++ b/SilKit/source/dashboard/dto/SimulationCreationResponseDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/dto/SystemStatusDto.hpp b/SilKit/source/dashboard/dto/SystemStatusDto.hpp index f22861cac..13155f405 100644 --- a/SilKit/source/dashboard/dto/SystemStatusDto.hpp +++ b/SilKit/source/dashboard/dto/SystemStatusDto.hpp @@ -4,7 +4,7 @@ #pragma once -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" #include OATPP_CODEGEN_BEGIN(DTO) diff --git a/SilKit/source/dashboard/service/DashboardRestClient.cpp b/SilKit/source/dashboard/service/DashboardRestClient.cpp index 0de7396f4..ca62e9eb7 100644 --- a/SilKit/source/dashboard/service/DashboardRestClient.cpp +++ b/SilKit/source/dashboard/service/DashboardRestClient.cpp @@ -4,12 +4,12 @@ #include "silkit/services/orchestration/string_utils.hpp" #include "silkit/SilKit.hpp" -#include "DashboardRestClient.hpp" -#include "DashboardComponents.hpp" -#include "LoggerMessage.hpp" -#include "Uri.hpp" -#include "SilKitToOatppMapper.hpp" -#include "client/DashboardSystemServiceClient.hpp" +#include "dashboard/service/DashboardRestClient.hpp" +#include "dashboard/client/DashboardComponents.hpp" +#include "services/logging/LoggerMessage.hpp" +#include "util/Uri.hpp" +#include "dashboard/service/SilKitToOatppMapper.hpp" +#include "dashboard/client/DashboardSystemServiceClient.hpp" using SilKit::Services::Logging::Level; using SilKit::Services::Logging::Topic; diff --git a/SilKit/source/dashboard/service/DashboardRestClient.hpp b/SilKit/source/dashboard/service/DashboardRestClient.hpp index 578fee298..179490cb6 100644 --- a/SilKit/source/dashboard/service/DashboardRestClient.hpp +++ b/SilKit/source/dashboard/service/DashboardRestClient.hpp @@ -8,15 +8,15 @@ #include #include -#include "ILoggerInternal.hpp" - -#include "ISilKitToOatppMapper.hpp" -#include "IDashboardSystemServiceClient.hpp" -#include "DashboardSystemApiClient.hpp" -#include "DashboardRetryPolicy.hpp" -#include "IRestClient.hpp" -#include "DashboardBulkUpdate.hpp" -#include "MetricsDatatypes.hpp" +#include "services/logging/ILoggerInternal.hpp" + +#include "dashboard/service/ISilKitToOatppMapper.hpp" +#include "dashboard/client/IDashboardSystemServiceClient.hpp" +#include "dashboard/client/DashboardSystemApiClient.hpp" +#include "dashboard/client/DashboardRetryPolicy.hpp" +#include "dashboard/IRestClient.hpp" +#include "dashboard/DashboardBulkUpdate.hpp" +#include "services/metrics/MetricsDatatypes.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/service/ISilKitToOatppMapper.hpp b/SilKit/source/dashboard/service/ISilKitToOatppMapper.hpp index 12112f7f3..ebe7e5c05 100644 --- a/SilKit/source/dashboard/service/ISilKitToOatppMapper.hpp +++ b/SilKit/source/dashboard/service/ISilKitToOatppMapper.hpp @@ -6,20 +6,20 @@ #include -#include "OatppHeaders.hpp" +#include "dashboard/OatppHeaders.hpp" #include "silkit/services/orchestration/OrchestrationDatatypes.hpp" -#include "ParticipantStatusDto.hpp" -#include "ServiceDescriptor.hpp" -#include "ServiceDto.hpp" -#include "SimulationCreationRequestDto.hpp" -#include "SystemStatusDto.hpp" -#include "BulkUpdateDto.hpp" -#include "MetricsDto.hpp" +#include "dashboard/dto/ParticipantStatusDto.hpp" +#include "core/internal/ServiceDescriptor.hpp" +#include "dashboard/dto/ServiceDto.hpp" +#include "dashboard/dto/SimulationCreationRequestDto.hpp" +#include "dashboard/dto/SystemStatusDto.hpp" +#include "dashboard/dto/BulkUpdateDto.hpp" +#include "dashboard/dto/MetricsDto.hpp" -#include "DashboardBulkUpdate.hpp" -#include "MetricsDatatypes.hpp" +#include "dashboard/DashboardBulkUpdate.hpp" +#include "services/metrics/MetricsDatatypes.hpp" namespace SilKit { diff --git a/SilKit/source/dashboard/service/Mocks/MockSilKitToOatppMapper.hpp b/SilKit/source/dashboard/service/Mocks/MockSilKitToOatppMapper.hpp index 8249cfb3e..ccfccde3f 100644 --- a/SilKit/source/dashboard/service/Mocks/MockSilKitToOatppMapper.hpp +++ b/SilKit/source/dashboard/service/Mocks/MockSilKitToOatppMapper.hpp @@ -5,7 +5,7 @@ #pragma once #include "gmock/gmock-function-mocker.h" -#include "ISilKitToOatppMapper.hpp" +#include "dashboard/service/ISilKitToOatppMapper.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/service/SilKitToOatppMapper.cpp b/SilKit/source/dashboard/service/SilKitToOatppMapper.cpp index 9bb588f28..01c25add9 100644 --- a/SilKit/source/dashboard/service/SilKitToOatppMapper.cpp +++ b/SilKit/source/dashboard/service/SilKitToOatppMapper.cpp @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: MIT -#include "SilKitToOatppMapper.hpp" +#include "dashboard/service/SilKitToOatppMapper.hpp" -#include "YamlParser.hpp" -#include "StringHelpers.hpp" +#include "config/YamlParser.hpp" +#include "util/StringHelpers.hpp" #include #include diff --git a/SilKit/source/dashboard/service/SilKitToOatppMapper.hpp b/SilKit/source/dashboard/service/SilKitToOatppMapper.hpp index bad48c0ff..7342c52d1 100644 --- a/SilKit/source/dashboard/service/SilKitToOatppMapper.hpp +++ b/SilKit/source/dashboard/service/SilKitToOatppMapper.hpp @@ -4,7 +4,7 @@ #pragma once -#include "ISilKitToOatppMapper.hpp" +#include "dashboard/service/ISilKitToOatppMapper.hpp" namespace SilKit { namespace Dashboard { diff --git a/SilKit/source/dashboard/service/Test_DashboardRestClient.cpp b/SilKit/source/dashboard/service/Test_DashboardRestClient.cpp index 10bd6d15a..fe75e2cba 100644 --- a/SilKit/source/dashboard/service/Test_DashboardRestClient.cpp +++ b/SilKit/source/dashboard/service/Test_DashboardRestClient.cpp @@ -5,13 +5,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "MockParticipant.hpp" +#include "core/mock/participant/MockParticipant.hpp" -#include "DashboardRestClient.hpp" +#include "dashboard/service/DashboardRestClient.hpp" #include "Mocks/MockSilKitToOatppMapper.hpp" -#include "Mocks/MockDashboardSystemServiceClient.hpp" -#include "Mocks/MockDashboardSystemApiClient.hpp" +#include "dashboard/client/Mocks/MockDashboardSystemServiceClient.hpp" +#include "dashboard/client/Mocks/MockDashboardSystemApiClient.hpp" using namespace testing; namespace SilKit { diff --git a/SilKit/source/dashboard/service/Test_DashboardSilKitToOatppMapper.cpp b/SilKit/source/dashboard/service/Test_DashboardSilKitToOatppMapper.cpp index 030433ab8..b73918aca 100644 --- a/SilKit/source/dashboard/service/Test_DashboardSilKitToOatppMapper.cpp +++ b/SilKit/source/dashboard/service/Test_DashboardSilKitToOatppMapper.cpp @@ -6,9 +6,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "YamlParser.hpp" +#include "config/YamlParser.hpp" -#include "SilKitToOatppMapper.hpp" +#include "dashboard/service/SilKitToOatppMapper.hpp" #include "fmt/core.h" #include From 9c441eeeaaa035328fef371020b2a573d0f329b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20B=C3=B6rschig?= Date: Mon, 29 Jun 2026 07:49:40 +0200 Subject: [PATCH 2/3] Update SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniel Edwards Signed-off-by: Marius Börschig --- .../dashboard/client/Test_DashboardSystemServiceClient.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp b/SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp index 9515a5ddc..64ca506ab 100644 --- a/SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp +++ b/SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp @@ -20,7 +20,10 @@ #include "Mocks/MockBodyDecoder.hpp" #include "Mocks/MockDashboardSystemApiClient.hpp" #include "Mocks/MockInputStream.hpp" -#include "Mocks/MockObjectMapper.hpp" +#include "dashboard/client/Mocks/MockBodyDecoder.hpp" +#include "dashboard/client/Mocks/MockDashboardSystemApiClient.hpp" +#include "dashboard/client/Mocks/MockInputStream.hpp" +#include "dashboard/client/Mocks/MockObjectMapper.hpp" using namespace oatpp::web; using namespace oatpp::data::mapping; From 02c65bc6a712b1ec7ef272755559215da9d29d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20B=C3=B6rschig?= Date: Mon, 29 Jun 2026 07:49:46 +0200 Subject: [PATCH 3/3] Update SilKit/source/dashboard/DashboardInstance.hpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniel Edwards Signed-off-by: Marius Börschig --- SilKit/source/dashboard/DashboardInstance.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SilKit/source/dashboard/DashboardInstance.hpp b/SilKit/source/dashboard/DashboardInstance.hpp index a01d27194..c7e3798aa 100644 --- a/SilKit/source/dashboard/DashboardInstance.hpp +++ b/SilKit/source/dashboard/DashboardInstance.hpp @@ -9,8 +9,8 @@ #include "services/logging/LoggerMessage.hpp" -#include "client/DashboardSystemApiClient.hpp" -#include "service/ISilKitToOatppMapper.hpp" +#include "dashboard/client/DashboardSystemApiClient.hpp" +#include "dashboard/service/ISilKitToOatppMapper.hpp" #include "services/orchestration/SystemStateTracker.hpp" #include "dashboard/IRestClient.hpp"