Skip to content

Commit ed4565e

Browse files
AndyTWFAndyTWF
committed
refactor: rename listener classes
1 parent 1ba0405 commit ed4565e

11 files changed

Lines changed: 35 additions & 37 deletions

File tree

‎include/ECFMP/eventbus/EventBus.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ namespace ECFMP::EventBus {
1515
* Subscribes the given listener to the event stream.
1616
*/
1717
template<typename EventType>
18-
void Subscribe(std::shared_ptr<NewEventListener<EventType>> listener)
18+
void Subscribe(std::shared_ptr<EventListener<EventType>> listener)
1919
{
2020
Subscribe<EventType>(listener, nullptr);
2121
};
2222

2323
template<typename EventType>
24-
void Subscribe(
25-
std::shared_ptr<NewEventListener<EventType>> listener, std::shared_ptr<NewEventFilter<EventType>> filter
26-
)
24+
void
25+
Subscribe(std::shared_ptr<EventListener<EventType>> listener, std::shared_ptr<EventFilter<EventType>> filter)
2726
{
2827
GetStream<EventType>().Subscribe(listener, filter);
2928
};
@@ -32,14 +31,14 @@ namespace ECFMP::EventBus {
3231
* Subscribes the given listener to the event stream, but only for the next event.
3332
*/
3433
template<typename EventType>
35-
void SubscribeOnce(std::shared_ptr<NewEventListener<EventType>> listener)
34+
void SubscribeOnce(std::shared_ptr<EventListener<EventType>> listener)
3635
{
3736
SubscribeOnce<EventType>(listener, nullptr);
3837
}
3938

4039
template<typename EventType>
4140
void SubscribeOnce(
42-
std::shared_ptr<NewEventListener<EventType>> listener, std::shared_ptr<NewEventFilter<EventType>> filter
41+
std::shared_ptr<EventListener<EventType>> listener, std::shared_ptr<EventFilter<EventType>> filter
4342
)
4443
{
4544
GetStream<EventType>().SubscribeOnce(listener, filter);

include/ECFMP/eventbus/NewEventFilter.h renamed to include/ECFMP/eventbus/EventFilter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace ECFMP::EventBus {
44

55
template<typename EventType>
6-
class NewEventFilter
6+
class EventFilter
77
{
88
public:
9-
virtual ~NewEventFilter() = default;
9+
virtual ~EventFilter() = default;
1010
virtual bool ShouldProcess(const EventType&) = 0;
1111
};
1212
}// namespace ECFMP::EventBus

include/ECFMP/eventbus/NewEventListener.h renamed to include/ECFMP/eventbus/EventListener.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace ECFMP::EventBus {
44
template<typename EventType>
5-
class NewEventListener
5+
class EventListener
66
{
77
public:
8-
virtual ~NewEventListener() = default;
8+
virtual ~EventListener() = default;
99
virtual void OnEvent(const EventType&) = 0;
1010
};
1111
}// namespace ECFMP::EventBus

‎include/ECFMP/eventbus/EventStream.h‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
namespace ECFMP::EventBus {
77

88
template<typename EventType>
9-
class NewEventListener;
9+
class EventListener;
1010
template<typename EventType>
11-
class NewEventFilter;
11+
class EventFilter;
1212

1313
template<typename EventType>
1414
struct EventSubscription {
15-
std::shared_ptr<NewEventListener<EventType>> listener;
16-
std::shared_ptr<NewEventFilter<EventType>> filter;
15+
std::shared_ptr<EventListener<EventType>> listener;
16+
std::shared_ptr<EventFilter<EventType>> filter;
1717
bool once;
1818
};
1919

@@ -26,14 +26,13 @@ namespace ECFMP::EventBus {
2626
/**
2727
* Subscribes the given listener to the event stream.
2828
*/
29-
void Subscribe(std::shared_ptr<NewEventListener<EventType>> listener)
29+
void Subscribe(std::shared_ptr<EventListener<EventType>> listener)
3030
{
3131
Subscribe(listener, nullptr);
3232
};
3333

34-
virtual void Subscribe(
35-
std::shared_ptr<NewEventListener<EventType>> listener, std::shared_ptr<NewEventFilter<EventType>> filter
36-
)
34+
virtual void
35+
Subscribe(std::shared_ptr<EventListener<EventType>> listener, std::shared_ptr<EventFilter<EventType>> filter)
3736
{
3837
if (listener == nullptr) {
3938
throw std::invalid_argument("listener cannot be null");
@@ -46,13 +45,13 @@ namespace ECFMP::EventBus {
4645
/**
4746
* Subscribes the given listener to the event stream, but only for the next event.
4847
*/
49-
virtual void SubscribeOnce(std::shared_ptr<NewEventListener<EventType>> listener)
48+
virtual void SubscribeOnce(std::shared_ptr<EventListener<EventType>> listener)
5049
{
5150
SubscribeOnce(listener, nullptr);
5251
}
5352

5453
virtual void SubscribeOnce(
55-
std::shared_ptr<NewEventListener<EventType>> listener, std::shared_ptr<NewEventFilter<EventType>> filter
54+
std::shared_ptr<EventListener<EventType>> listener, std::shared_ptr<EventFilter<EventType>> filter
5655
)
5756
{
5857
if (listener == nullptr) {

‎src/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ set(src_flight_information_regions
1414
set(src_events
1515
event/ConcreteEvent.cpp event/ConcreteEvent.h
1616
event/ConcreteEventParticipant.cpp "event/ConcreteEventParticipant.h"
17-
event/Event.cpp ../include/ECFMP/eventbus/EventStream.h ../include/ECFMP/eventbus/NewEventListener.h ../include/ECFMP/eventbus/NewEventFilter.h)
17+
event/Event.cpp ../include/ECFMP/eventbus/EventStream.h ../include/ECFMP/eventbus/EventListener.h ../include/ECFMP/eventbus/EventFilter.h)
1818

1919
set(src_eventbus
2020
../include/ECFMP/eventbus/EventStream.h
21-
../include/ECFMP/eventbus/NewEventListener.h
22-
../include/ECFMP/eventbus/NewEventFilter.h eventbus/InternalEventStream.h ../include/ECFMP/eventbus/EventBus.h eventbus/InternalEventBus.h)
21+
../include/ECFMP/eventbus/EventListener.h
22+
../include/ECFMP/eventbus/EventFilter.h eventbus/InternalEventStream.h ../include/ECFMP/eventbus/EventBus.h eventbus/InternalEventBus.h)
2323

2424
set(src_flowmeasures
2525
flowmeasure/ConcreteFlowMeasure.cpp flowmeasure/ConcreteFlowMeasure.h flowmeasure/ConcreteAirportFilter.cpp flowmeasure/ConcreteAirportFilter.h flowmeasure/ConcreteEventFilter.cpp flowmeasure/ConcreteEventFilter.h flowmeasure/ConcreteLevelRangeFilter.cpp flowmeasure/ConcreteLevelRangeFilter.h flowmeasure/ConcreteRouteFilter.cpp flowmeasure/ConcreteRouteFilter.h flowmeasure/ConcreteMeasure.cpp flowmeasure/ConcreteMeasure.h flowmeasure/ConcreteMeasureFactory.cpp flowmeasure/ConcreteMeasureFactory.h flowmeasure/ConcreteFlowMeasureFilters.cpp flowmeasure/ConcreteFlowMeasureFilters.h api/FlowMeasureFilterParserInterface.h ../include/ECFMP/flowmeasure/MultipleLevelFilter.h flowmeasure/ConcreteMultipleLevelFilter.cpp flowmeasure/ConcreteMultipleLevelFilter.h ../include/mock/MultipleLevelFilterMock.h ../include/ECFMP/flowmeasure/RangeToDestinationFilter.h flowmeasure/ConcreteRangeToDestinationFilter.cpp flowmeasure/ConcreteRangeToDestinationFilter.h)

‎src/api/ApiDataParser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include "ApiDataDownloadedEvent.h"
3-
#include "ECFMP/eventbus/NewEventListener.h"
3+
#include "ECFMP/eventbus/EventListener.h"
44

55
namespace ECFMP::Log {
66
class Logger;
@@ -12,7 +12,7 @@ namespace ECFMP::Api {
1212
class FlightInformationRegionDataParserInterface;
1313
class FlowMeasureDataParserInterface;
1414

15-
class ApiDataParser : public EventBus::NewEventListener<ApiDataDownloadedEvent>
15+
class ApiDataParser : public EventBus::EventListener<ApiDataDownloadedEvent>
1616
{
1717
public:
1818
ApiDataParser(

‎src/eventbus/InternalEventStream.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
2+
#include "ECFMP/eventbus/EventFilter.h"
3+
#include "ECFMP/eventbus/EventListener.h"
24
#include "ECFMP/eventbus/EventStream.h"
3-
#include "ECFMP/eventbus/NewEventFilter.h"
4-
#include "ECFMP/eventbus/NewEventListener.h"
55

66
namespace ECFMP::EventBus {
77

‎test/api/ApiDataDownloaderTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace ECFMPTest::Api {
99

10-
class MockEventHandler : public ECFMP::EventBus::NewEventListener<ECFMP::Api::ApiDataDownloadedEvent>
10+
class MockEventHandler : public ECFMP::EventBus::EventListener<ECFMP::Api::ApiDataDownloadedEvent>
1111
{
1212
public:
1313
explicit MockEventHandler(nlohmann::json expectedJson) : expectedJson(std::move(expectedJson))

‎test/eventbus/InternalEventBusTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include "eventbus/InternalEventBus.h"
2-
#include "ECFMP/eventbus/NewEventFilter.h"
3-
#include "ECFMP/eventbus/NewEventListener.h"
2+
#include "ECFMP/eventbus/EventFilter.h"
3+
#include "ECFMP/eventbus/EventListener.h"
44

55
namespace ECFMPTest::EvenBus {
66

7-
class MockEventListener : public ECFMP::EventBus::NewEventListener<int>
7+
class MockEventListener : public ECFMP::EventBus::EventListener<int>
88
{
99
public:
1010
explicit MockEventListener(int expectedEvent) : expectedEvent(expectedEvent)
@@ -20,7 +20,7 @@ namespace ECFMPTest::EvenBus {
2020
int callCount = 0;
2121
};
2222

23-
class MockEventFilter : public ECFMP::EventBus::NewEventFilter<int>
23+
class MockEventFilter : public ECFMP::EventBus::EventFilter<int>
2424
{
2525
public:
2626
explicit MockEventFilter(int expectedEvent, bool shouldProcess)

‎test/eventbus/InternalEventStreamTest.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "eventbus/InternalEventStream.h"
2-
#include "ECFMP/eventbus/NewEventListener.h"
2+
#include "ECFMP/eventbus/EventListener.h"
33

44
namespace ECFMP::EventBus {
55

6-
class MockEventListener : public NewEventListener<int>
6+
class MockEventListener : public EventListener<int>
77
{
88
public:
99
explicit MockEventListener(int expectedEvent) : expectedEvent(expectedEvent)
@@ -19,7 +19,7 @@ namespace ECFMP::EventBus {
1919
int callCount = 0;
2020
};
2121

22-
class MockEventFilter : public NewEventFilter<int>
22+
class MockEventFilter : public EventFilter<int>
2323
{
2424
public:
2525
explicit MockEventFilter(int expectedEvent, bool shouldProcess)

0 commit comments

Comments
 (0)