restructure io folder

vovatrykoz · Nov 22, 2024 · a5a5545 · a5a5545
1 parent 46cad7b
commit a5a5545
Showing 22 changed files with 37 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,14 +15,14 @@ include_directories(${INCLUDE_DIR})
 add_library(
     e2e_io
 
-    ${CODE_SOURCE_DIR}/io/ConsoleLogger.cpp
-    ${CODE_SOURCE_DIR}/io/ConsoleTaskReader.cpp
-    ${CODE_SOURCE_DIR}/io/SimpleTextTaskReader.cpp
-    ${CODE_SOURCE_DIR}/io/TaskConsoleLogger.cpp
-    ${CODE_SOURCE_DIR}/io/TextLogger.cpp
-    ${CODE_SOURCE_DIR}/io/TaskTextLogger.cpp
-    ${CODE_SOURCE_DIR}/io/TaskInstanceInputReader.cpp
-    ${CODE_SOURCE_DIR}/io/TaskInstanceSimpleTextReader.cpp
+    ${CODE_SOURCE_DIR}/io/logger/ConsoleLogger.cpp
+    ${CODE_SOURCE_DIR}/io/logger/TaskConsoleLogger.cpp
+    ${CODE_SOURCE_DIR}/io/logger/TextLogger.cpp
+    ${CODE_SOURCE_DIR}/io/logger/TaskTextLogger.cpp
+    ${CODE_SOURCE_DIR}/io/reader/ConsoleTaskReader.cpp
+    ${CODE_SOURCE_DIR}/io/reader/SimpleTextTaskReader.cpp
+    ${CODE_SOURCE_DIR}/io/reader/TaskInstanceInputReader.cpp
+    ${CODE_SOURCE_DIR}/io/reader/TaskInstanceSimpleTextReader.cpp
 )
 
 add_library(

diff --git a/include/Setup.h b/include/Setup.h
@@ -1,18 +1,13 @@
 #ifndef _SETUP_H_
 #define _SETUP_H_
 
-#include <io/ConsoleLogger.h>
-#include <io/ConsoleTaskReader.h>
-#include <io/SimpleTextTaskReader.h>
-#include <io/TaskInstanceInputReader.h>
-#include <io/TaskInstanceSimpleTextReader.h>
-#include <io/TextLogger.h>
-#include <io/TaskTextLogger.h>
-#include <io/TaskConsoleLogger.h>
-
 #include <memory>
 #include <optional>
 
+#include <io/logger/ILogger.h>
+#include <io/reader/ITaskReader.h>
+#include <io/reader/ITaskInstanceReader.h>
+
 namespace e2e {
 namespace setup {
 

diff --git a/include/io/ConsoleLogger.h → include/io/logger/ConsoleLogger.h b/include/io/ConsoleLogger.h → include/io/logger/ConsoleLogger.h
@@ -1,7 +1,7 @@
 #ifndef _CONSOLE_LOGGER_H_
 #define _CONSOLE_LOGGER_H_
 
-#include <io/ILogger.h>
+#include <io/logger/ILogger.h>
 
 namespace e2e {
 namespace io {

diff --git a/include/io/ILogger.h → include/io/logger/ILogger.h b/include/io/ILogger.h → include/io/logger/ILogger.h
diff --git a/include/io/TaskConsoleLogger.h → include/io/logger/TaskConsoleLogger.h b/include/io/TaskConsoleLogger.h → include/io/logger/TaskConsoleLogger.h
@@ -1,7 +1,7 @@
 #ifndef _TASK_CONSOLE_LOGGER_H_
 #define _TASK_CONSOLE_LOGGER_H_
 
-#include <io/ILogger.h>
+#include <io/logger/ILogger.h>
 
 namespace e2e {
 namespace io {

diff --git a/include/io/TaskTextLogger.h → include/io/logger/TaskTextLogger.h b/include/io/TaskTextLogger.h → include/io/logger/TaskTextLogger.h
@@ -1,7 +1,7 @@
 #ifndef _TASK_TEXT_LOGGER_H_
 #define _TASK_TEXT_LOGGER_H_
 
-#include <io/ILogger.h>
+#include <io/logger/ILogger.h>
 
 namespace e2e {
 namespace io {

diff --git a/include/io/TextLogger.h → include/io/logger/TextLogger.h b/include/io/TextLogger.h → include/io/logger/TextLogger.h
@@ -1,7 +1,7 @@
 #ifndef _TEXT_LOGGER_H_
 #define _TEXT_LOGGER_H_
 
-#include <io/ILogger.h>
+#include <io/logger/ILogger.h>
 
 namespace e2e {
 namespace io {

diff --git a/include/io/ConsoleTaskReader.h → include/io/reader/ConsoleTaskReader.h b/include/io/ConsoleTaskReader.h → include/io/reader/ConsoleTaskReader.h
@@ -1,7 +1,7 @@
 #ifndef _CONSOLE_TASK_READER_H_
 #define _CONSOLE_TASK_READER_H_
 
-#include <io/ITaskReader.h>
+#include <io/reader/ITaskReader.h>
 
 namespace e2e {
 namespace io {

diff --git a/include/io/ITaskInstanceReader.h → include/io/reader/ITaskInstanceReader.h b/include/io/ITaskInstanceReader.h → include/io/reader/ITaskInstanceReader.h
diff --git a/include/io/ITaskReader.h → include/io/reader/ITaskReader.h b/include/io/ITaskReader.h → include/io/reader/ITaskReader.h
diff --git a/include/io/SimpleTextTaskReader.h → include/io/reader/SimpleTextTaskReader.h b/include/io/SimpleTextTaskReader.h → include/io/reader/SimpleTextTaskReader.h
@@ -1,7 +1,7 @@
 #ifndef _SIMPLE_TEXT_TASK_READER_H_
 #define _SIMPLE_TEXT_TASK_READER_H_
 
-#include <io/ITaskReader.h>
+#include <io/reader/ITaskReader.h>
 
 namespace e2e {
 namespace io {

diff --git a/include/io/TaskInstanceInputReader.h → include/io/reader/TaskInstanceInputReader.h b/include/io/TaskInstanceInputReader.h → include/io/reader/TaskInstanceInputReader.h
@@ -1,7 +1,7 @@
 #ifndef _TASK_INSTANCE_INPUT_READER_H_
 #define _TASK_INSTANCE_INPUT_READER_H_
 
-#include <io/ITaskInstanceReader.h>
+#include <io/reader/ITaskInstanceReader.h>
 
 #include <set>
 #include <string>

diff --git a/include/io/TaskInstanceSimpleTextReader.h → .../io/reader/TaskInstanceSimpleTextReader.h b/include/io/TaskInstanceSimpleTextReader.h → .../io/reader/TaskInstanceSimpleTextReader.h
@@ -1,7 +1,7 @@
 #ifndef _TASK_INSTANCE_SIMPLE_TEXT_READER_H_
 #define _TASK_INSTANCE_SIMPLE_TEXT_READER_H_
 
-#include <io/ITaskInstanceReader.h>
+#include <io/reader/ITaskInstanceReader.h>
 
 namespace e2e {
 namespace io {

diff --git a/source/Setup.cpp b/source/Setup.cpp
@@ -1,5 +1,14 @@
 #include "Setup.h"
 
+#include <io/logger/ConsoleLogger.h>
+#include <io/reader/ConsoleTaskReader.h>
+#include <io/reader/SimpleTextTaskReader.h>
+#include <io/reader/TaskInstanceInputReader.h>
+#include <io/reader/TaskInstanceSimpleTextReader.h>
+#include <io/logger/TextLogger.h>
+#include <io/logger/TaskTextLogger.h>
+#include <io/logger/TaskConsoleLogger.h>
+
 #include <iostream>
 
 using namespace e2e;

diff --git a/source/io/ConsoleLogger.cpp → source/io/logger/ConsoleLogger.cpp b/source/io/ConsoleLogger.cpp → source/io/logger/ConsoleLogger.cpp
@@ -1,4 +1,4 @@
-#include "io/ConsoleLogger.h"
+#include "io/logger/ConsoleLogger.h"
 
 #include <iostream>
 

diff --git a/source/io/TaskConsoleLogger.cpp → source/io/logger/TaskConsoleLogger.cpp b/source/io/TaskConsoleLogger.cpp → source/io/logger/TaskConsoleLogger.cpp
@@ -1,4 +1,4 @@
-#include "io/TaskConsoleLogger.h"
+#include "io/logger/TaskConsoleLogger.h"
 
 #include <iostream>
 

diff --git a/source/io/TaskTextLogger.cpp → source/io/logger/TaskTextLogger.cpp b/source/io/TaskTextLogger.cpp → source/io/logger/TaskTextLogger.cpp
@@ -1,4 +1,4 @@
-#include "io/TaskTextLogger.h"
+#include "io/logger/TaskTextLogger.h"
 
 #include <fstream>
 #include <sstream>

diff --git a/source/io/TextLogger.cpp → source/io/logger/TextLogger.cpp b/source/io/TextLogger.cpp → source/io/logger/TextLogger.cpp
@@ -1,4 +1,4 @@
-#include "io/TextLogger.h"
+#include "io/logger/TextLogger.h"
 
 #include <fstream>
 #include <sstream>

diff --git a/source/io/ConsoleTaskReader.cpp → source/io/reader/ConsoleTaskReader.cpp b/source/io/ConsoleTaskReader.cpp → source/io/reader/ConsoleTaskReader.cpp
@@ -1,4 +1,4 @@
-#include <io/ConsoleTaskReader.h>
+#include <io/reader/ConsoleTaskReader.h>
 
 #include <iostream>
 #include <limits>

diff --git a/source/io/SimpleTextTaskReader.cpp → source/io/reader/SimpleTextTaskReader.cpp b/source/io/SimpleTextTaskReader.cpp → source/io/reader/SimpleTextTaskReader.cpp
@@ -1,4 +1,4 @@
-#include <io/SimpleTextTaskReader.h>
+#include <io/reader/SimpleTextTaskReader.h>
 
 #include <fstream>
 #include <sstream>

diff --git a/source/io/TaskInstanceInputReader.cpp → source/io/reader/TaskInstanceInputReader.cpp b/source/io/TaskInstanceInputReader.cpp → source/io/reader/TaskInstanceInputReader.cpp
@@ -1,4 +1,4 @@
-#include "io/TaskInstanceInputReader.h"
+#include "io/reader/TaskInstanceInputReader.h"
 #include <limits>
 #include <iostream>
 

diff --git a/source/io/TaskInstanceSimpleTextReader.cpp → ...o/reader/TaskInstanceSimpleTextReader.cpp b/source/io/TaskInstanceSimpleTextReader.cpp → ...o/reader/TaskInstanceSimpleTextReader.cpp
@@ -1,4 +1,4 @@
-#include "io/TaskInstanceSimpleTextReader.h"
+#include "io/reader/TaskInstanceSimpleTextReader.h"
 
 #include <fstream>
 #include <sstream>