From 0059e34570461ab567eea91fd716e3e10262913e Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Tue, 14 May 2019 10:58:26 +0200
Subject: [PATCH 1/3] changes in event

---
 FlippR-Driver/src/input/Event.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FlippR-Driver/src/input/Event.cpp b/FlippR-Driver/src/input/Event.cpp
index a68be06..60f8eb5 100644
--- a/FlippR-Driver/src/input/Event.cpp
+++ b/FlippR-Driver/src/input/Event.cpp
@@ -24,7 +24,7 @@ Event::Event(uint8_t address, int priority, std::string name) :
 std::string Event::getJsonString()
 {
   nlohmann::json json;
-  
+
   json["name"] = this->name;
   json["address"] = this->address;
   json["priority"] = this->priority;

From 628838baa4b3a38f6a8766495c770b09c3831cd9 Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Tue, 21 May 2019 23:12:49 +0200
Subject: [PATCH 2/3] adapted cmake file

---
 FlippR-Driver/networking/CMakeLists.txt          | 2 ++
 FlippR-Driver/networking/input/SocketHandler.cpp | 5 +++--
 FlippR-Driver/networking/input/SocketHandler.h   | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/FlippR-Driver/networking/CMakeLists.txt b/FlippR-Driver/networking/CMakeLists.txt
index 6b02abb..0d0baa2 100644
--- a/FlippR-Driver/networking/CMakeLists.txt
+++ b/FlippR-Driver/networking/CMakeLists.txt
@@ -6,11 +6,13 @@ set(SOURCES
         input/SocketHandler.cpp
         output/OutputRequestHandler.cpp
         output/OutputRequestHandlerFactory.cpp
+        output/OutputHTTPServer.cpp
         )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src)
 target_link_libraries(${PROJECT_NAME} PRIVATE FlippR-Driver)
 
 ####################### POCO ##############################
diff --git a/FlippR-Driver/networking/input/SocketHandler.cpp b/FlippR-Driver/networking/input/SocketHandler.cpp
index 57594be..0c04147 100644
--- a/FlippR-Driver/networking/input/SocketHandler.cpp
+++ b/FlippR-Driver/networking/input/SocketHandler.cpp
@@ -11,7 +11,7 @@
 using Poco::Net::StreamSocket;
 using Poco::Net::TCPServerConnection;
 using flippR_driver::input::InputDriver;
-using flippR_driver::input::detail::EventHandler;
+using flippR_driver::input::EventHandler;
 using flippR_driver::input::Event;
 
 namespace flippR_driver
@@ -53,7 +53,8 @@ void SocketHandler::handle(Event &event)
   this->queue->push(event);
 }
 
+
+}
 }
 }
 }
-}
\ No newline at end of file
diff --git a/FlippR-Driver/networking/input/SocketHandler.h b/FlippR-Driver/networking/input/SocketHandler.h
index 00a3147..1ad7085 100644
--- a/FlippR-Driver/networking/input/SocketHandler.h
+++ b/FlippR-Driver/networking/input/SocketHandler.h
@@ -14,6 +14,7 @@
 #include "input/InputDriver.h"
 #include "input/EventHandler.h"
 #include "input/Event.h"
+#include "utility/IBlockingQueue.h"
 
 namespace flippR_driver
 {
@@ -23,7 +24,7 @@ namespace networking
 {
 namespace input
 {
-class SocketHandler : public Poco::Net::TCPServerConnection, flippR_driver::input::detail::EventHandler
+class SocketHandler : public Poco::Net::TCPServerConnection, flippR_driver::input::EventHandler
 {
 public:
   SocketHandler(Poco::Net::StreamSocket streamSocket, std::shared_ptr<flippR_driver::input::InputDriver> input_driver);

From 4c165d39488fecc26d8ddad4303bbb4507f75806 Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Tue, 21 May 2019 23:19:31 +0200
Subject: [PATCH 3/3] adapted namespaces

---
 FlippR-Driver/networking/input/SocketHandler.cpp | 3 ---
 FlippR-Driver/networking/input/SocketHandler.h   | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/FlippR-Driver/networking/input/SocketHandler.cpp b/FlippR-Driver/networking/input/SocketHandler.cpp
index 0c04147..57ae585 100644
--- a/FlippR-Driver/networking/input/SocketHandler.cpp
+++ b/FlippR-Driver/networking/input/SocketHandler.cpp
@@ -16,8 +16,6 @@ using flippR_driver::input::Event;
 
 namespace flippR_driver
 {
-namespace utility
-{
 namespace networking
 {
 namespace input
@@ -57,4 +55,3 @@ void SocketHandler::handle(Event &event)
 }
 }
 }
-}
diff --git a/FlippR-Driver/networking/input/SocketHandler.h b/FlippR-Driver/networking/input/SocketHandler.h
index 1ad7085..d61f44a 100644
--- a/FlippR-Driver/networking/input/SocketHandler.h
+++ b/FlippR-Driver/networking/input/SocketHandler.h
@@ -18,8 +18,6 @@
 
 namespace flippR_driver
 {
-namespace utility
-{
 namespace networking
 {
 namespace input
@@ -39,6 +37,5 @@ private:
 }
 }
 }
-}
 
 #endif //FLIPPR_CODE_INPUTSOCKETCONNECTION_H