Skip to content

style: fix includes core (internal/service/participant/requests/mock) #377

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 core (internal/service/participant/requests/mock) #377

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
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/IMessageReceiver.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 "IServiceEndpoint.hpp"
#include "core/internal/IServiceEndpoint.hpp"

namespace SilKit {
namespace Core {
Expand Down
38 changes: 19 additions & 19 deletions SilKit/source/core/internal/IParticipantInternal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
#include "silkit/experimental/netsim/NetworkSimulatorDatatypes.hpp"


#include "internal_fwd.hpp"
#include "IServiceEndpoint.hpp"
#include "ServiceDatatypes.hpp"
#include "RequestReplyDatatypes.hpp"
#include "OrchestrationDatatypes.hpp"
#include "LoggingDatatypesInternal.hpp"
#include "MetricsDatatypes.hpp"

#include "WireCanMessages.hpp"
#include "WireDataMessages.hpp"
#include "WireEthernetMessages.hpp"
#include "WireFlexrayMessages.hpp"
#include "WireLinMessages.hpp"
#include "WireRpcMessages.hpp"
#include "Metrics.hpp"

#include "ISimulator.hpp"
#include "IReplayDataController.hpp"
#include "ITraceMessageSource.hpp"
#include "core/internal/internal_fwd.hpp"
#include "core/internal/IServiceEndpoint.hpp"
#include "core/service/ServiceDatatypes.hpp"
#include "core/requests/RequestReplyDatatypes.hpp"
#include "core/internal/OrchestrationDatatypes.hpp"
#include "core/internal/LoggingDatatypesInternal.hpp"
#include "services/metrics/MetricsDatatypes.hpp"

#include "wire/can/WireCanMessages.hpp"
#include "wire/pubsub/WireDataMessages.hpp"
#include "wire/ethernet/WireEthernetMessages.hpp"
#include "wire/flexray/WireFlexrayMessages.hpp"
#include "wire/lin/WireLinMessages.hpp"
#include "wire/rpc/WireRpcMessages.hpp"
#include "services/metrics/Metrics.hpp"

#include "core/internal/ISimulator.hpp"
#include "tracing/IReplayDataController.hpp"
#include "tracing/ITraceMessageSource.hpp"

// forwards
namespace SilKit {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/IReceiver.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 <tuple>

#include "IMessageReceiver.hpp"
#include "core/internal/IMessageReceiver.hpp"

namespace SilKit {
namespace Core {
Expand Down
6 changes: 3 additions & 3 deletions SilKit/source/core/internal/IServiceEndpoint.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
#include <vector>
#include <functional>

#include "EndpointAddress.hpp"
#include "ServiceDescriptor.hpp"
#include "ServiceConfigKeys.hpp"
#include "core/internal/EndpointAddress.hpp"
#include "core/internal/ServiceDescriptor.hpp"
#include "core/internal/ServiceConfigKeys.hpp"

namespace SilKit {
namespace Core {
Expand Down
8 changes: 4 additions & 4 deletions SilKit/source/core/internal/ISimulator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// SPDX-License-Identifier: MIT

// internal connection endpoint types:
#include "IMsgForCanSimulator.hpp"
#include "IMsgForEthSimulator.hpp"
#include "IMsgForFlexrayBusSimulator.hpp"
#include "IMsgForLinSimulator.hpp"
#include "services/can/IMsgForCanSimulator.hpp"
#include "services/ethernet/IMsgForEthSimulator.hpp"
#include "services/flexray/IMsgForFlexrayBusSimulator.hpp"
#include "services/lin/IMsgForLinSimulator.hpp"

namespace SilKit {
namespace Core {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/ITimeConsumer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// SPDX-License-Identifier: MIT

#pragma once
#include "ITimeProvider.hpp"
#include "core/internal/ITimeProvider.hpp"

namespace SilKit {
namespace Services {
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/core/internal/InternalSerdes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#pragma once

#include "MessageBuffer.hpp"
#include "EndpointAddress.hpp"
#include "core/internal/MessageBuffer.hpp"
#include "core/internal/EndpointAddress.hpp"

namespace SilKit {
namespace Core {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/LoggingDatatypesInternal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "silkit/services/logging/LoggingDatatypes.hpp"
#include "silkit/services/logging/string_utils.hpp"
#include "string_utils_internal.hpp"
#include "core/internal/string_utils_internal.hpp"

namespace SilKit {
namespace Services {
Expand Down
6 changes: 3 additions & 3 deletions SilKit/source/core/internal/MessageBuffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

#include "silkit/util/Span.hpp"

#include "Uuid.hpp"
#include "ProtocolVersion.hpp"
#include "SharedVector.hpp"
#include "util/Uuid.hpp"
#include "core/internal/ProtocolVersion.hpp"
#include "wire/util/SharedVector.hpp"

namespace SilKit {
namespace Core {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/OrchestrationDatatypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

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

#include "IServiceEndpoint.hpp"
#include "core/internal/IServiceEndpoint.hpp"

namespace SilKit {
namespace Services {
Expand Down
10 changes: 5 additions & 5 deletions SilKit/source/core/internal/ServiceDescriptor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include <sstream>
#include <map>

#include "StructuredLoggingKeys.hpp"
#include "ServiceConfigKeys.hpp"
#include "Configuration.hpp"
#include "EndpointAddress.hpp"
#include "Hash.hpp"
#include "services/logging/StructuredLoggingKeys.hpp"
#include "core/internal/ServiceConfigKeys.hpp"
#include "config/Configuration.hpp"
#include "core/internal/EndpointAddress.hpp"
#include "util/Hash.hpp"

namespace SilKit {
namespace Core {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/TestDataTraits.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 "traits/SilKitMsgTraits.hpp"
#include "TestDataTypes.hpp"
#include "core/internal/TestDataTypes.hpp"

// Datatypes for testing versioning and renaming of SIL Kit messages.
namespace SilKit {
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/core/internal/TestDataTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <string>
#include <ostream>

#include "MessageBuffer.hpp"
#include "InternalSerdes.hpp"
#include "core/internal/MessageBuffer.hpp"
#include "core/internal/InternalSerdes.hpp"


// Datatypes for testing versioning and renaming of SIL Kit messages.
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/Test_InternalSerdes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "gtest/gtest.h"

#include "InternalSerdes.hpp"
#include "core/internal/InternalSerdes.hpp"

TEST(Test_InternalSerdes, Mw_EndpointAddress)
{
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/Test_MessageBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "gtest/gtest.h"

#include "MessageBuffer.hpp"
#include "core/internal/MessageBuffer.hpp"

using namespace std::chrono_literals;

Expand Down
6 changes: 3 additions & 3 deletions SilKit/source/core/internal/string_utils_internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#include <iostream>
#include <sstream>

#include "EndpointAddress.hpp"
#include "core/internal/EndpointAddress.hpp"


#include <ostream>
#include <string>
#include <algorithm>
#include <cctype>

#include "LoggingTopics.hpp"
#include "StringHelpers.hpp"
#include "core/internal/LoggingTopics.hpp"
#include "util/StringHelpers.hpp"

namespace SilKit {
namespace Core {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/string_utils_sync.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/string_utils.hpp"

#include "OrchestrationDatatypes.hpp"
#include "core/internal/OrchestrationDatatypes.hpp"

namespace SilKit {
namespace Services {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/traits/SilKitLoggingTraits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "core/internal/internal_fwd.hpp"

#include "silkit/services/logging/LoggingDatatypes.hpp"
#include "LoggingTopics.hpp"
#include "core/internal/LoggingTopics.hpp"

namespace SilKit {
namespace Core {
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/core/internal/traits/SilKitMsgTraits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <type_traits>

#include "SilKitMsgVersion.hpp"
#include "SilKitMsgSerdesName.hpp"
#include "core/internal/traits/SilKitMsgVersion.hpp"
#include "core/internal/traits/SilKitMsgSerdesName.hpp"

namespace SilKit {
namespace Core {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/traits/SilKitServiceConfigTraits.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 "traits/SilKitServices_fwd.hpp"
#include "core/internal/traits/SilKitServices_fwd.hpp"

namespace SilKit {

Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/internal/traits/SilKitServiceTraits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// SPDX-License-Identifier: MIT

#pragma once
#include "internal_fwd.hpp"
#include "core/internal/internal_fwd.hpp"

namespace SilKit {
namespace Core {
Expand Down
8 changes: 4 additions & 4 deletions SilKit/source/core/mock/nullconnection/NullConnectionParticipant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#include "silkit/services/logging/ILogger.hpp"

#include "NullConnectionParticipant.hpp"
#include "Participant.hpp"
#include "Participant_impl.hpp"
#include "CreateParticipantT.hpp"
#include "core/mock/nullconnection/NullConnectionParticipant.hpp"
#include "core/participant/Participant.hpp"
#include "core/participant/Participant_impl.hpp"
#include "core/participant/CreateParticipantT.hpp"

namespace SilKit {
namespace Core {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/mock/nullconnection/NullConnectionParticipant.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 "IParticipantInternal.hpp"
#include "core/internal/IParticipantInternal.hpp"
#include "silkit/config/IParticipantConfiguration.hpp"

namespace SilKit {
Expand Down
20 changes: 10 additions & 10 deletions SilKit/source/core/mock/participant/MockParticipant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@

#include "silkit/experimental/netsim/INetworkSimulator.hpp"

#include "IParticipantInternal.hpp"
#include "IServiceDiscovery.hpp"
#include "IRequestReplyService.hpp"
#include "IRequestReplyProcedure.hpp"
#include "procs/IParticipantReplies.hpp"
#include "LifecycleService.hpp"
#include "SynchronizedHandlers.hpp"
#include "MockTimeProvider.hpp"

#include "MockLogger.hpp"
#include "core/internal/IParticipantInternal.hpp"
#include "core/service/IServiceDiscovery.hpp"
#include "core/requests/IRequestReplyService.hpp"
#include "core/requests/IRequestReplyProcedure.hpp"
#include "core/requests/procs/IParticipantReplies.hpp"
#include "services/orchestration/LifecycleService.hpp"
#include "util/SynchronizedHandlers.hpp"
#include "core/mock/participant/MockTimeProvider.hpp"

#include "services/logging/MockLogger.hpp"

namespace SilKit {
namespace Core {
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/core/mock/participant/MockTimeProvider.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "gtest/gtest.h"
#include "gmock/gmock.h"

#include "ITimeProvider.hpp"
#include "SynchronizedHandlers.hpp"
#include "core/internal/ITimeProvider.hpp"
#include "util/SynchronizedHandlers.hpp"

namespace SilKit {
namespace Core {
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/core/participant/CreateParticipantInternal.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 "CreateParticipantInternal.hpp"
#include "core/participant/CreateParticipantInternal.hpp"

#include "CreateParticipantT.hpp"
#include "core/participant/CreateParticipantT.hpp"

namespace SilKit {
namespace Core {
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/core/participant/CreateParticipantInternal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#pragma once

#include "IParticipantInternal.hpp"
#include "ParticipantConfiguration.hpp"
#include "core/internal/IParticipantInternal.hpp"
#include "config/ParticipantConfiguration.hpp"

namespace SilKit {
namespace Core {
Expand Down
2 changes: 1 addition & 1 deletion SilKit/source/core/participant/CreateParticipantT.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 "CreateParticipantT.hpp"
#include "core/participant/CreateParticipantT.hpp"
4 changes: 2 additions & 2 deletions SilKit/source/core/participant/CreateParticipantT.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#pragma once

#include "ValidateAndSanitizeConfig.hpp"
#include "Participant.hpp"
#include "core/participant/ValidateAndSanitizeConfig.hpp"
#include "core/participant/Participant.hpp"

namespace SilKit {
namespace Core {
Expand Down
4 changes: 2 additions & 2 deletions SilKit/source/core/participant/Participant.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 "Participant.hpp"
#include "Participant_impl.hpp"
#include "core/participant/Participant.hpp"
#include "core/participant/Participant_impl.hpp"

namespace SilKit {
namespace Core {
Expand Down
Loading
Loading