Merge pull request #9 from ECFMP/api-data-download-refactor

Api data download refactor

Author: Andy Ford

include/ECFMP/ECFMP.h

@@ -4,6 +4,9 @@
 #include "ECFMP/api/EventCollection.h"
 #include "ECFMP/event/Event.h"
 #include "ECFMP/event/EventParticipant.h"
+#include "ECFMP/eventbus/EventBus.h"
+#include "ECFMP/eventbus/EventFilter.h"
+#include "ECFMP/eventbus/EventListener.h"
 #include "ECFMP/flightinformationregion/FlightInformationRegion.h"
 #include "ECFMP/flowmeasure/AirportFilter.h"
 #include "ECFMP/flowmeasure/EventFilter.h"
@@ -15,8 +18,5 @@
 #include "ECFMP/flowmeasure/RouteFilter.h"
 #include "ECFMP/http/HttpClient.h"
 #include "ECFMP/log/Logger.h"
-#include "EventListener.h"
-#include "EventListenerFilter.h"
-#include "EventListeners.h"
 #include "Sdk.h"
 #include "SdkEvents.h"

include/ECFMP/EventListener.h

@@ -47,5 +47,7 @@ namespace ECFMP::Event {
          * Compares events.
          */
         [[nodiscard]] auto operator==(const class Event& event) const -> bool;
+
+        // TODO: Event participants
     };
 }// namespace ECFMP::Event

include/ECFMP/EventListenerFilter.h

@@ -7,9 +7,6 @@
 
 namespace ECFMP::EventBus {
 
-    template<typename EventType>
-    class EventStreamFactory;
-
     class EventBus
     {
         public:
@@ -18,15 +15,14 @@ namespace ECFMP::EventBus {
          * Subscribes the given listener to the event stream.
          */
         template<typename EventType>
-        void Subscribe(std::shared_ptr<NewEventListener<EventType>> listener)
+        void Subscribe(std::shared_ptr<EventListener<EventType>> listener)
         {
             Subscribe<EventType>(listener, nullptr);
         };
 
         template<typename EventType>
-        void Subscribe(
-                std::shared_ptr<NewEventListener<EventType>> listener, std::shared_ptr<NewEventFilter<EventType>> filter
-        )
+        void
+        Subscribe(std::shared_ptr<EventListener<EventType>> listener, std::shared_ptr<EventFilter<EventType>> filter)
         {
             GetStream<EventType>().Subscribe(listener, filter);
         };
@@ -35,19 +31,30 @@ namespace ECFMP::EventBus {
          * Subscribes the given listener to the event stream, but only for the next event.
          */
         template<typename EventType>
-        void SubscribeOnce(std::shared_ptr<NewEventListener<EventType>> listener)
+        void SubscribeOnce(std::shared_ptr<EventListener<EventType>> listener)
         {
             SubscribeOnce<EventType>(listener, nullptr);
         }
 
         template<typename EventType>
         void SubscribeOnce(
-                std::shared_ptr<NewEventListener<EventType>> listener, std::shared_ptr<NewEventFilter<EventType>> filter
+                std::shared_ptr<EventListener<EventType>> listener, std::shared_ptr<EventFilter<EventType>> filter
         )
         {
             GetStream<EventType>().SubscribeOnce(listener, filter);
         };
 
+        /**
+         * Checks whether a specified type of listener is registered for a specified type of event.
+         *
+         * Can be used for test assertions.
+         */
+        template<typename ListenerType, typename EventType>
+        [[nodiscard]] auto HasListenerOfType() -> bool
+        {
+            return GetStream<EventType>().template HasListenerOfType<ListenerType>();
+        }
+
         private:
         template<typename EventType>
         auto GetStream() -> InternalEventStream<EventType>&

include/ECFMP/EventListeners.h

@@ -3,10 +3,10 @@
 namespace ECFMP::EventBus {
 
     template<typename EventType>
-    class NewEventFilter
+    class EventFilter
     {
         public:
-        virtual ~NewEventFilter() = default;
+        virtual ~EventFilter() = default;
         virtual bool ShouldProcess(const EventType&) = 0;
     };
 }// namespace ECFMP::EventBus

include/ECFMP/event/Event.h

@@ -2,10 +2,10 @@
 
 namespace ECFMP::EventBus {
     template<typename EventType>
-    class NewEventListener
+    class EventListener
     {
         public:
-        virtual ~NewEventListener() = default;
+        virtual ~EventListener() = default;
         virtual void OnEvent(const EventType&) = 0;
     };
 }// namespace ECFMP::EventBus

include/ECFMP/eventbus/EventBus.h

@@ -6,14 +6,14 @@
 namespace ECFMP::EventBus {
 
     template<typename EventType>
-    class NewEventListener;
+    class EventListener;
     template<typename EventType>
-    class NewEventFilter;
+    class EventFilter;
 
     template<typename EventType>
     struct EventSubscription {
-        std::shared_ptr<NewEventListener<EventType>> listener;
-        std::shared_ptr<NewEventFilter<EventType>> filter;
+        std::shared_ptr<EventListener<EventType>> listener;
+        std::shared_ptr<EventFilter<EventType>> filter;
         bool once;
     };
 
@@ -26,14 +26,13 @@ namespace ECFMP::EventBus {
         /**
          * Subscribes the given listener to the event stream.
          */
-        void Subscribe(std::shared_ptr<NewEventListener<EventType>> listener)
+        void Subscribe(std::shared_ptr<EventListener<EventType>> listener)
         {
             Subscribe(listener, nullptr);
         };
 
-        virtual void Subscribe(
-                std::shared_ptr<NewEventListener<EventType>> listener, std::shared_ptr<NewEventFilter<EventType>> filter
-        )
+        virtual void
+        Subscribe(std::shared_ptr<EventListener<EventType>> listener, std::shared_ptr<EventFilter<EventType>> filter)
         {
             if (listener == nullptr) {
                 throw std::invalid_argument("listener cannot be null");
@@ -46,13 +45,13 @@ namespace ECFMP::EventBus {
         /**
          * Subscribes the given listener to the event stream, but only for the next event.
          */
-        virtual void SubscribeOnce(std::shared_ptr<NewEventListener<EventType>> listener)
+        virtual void SubscribeOnce(std::shared_ptr<EventListener<EventType>> listener)
         {
             SubscribeOnce(listener, nullptr);
         }
 
         virtual void SubscribeOnce(
-                std::shared_ptr<NewEventListener<EventType>> listener, std::shared_ptr<NewEventFilter<EventType>> filter
+                std::shared_ptr<EventListener<EventType>> listener, std::shared_ptr<EventFilter<EventType>> filter
         )
         {
             if (listener == nullptr) {

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

@@ -4,7 +4,7 @@
 
 namespace ECFMP::Mock::FlowMeasure {
 
-    class LevelRangeFilterMock : public ECFMP::FlowMeasure::MultipleLevelFilter
+    class MultipleLevelFilterMock : public ECFMP::FlowMeasure::MultipleLevelFilter
     {
         public:
         MOCK_METHOD(std::vector<int>, Levels, (), (const, noexcept, override));