From 2d4d880e926a119d1b236634a0fe0a5765f93390 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Thu, 6 Jul 2023 15:09:13 +0200 Subject: [PATCH] Move LogScanner classes to common module --- .../src/main/java/bisq/common}/scanner/FileScanner.java | 2 +- .../java/bisq/common}/scanner/InputStreamScanner.java | 2 +- .../src/main/java/bisq/common}/scanner/LogScanner.java | 2 +- .../regtest/electrumx/ElectrumXServerRegtestProcess.java | 4 ++-- .../bisq/wallets/electrum/ElectrumRegtestProcess.java | 8 ++++---- .../src/main/java/bisq/wallets/process/DaemonProcess.java | 2 +- .../wallets/regtest/bitcoind/BitcoindRegtestProcess.java | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) rename {wallets/process/src/main/java/bisq/wallets/process => common/src/main/java/bisq/common}/scanner/FileScanner.java (97%) rename {wallets/process/src/main/java/bisq/wallets/process => common/src/main/java/bisq/common}/scanner/InputStreamScanner.java (97%) rename {wallets/process/src/main/java/bisq/wallets/process => common/src/main/java/bisq/common}/scanner/LogScanner.java (97%) diff --git a/wallets/process/src/main/java/bisq/wallets/process/scanner/FileScanner.java b/common/src/main/java/bisq/common/scanner/FileScanner.java similarity index 97% rename from wallets/process/src/main/java/bisq/wallets/process/scanner/FileScanner.java rename to common/src/main/java/bisq/common/scanner/FileScanner.java index 470fc54248..1f173feb9c 100644 --- a/wallets/process/src/main/java/bisq/wallets/process/scanner/FileScanner.java +++ b/common/src/main/java/bisq/common/scanner/FileScanner.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.wallets.process.scanner; +package bisq.common.scanner; import lombok.extern.slf4j.Slf4j; diff --git a/wallets/process/src/main/java/bisq/wallets/process/scanner/InputStreamScanner.java b/common/src/main/java/bisq/common/scanner/InputStreamScanner.java similarity index 97% rename from wallets/process/src/main/java/bisq/wallets/process/scanner/InputStreamScanner.java rename to common/src/main/java/bisq/common/scanner/InputStreamScanner.java index 7e5065b94b..c02ae944c8 100644 --- a/wallets/process/src/main/java/bisq/wallets/process/scanner/InputStreamScanner.java +++ b/common/src/main/java/bisq/common/scanner/InputStreamScanner.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.wallets.process.scanner; +package bisq.common.scanner; import lombok.extern.slf4j.Slf4j; diff --git a/wallets/process/src/main/java/bisq/wallets/process/scanner/LogScanner.java b/common/src/main/java/bisq/common/scanner/LogScanner.java similarity index 97% rename from wallets/process/src/main/java/bisq/wallets/process/scanner/LogScanner.java rename to common/src/main/java/bisq/common/scanner/LogScanner.java index acc8b6d214..26f992036f 100644 --- a/wallets/process/src/main/java/bisq/wallets/process/scanner/LogScanner.java +++ b/common/src/main/java/bisq/common/scanner/LogScanner.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.wallets.process.scanner; +package bisq.common.scanner; import java.io.IOException; import java.util.HashSet; diff --git a/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java b/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java index 22611cf5a2..14e899c1f9 100644 --- a/wallets/electrum/src/integrationTest/java/bisq/wallets/electrum/regtest/electrumx/ElectrumXServerRegtestProcess.java +++ b/wallets/electrum/src/integrationTest/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 index 4e2ff522a2..3bf7c9c546 100644 --- 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 index 21c39b82eb..f6ff950e8f 100644 --- 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 index 7f26b645a5..2c1f589d6d 100644 --- 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;