From b4557637c20e881a90c30e07d3b654c7a21805dd Mon Sep 17 00:00:00 2001
From: mykola2312 <49044616+mykola2312@users.noreply.github.com>
Date: Sat, 27 Apr 2024 21:10:27 +0300
Subject: [PATCH] refactor: dissolve config package, since all config classes
 are subject dependent therefore must stay in related packages

---
 src/main/java/com/mykola2312/mptv/{config => }/Config.java  | 6 +++++-
 src/main/java/com/mykola2312/mptv/Main.java                 | 1 -
 src/main/java/com/mykola2312/mptv/crawler/Crawler.java      | 1 -
 .../com/mykola2312/mptv/{config => crawler}/SourceItem.java | 2 +-
 src/main/java/com/mykola2312/mptv/db/DB.java                | 2 --
 .../java/com/mykola2312/mptv/{config => db}/DBConfig.java   | 2 +-
 .../com/mykola2312/mptv/{config => piir}/PiIRBindItem.java  | 2 +-
 .../com/mykola2312/mptv/{config => piir}/PiIRConfig.java    | 2 +-
 src/main/java/com/mykola2312/mptv/task/TaskDispatcher.java  | 1 -
 .../java/com/mykola2312/mptv/{config => task}/TaskItem.java | 2 +-
 .../com/mykola2312/mptv/{config => ui}/FrameConfig.java     | 2 +-
 src/main/java/com/mykola2312/mptv/ui/MainFrame.java         | 1 -
 src/test/java/com/mykola2312/mptv/TestConfig.java           | 3 +--
 13 files changed, 12 insertions(+), 15 deletions(-)
 rename src/main/java/com/mykola2312/mptv/{config => }/Config.java (68%)
 rename src/main/java/com/mykola2312/mptv/{config => crawler}/SourceItem.java (95%)
 rename src/main/java/com/mykola2312/mptv/{config => db}/DBConfig.java (73%)
 rename src/main/java/com/mykola2312/mptv/{config => piir}/PiIRBindItem.java (88%)
 rename src/main/java/com/mykola2312/mptv/{config => piir}/PiIRConfig.java (86%)
 rename src/main/java/com/mykola2312/mptv/{config => task}/TaskItem.java (82%)
 rename src/main/java/com/mykola2312/mptv/{config => ui}/FrameConfig.java (82%)

diff --git a/src/main/java/com/mykola2312/mptv/config/Config.java b/src/main/java/com/mykola2312/mptv/Config.java
similarity index 68%
rename from src/main/java/com/mykola2312/mptv/config/Config.java
rename to src/main/java/com/mykola2312/mptv/Config.java
index 5b4746b..c3fe574 100644
--- a/src/main/java/com/mykola2312/mptv/config/Config.java
+++ b/src/main/java/com/mykola2312/mptv/Config.java
@@ -1,6 +1,10 @@
-package com.mykola2312.mptv.config;
+package com.mykola2312.mptv;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mykola2312.mptv.crawler.SourceItem;
+import com.mykola2312.mptv.db.DBConfig;
+import com.mykola2312.mptv.task.TaskItem;
+import com.mykola2312.mptv.ui.FrameConfig;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/com/mykola2312/mptv/Main.java b/src/main/java/com/mykola2312/mptv/Main.java
index 2f3a4ec..62f3892 100644
--- a/src/main/java/com/mykola2312/mptv/Main.java
+++ b/src/main/java/com/mykola2312/mptv/Main.java
@@ -1,6 +1,5 @@
 package com.mykola2312.mptv;
 
-import com.mykola2312.mptv.config.Config;
 import com.mykola2312.mptv.crawler.Crawler;
 import com.mykola2312.mptv.db.DB;
 import com.mykola2312.mptv.task.ProcessService;
diff --git a/src/main/java/com/mykola2312/mptv/crawler/Crawler.java b/src/main/java/com/mykola2312/mptv/crawler/Crawler.java
index 6d9dff8..6eac83b 100644
--- a/src/main/java/com/mykola2312/mptv/crawler/Crawler.java
+++ b/src/main/java/com/mykola2312/mptv/crawler/Crawler.java
@@ -21,7 +21,6 @@ import static com.mykola2312.mptv.tables.Channel.*;
 import static com.mykola2312.mptv.tables.Source.*;
 import static com.mykola2312.mptv.tables.Crawl.*;
 
-import com.mykola2312.mptv.config.SourceItem;
 import com.mykola2312.mptv.parser.M3U;
 import com.mykola2312.mptv.parser.M3UException;
 import com.mykola2312.mptv.parser.M3UParser;
diff --git a/src/main/java/com/mykola2312/mptv/config/SourceItem.java b/src/main/java/com/mykola2312/mptv/crawler/SourceItem.java
similarity index 95%
rename from src/main/java/com/mykola2312/mptv/config/SourceItem.java
rename to src/main/java/com/mykola2312/mptv/crawler/SourceItem.java
index 87149ed..0448a39 100644
--- a/src/main/java/com/mykola2312/mptv/config/SourceItem.java
+++ b/src/main/java/com/mykola2312/mptv/crawler/SourceItem.java
@@ -1,4 +1,4 @@
-package com.mykola2312.mptv.config;
+package com.mykola2312.mptv.crawler;
 
 import org.checkerframework.checker.nullness.qual.*;
 
diff --git a/src/main/java/com/mykola2312/mptv/db/DB.java b/src/main/java/com/mykola2312/mptv/db/DB.java
index 5bea2d3..1619a39 100644
--- a/src/main/java/com/mykola2312/mptv/db/DB.java
+++ b/src/main/java/com/mykola2312/mptv/db/DB.java
@@ -8,8 +8,6 @@ import org.jooq.Configuration;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DefaultConfiguration;
 
-import com.mykola2312.mptv.config.DBConfig;
-
 public class DB {
     public static String URL = "jdbc:sqlite:mptv.db";
     public static String USER = "";
diff --git a/src/main/java/com/mykola2312/mptv/config/DBConfig.java b/src/main/java/com/mykola2312/mptv/db/DBConfig.java
similarity index 73%
rename from src/main/java/com/mykola2312/mptv/config/DBConfig.java
rename to src/main/java/com/mykola2312/mptv/db/DBConfig.java
index 8f16fb5..26d131d 100644
--- a/src/main/java/com/mykola2312/mptv/config/DBConfig.java
+++ b/src/main/java/com/mykola2312/mptv/db/DBConfig.java
@@ -1,4 +1,4 @@
-package com.mykola2312.mptv.config;
+package com.mykola2312.mptv.db;
 
 public class DBConfig {
     public String url;
diff --git a/src/main/java/com/mykola2312/mptv/config/PiIRBindItem.java b/src/main/java/com/mykola2312/mptv/piir/PiIRBindItem.java
similarity index 88%
rename from src/main/java/com/mykola2312/mptv/config/PiIRBindItem.java
rename to src/main/java/com/mykola2312/mptv/piir/PiIRBindItem.java
index 6d24b4d..a278239 100644
--- a/src/main/java/com/mykola2312/mptv/config/PiIRBindItem.java
+++ b/src/main/java/com/mykola2312/mptv/piir/PiIRBindItem.java
@@ -1,4 +1,4 @@
-package com.mykola2312.mptv.config;
+package com.mykola2312.mptv.piir;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 
diff --git a/src/main/java/com/mykola2312/mptv/config/PiIRConfig.java b/src/main/java/com/mykola2312/mptv/piir/PiIRConfig.java
similarity index 86%
rename from src/main/java/com/mykola2312/mptv/config/PiIRConfig.java
rename to src/main/java/com/mykola2312/mptv/piir/PiIRConfig.java
index dad3557..cd700eb 100644
--- a/src/main/java/com/mykola2312/mptv/config/PiIRConfig.java
+++ b/src/main/java/com/mykola2312/mptv/piir/PiIRConfig.java
@@ -1,4 +1,4 @@
-package com.mykola2312.mptv.config;
+package com.mykola2312.mptv.piir;
 
 import java.util.List;
 
diff --git a/src/main/java/com/mykola2312/mptv/task/TaskDispatcher.java b/src/main/java/com/mykola2312/mptv/task/TaskDispatcher.java
index 75472b1..fcb9b15 100644
--- a/src/main/java/com/mykola2312/mptv/task/TaskDispatcher.java
+++ b/src/main/java/com/mykola2312/mptv/task/TaskDispatcher.java
@@ -12,7 +12,6 @@ import org.jooq.exception.NoDataFoundException;
 import org.jooq.impl.*;
 import static com.mykola2312.mptv.tables.Task.*;
 
-import com.mykola2312.mptv.config.TaskItem;
 import com.mykola2312.mptv.db.DB;
 import com.mykola2312.mptv.tables.records.TaskRecord;
 
diff --git a/src/main/java/com/mykola2312/mptv/config/TaskItem.java b/src/main/java/com/mykola2312/mptv/task/TaskItem.java
similarity index 82%
rename from src/main/java/com/mykola2312/mptv/config/TaskItem.java
rename to src/main/java/com/mykola2312/mptv/task/TaskItem.java
index 81f4e7d..27da858 100644
--- a/src/main/java/com/mykola2312/mptv/config/TaskItem.java
+++ b/src/main/java/com/mykola2312/mptv/task/TaskItem.java
@@ -1,4 +1,4 @@
-package com.mykola2312.mptv.config;
+package com.mykola2312.mptv.task;
 
 import org.checkerframework.checker.nullness.qual.*;
 
diff --git a/src/main/java/com/mykola2312/mptv/config/FrameConfig.java b/src/main/java/com/mykola2312/mptv/ui/FrameConfig.java
similarity index 82%
rename from src/main/java/com/mykola2312/mptv/config/FrameConfig.java
rename to src/main/java/com/mykola2312/mptv/ui/FrameConfig.java
index 4316ba4..3a34ed3 100644
--- a/src/main/java/com/mykola2312/mptv/config/FrameConfig.java
+++ b/src/main/java/com/mykola2312/mptv/ui/FrameConfig.java
@@ -1,4 +1,4 @@
-package com.mykola2312.mptv.config;
+package com.mykola2312.mptv.ui;
 
 public class FrameConfig {
     public short width;
diff --git a/src/main/java/com/mykola2312/mptv/ui/MainFrame.java b/src/main/java/com/mykola2312/mptv/ui/MainFrame.java
index 645ae3e..f452fbb 100644
--- a/src/main/java/com/mykola2312/mptv/ui/MainFrame.java
+++ b/src/main/java/com/mykola2312/mptv/ui/MainFrame.java
@@ -1,7 +1,6 @@
 package com.mykola2312.mptv.ui;
 
 import com.mykola2312.mptv.I18n;
-import com.mykola2312.mptv.config.FrameConfig;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/test/java/com/mykola2312/mptv/TestConfig.java b/src/test/java/com/mykola2312/mptv/TestConfig.java
index 0d9090b..61934f6 100644
--- a/src/test/java/com/mykola2312/mptv/TestConfig.java
+++ b/src/test/java/com/mykola2312/mptv/TestConfig.java
@@ -3,8 +3,7 @@ package com.mykola2312.mptv;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.mykola2312.mptv.config.Config;
-import com.mykola2312.mptv.config.SourceItem;
+import com.mykola2312.mptv.crawler.SourceItem;
 
 import static org.junit.jupiter.api.Assertions.*;