clean-up packages

jetkai · Feb 17, 2023 · 32619ac · 32619ac
1 parent 6bec218
commit 32619ac
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 14 deletions.
diff --git a/src/main/kotlin/plugin/httpclient/checkerproxy/CheckerProxy.kt b/src/main/kotlin/plugin/httpclient/checkerproxy/CheckerProxy.kt
@@ -9,9 +9,9 @@ import mu.KotlinLogging
 import scraper.net.CoroutinesHttpClient
 import scraper.plugin.Plugin
 import scraper.plugin.PluginFactory
-import scraper.plugin.hook.ProxyData
 import scraper.plugin.hook.ProxyWebsite
 import scraper.util.NetworkUtils
+import scraper.util.data.ProxyData
 import java.net.http.HttpResponse
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter

diff --git a/src/main/kotlin/plugin/httpclient/freeproxyapi/FreeProxyApi.kt b/src/main/kotlin/plugin/httpclient/freeproxyapi/FreeProxyApi.kt
@@ -9,8 +9,8 @@ import mu.KotlinLogging
 import scraper.net.CoroutinesHttpClient
 import scraper.plugin.Plugin
 import scraper.plugin.PluginFactory
-import scraper.plugin.hook.ProxyData
 import scraper.plugin.hook.ProxyWebsite
+import scraper.util.data.ProxyData
 import java.net.http.HttpResponse
 
 /**

diff --git a/src/main/kotlin/plugin/httpclient/geonode/GeoNode.kt b/src/main/kotlin/plugin/httpclient/geonode/GeoNode.kt
@@ -9,8 +9,8 @@ import mu.KotlinLogging
 import scraper.net.CoroutinesHttpClient
 import scraper.plugin.Plugin
 import scraper.plugin.PluginFactory
-import scraper.plugin.hook.ProxyData
 import scraper.plugin.hook.ProxyWebsite
+import scraper.util.data.ProxyData
 import java.net.http.HttpResponse
 
 /**

diff --git a/src/main/kotlin/plugin/httpclient/openproxylist/OpenProxyList.kt b/src/main/kotlin/plugin/httpclient/openproxylist/OpenProxyList.kt
@@ -7,9 +7,9 @@ import mu.KotlinLogging
 import scraper.net.CoroutinesHttpClient
 import scraper.plugin.Plugin
 import scraper.plugin.PluginFactory
-import scraper.plugin.hook.ProxyData
 import scraper.plugin.hook.ProxyWebsite
 import scraper.util.NetworkUtils
+import scraper.util.data.ProxyData
 import java.net.http.HttpResponse
 
 /**

diff --git a/src/main/kotlin/plugin/httpclient/proxyscrape/ProxyScrape.kt b/src/main/kotlin/plugin/httpclient/proxyscrape/ProxyScrape.kt
@@ -7,9 +7,9 @@ import mu.KotlinLogging
 import scraper.net.CoroutinesHttpClient
 import scraper.plugin.Plugin
 import scraper.plugin.PluginFactory
-import scraper.plugin.hook.ProxyData
 import scraper.plugin.hook.ProxyWebsite
 import scraper.util.NetworkUtils
+import scraper.util.data.ProxyData
 import java.net.http.HttpResponse
 
 /**

diff --git a/src/main/kotlin/scraper/Main.kt b/src/main/kotlin/scraper/Main.kt
@@ -3,8 +3,8 @@ package scraper
 import com.fasterxml.jackson.databind.ObjectMapper
 import mu.KotlinLogging
 import scraper.plugin.PluginFactory
-import scraper.plugin.hook.ProxyOutputData
-import scraper.threading.ScraperExecutor
+import scraper.util.ScraperExecutor
+import scraper.util.data.ProxyOutputData
 import java.nio.file.Files
 import java.nio.file.Path
 import kotlin.io.path.exists

diff --git a/src/main/kotlin/scraper/plugin/hook/ProxyWebsite.kt b/src/main/kotlin/scraper/plugin/hook/ProxyWebsite.kt
@@ -1,5 +1,7 @@
 package scraper.plugin.hook
 
+import scraper.util.data.ProxyData
+
 interface ProxyWebsite {
 
     val proxies : MutableList<ProxyData>

diff --git a/...tlin/scraper/threading/ScraperExecutor.kt → ...in/kotlin/scraper/util/ScraperExecutor.kt b/...tlin/scraper/threading/ScraperExecutor.kt → ...in/kotlin/scraper/util/ScraperExecutor.kt
@@ -1,4 +1,4 @@
-package scraper.threading
+package scraper.util
 
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors

diff --git a/...scraper/threading/ScraperThreadFactory.kt → ...tlin/scraper/util/ScraperThreadFactory.kt b/...scraper/threading/ScraperThreadFactory.kt → ...tlin/scraper/util/ScraperThreadFactory.kt
@@ -1,4 +1,4 @@
-package scraper.threading
+package scraper.util
 
 import java.util.concurrent.ThreadFactory
 import java.util.concurrent.atomic.AtomicInteger

diff --git a/...n/kotlin/scraper/plugin/hook/ProxyData.kt → ...ain/kotlin/scraper/util/data/ProxyData.kt b/...n/kotlin/scraper/plugin/hook/ProxyData.kt → ...ain/kotlin/scraper/util/data/ProxyData.kt
@@ -1,4 +1,4 @@
-package scraper.plugin.hook
+package scraper.util.data
 
 data class ProxyData(var ip : String, var port : Int, var protocol : String) {
     fun values() : String {

diff --git a/...in/scraper/plugin/hook/ProxyOutputData.kt → ...tlin/scraper/util/data/ProxyOutputData.kt b/...in/scraper/plugin/hook/ProxyOutputData.kt → ...tlin/scraper/util/data/ProxyOutputData.kt
@@ -1,4 +1,4 @@
-package scraper.plugin.hook
+package scraper.util.data
 
 data class ProxyOutputData(
     val http : MutableList<String>,

diff --git a/...n/scraper/scripts/GetAllCheckerProxies.kt → ...aper/util/scripts/GetAllCheckerProxies.kt b/...n/scraper/scripts/GetAllCheckerProxies.kt → ...aper/util/scripts/GetAllCheckerProxies.kt
@@ -1,4 +1,4 @@
-package scraper.scripts
+package scraper.util.scripts
 
 import com.fasterxml.jackson.databind.JsonMappingException
 import com.fasterxml.jackson.databind.ObjectMapper
@@ -8,8 +8,8 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import plugin.httpclient.checkerproxy.CheckerProxyData
 import scraper.net.CoroutinesHttpClient
-import scraper.plugin.hook.ProxyData
-import scraper.plugin.hook.ProxyOutputData
+import scraper.util.data.ProxyData
+import scraper.util.data.ProxyOutputData
 import java.net.http.HttpResponse
 import java.nio.file.Files
 import java.nio.file.Path