Skip to content

style: fix includes source/dashboard #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MariusBgm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

style: fix includes source/dashboard #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SilKit/source/dashboard/CreateDashboardInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
//
// SPDX-License-Identifier: MIT

#include "CreateDashboardInstance.hpp"
#include "DashboardInstance.hpp"
#include "dashboard/CreateDashboardInstance.hpp"
#include "dashboard/DashboardInstance.hpp"

namespace VSilKit {

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/CreateDashboardInstance.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#pragma once


#include "IDashboardInstance.hpp"
#include "dashboard/IDashboardInstance.hpp"

#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/DashboardBulkUpdate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "silkit/services/orchestration/OrchestrationDatatypes.hpp"

#include "SilKitEvent.hpp"
#include "dashboard/SilKitEvent.hpp"

#include <cstdint>
#include <memory>
Expand Down
10 changes: 5 additions & 5 deletions SilKit/source/dashboard/DashboardInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions SilKit/source/dashboard/DashboardInstance.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment on lines 12 to 13

@VDanielEdwards VDanielEdwards Jun 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include "client/DashboardSystemApiClient.hpp"
#include "service/ISilKitToOatppMapper.hpp"
#include "dashboard/client/DashboardSystemApiClient.hpp"
#include "dashboard/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 <chrono>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/DashboardUnavailable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: MIT

#include "CreateDashboardInstance.hpp"
#include "dashboard/CreateDashboardInstance.hpp"
#include "silkit/participant/exception.hpp"

namespace VSilKit {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/OatppHeaders.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
//
// SPDX-License-Identifier: MIT

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"
4 changes: 2 additions & 2 deletions SilKit/source/dashboard/SilKitEvent.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/dashboard/Test_DashboardSilKitEventQueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/client/DashboardComponents.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <memory>
#include <string>

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

namespace SilKit {
namespace Dashboard {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/client/DashboardRetryPolicy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: MIT

#include "DashboardRetryPolicy.hpp"
#include "dashboard/client/DashboardRetryPolicy.hpp"

#include "silkit/SilKitMacros.hpp"

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/client/DashboardRetryPolicy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <atomic>

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

namespace SilKit {
namespace Dashboard {
Expand Down
8 changes: 4 additions & 4 deletions SilKit/source/dashboard/client/DashboardSystemApiClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/dashboard/client/DashboardSystemServiceClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions SilKit/source/dashboard/client/DashboardSystemServiceClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

#pragma once

#include "IDashboardSystemServiceClient.hpp"
#include "dashboard/client/IDashboardSystemServiceClient.hpp"

#include <memory>

#include "ILoggerInternal.hpp"
#include "services/logging/ILoggerInternal.hpp"

#include "DashboardSystemApiClient.hpp"
#include "dashboard/client/DashboardSystemApiClient.hpp"

namespace SilKit {
namespace Dashboard {
Expand Down
8 changes: 4 additions & 4 deletions SilKit/source/dashboard/client/IDashboardSystemServiceClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/client/Mocks/MockBodyDecoder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "gmock/gmock-function-mocker.h"

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

namespace SilKit {
namespace Dashboard {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/client/Mocks/MockDashboardSystemApiClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "gmock/gmock-function-mocker.h"

#include "DashboardSystemApiClient.hpp"
#include "dashboard/client/DashboardSystemApiClient.hpp"

namespace SilKit {
namespace Dashboard {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/client/Mocks/MockDashboardSystemServiceClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "gmock/gmock-function-mocker.h"

#include "IDashboardSystemServiceClient.hpp"
#include "dashboard/client/IDashboardSystemServiceClient.hpp"

namespace SilKit {
namespace Dashboard {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/client/Mocks/MockInputStream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

struct MockInputStream : public oatpp::data::stream::InputStream
{
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/client/Mocks/MockObjectMapper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "gmock/gmock-function-mocker.h"

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

namespace SilKit {
namespace Dashboard {
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/dashboard/client/Test_DashboardSystemServiceClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions SilKit/source/dashboard/dto/BulkUpdateDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/DataSpecDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "MatchingLabelDto.hpp"
#include "dashboard/dto/MatchingLabelDto.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/MatchingLabelDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/ParticipantStatusDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/RpcSpecDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "MatchingLabelDto.hpp"
#include "dashboard/dto/MatchingLabelDto.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/ServiceDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/SimulationConfigurationDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/SimulationCreationRequestDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "SimulationConfigurationDto.hpp"
#include "dashboard/dto/SimulationConfigurationDto.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/SimulationCreationResponseDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/dashboard/dto/SystemStatusDto.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "OatppHeaders.hpp"
#include "dashboard/OatppHeaders.hpp"

#include OATPP_CODEGEN_BEGIN(DTO)

Expand Down
12 changes: 6 additions & 6 deletions SilKit/source/dashboard/service/DashboardRestClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions SilKit/source/dashboard/service/DashboardRestClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
#include <memory>
#include <string>

#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 {
Expand Down
Loading
Loading