Merge pull request #987 from alvasw/move_LogScanner_to_commons_module

Move LogScanner classes to common module
bisq-network · Jul 7, 2023 · 850db69 · 850db69
2 parents 802e765 + 2d4d880
commit 850db69
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/.../wallets/process/scanner/FileScanner.java → ...java/bisq/common/scanner/FileScanner.java b/.../wallets/process/scanner/FileScanner.java → ...java/bisq/common/scanner/FileScanner.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.process.scanner;
+package bisq.common.scanner;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/...s/process/scanner/InputStreamScanner.java → ...sq/common/scanner/InputStreamScanner.java b/...s/process/scanner/InputStreamScanner.java → ...sq/common/scanner/InputStreamScanner.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.process.scanner;
+package bisq.common.scanner;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/...q/wallets/process/scanner/LogScanner.java → .../java/bisq/common/scanner/LogScanner.java b/...q/wallets/process/scanner/LogScanner.java → .../java/bisq/common/scanner/LogScanner.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.wallets.process.scanner;
+package bisq.common.scanner;
 
 import java.io.IOException;
 import java.util.HashSet;

diff --git a/...ationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java b/...ationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java
@@ -17,11 +17,11 @@
 
 package bisq.wallets.electrum.regtest.electrumx;
 
+import bisq.common.scanner.InputStreamScanner;
+import bisq.common.scanner.LogScanner;
 import bisq.wallets.json_rpc.RpcConfig;
 import bisq.wallets.process.DaemonProcess;
 import bisq.wallets.process.ProcessConfig;
-import bisq.wallets.process.scanner.InputStreamScanner;
-import bisq.wallets.process.scanner.LogScanner;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Collections;

diff --git a/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumRegtestProcess.java b/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumRegtestProcess.java
@@ -18,16 +18,16 @@
 package bisq.wallets.electrum;
 
 import bisq.common.FileCreationWatcher;
+import bisq.common.scanner.FileScanner;
+import bisq.common.scanner.LogScanner;
 import bisq.common.util.FileUtils;
-import bisq.wallets.json_rpc.RpcConfig;
-import bisq.wallets.json_rpc.RpcClientFactory;
 import bisq.wallets.electrum.rpc.ElectrumDaemon;
 import bisq.wallets.electrum.rpc.ElectrumProcessConfig;
 import bisq.wallets.json_rpc.JsonRpcClient;
+import bisq.wallets.json_rpc.RpcClientFactory;
+import bisq.wallets.json_rpc.RpcConfig;
 import bisq.wallets.process.DaemonProcess;
 import bisq.wallets.process.ProcessConfig;
-import bisq.wallets.process.scanner.FileScanner;
-import bisq.wallets.process.scanner.LogScanner;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/wallets/process/src/main/java/bisq/wallets/process/DaemonProcess.java b/wallets/process/src/main/java/bisq/wallets/process/DaemonProcess.java
@@ -17,10 +17,10 @@
 
 package bisq.wallets.process;
 
+import bisq.common.scanner.LogScanner;
 import bisq.common.util.FileUtils;
 import bisq.wallets.core.exceptions.WalletShutdownFailedException;
 import bisq.wallets.core.exceptions.WalletStartupFailedException;
-import bisq.wallets.process.scanner.LogScanner;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestProcess.java
@@ -17,16 +17,16 @@
 
 package bisq.wallets.regtest.bitcoind;
 
+import bisq.common.scanner.InputStreamScanner;
+import bisq.common.scanner.LogScanner;
 import bisq.common.util.NetworkUtils;
 import bisq.wallets.bitcoind.rpc.BitcoindDaemon;
+import bisq.wallets.json_rpc.JsonRpcClient;
 import bisq.wallets.json_rpc.RpcCallFailureException;
-import bisq.wallets.json_rpc.RpcConfig;
 import bisq.wallets.json_rpc.RpcClientFactory;
-import bisq.wallets.json_rpc.JsonRpcClient;
+import bisq.wallets.json_rpc.RpcConfig;
 import bisq.wallets.process.DaemonProcess;
 import bisq.wallets.process.ProcessConfig;
-import bisq.wallets.process.scanner.InputStreamScanner;
-import bisq.wallets.process.scanner.LogScanner;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;