refactor: dissolve config package, since all config classes are subject dependent therefore must stay in related packages
This commit is contained in:
parent
1eab59c7d2
commit
b4557637c2
13 changed files with 12 additions and 15 deletions
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mykola2312.mptv.config;
|
||||
package com.mykola2312.mptv.crawler;
|
||||
|
||||
import org.checkerframework.checker.nullness.qual.*;
|
||||
|
||||
|
|
@ -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 = "";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mykola2312.mptv.config;
|
||||
package com.mykola2312.mptv.db;
|
||||
|
||||
public class DBConfig {
|
||||
public String url;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mykola2312.mptv.config;
|
||||
package com.mykola2312.mptv.piir;
|
||||
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mykola2312.mptv.config;
|
||||
package com.mykola2312.mptv.piir;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mykola2312.mptv.config;
|
||||
package com.mykola2312.mptv.task;
|
||||
|
||||
import org.checkerframework.checker.nullness.qual.*;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.mykola2312.mptv.config;
|
||||
package com.mykola2312.mptv.ui;
|
||||
|
||||
public class FrameConfig {
|
||||
public short width;
|
||||
|
|
@ -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.*;
|
||||
|
|
|
|||
|
|
@ -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.*;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue