diff --git a/common/src/main/java/bisq/common/proto/persistable/NavigationPath.java b/common/src/main/java/bisq/common/proto/persistable/NavigationPath.java index 4be75cdcee..a1cc756687 100644 --- a/common/src/main/java/bisq/common/proto/persistable/NavigationPath.java +++ b/common/src/main/java/bisq/common/proto/persistable/NavigationPath.java @@ -17,11 +17,10 @@ package bisq.common.proto.persistable; +import bisq.common.util.CollectionUtils; import com.google.protobuf.Message; -import org.springframework.util.CollectionUtils; - import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/bisq/common/util/CollectionUtils.java b/common/src/main/java/bisq/common/util/CollectionUtils.java new file mode 100644 index 0000000000..9b4a41e6cb --- /dev/null +++ b/common/src/main/java/bisq/common/util/CollectionUtils.java @@ -0,0 +1,35 @@ +package bisq.common.util; + +import java.util.Collection; +import java.util.Map; + +/** + * Collection utility methods copied from Spring Framework v4.3.6's + * {@code org.springframework.util.CollectionUtils} class in order to make it possible to + * drop Bisq's dependency on Spring altogether. The name of the class and methods have + * been preserved here to minimize the impact to the Bisq codebase of making this change. + * All that is necessary to swap this implementation in is to change the CollectionUtils + * import statement. + */ +public class CollectionUtils { + + /** + * Return {@code true} if the supplied Collection is {@code null} or empty. + * Otherwise, return {@code false}. + * @param collection the Collection to check + * @return whether the given Collection is empty + */ + public static boolean isEmpty(Collection collection) { + return (collection == null || collection.isEmpty()); + } + + /** + * Return {@code true} if the supplied Map is {@code null} or empty. + * Otherwise, return {@code false}. + * @param map the Map to check + * @return whether the given Map is empty + */ + public static boolean isEmpty(Map map) { + return (map == null || map.isEmpty()); + } +} diff --git a/core/src/main/java/bisq/core/alert/Alert.java b/core/src/main/java/bisq/core/alert/Alert.java index 080c827251..4c323eda55 100644 --- a/core/src/main/java/bisq/core/alert/Alert.java +++ b/core/src/main/java/bisq/core/alert/Alert.java @@ -22,12 +22,11 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.app.Version; import bisq.common.crypto.Sig; +import bisq.common.util.CollectionUtils; import bisq.common.util.ExtraDataMapValidator; import com.google.protobuf.ByteString; -import org.springframework.util.CollectionUtils; - import java.security.PublicKey; import java.util.Map; diff --git a/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java b/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java index 071682e427..5449139010 100644 --- a/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java +++ b/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java @@ -21,13 +21,12 @@ import bisq.core.dao.governance.ConsensusCritical; import bisq.common.proto.network.NetworkPayload; import bisq.common.proto.persistable.PersistablePayload; +import bisq.common.util.CollectionUtils; import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.Utilities; import com.google.protobuf.ByteString; -import org.springframework.util.CollectionUtils; - import java.util.Map; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalPayload.java b/core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalPayload.java index f5334fa603..daad6ff213 100644 --- a/core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalPayload.java +++ b/core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalPayload.java @@ -25,12 +25,11 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.crypto.Sig; import bisq.common.proto.persistable.PersistablePayload; +import bisq.common.util.CollectionUtils; import bisq.common.util.ExtraDataMapValidator; import com.google.protobuf.ByteString; -import org.springframework.util.CollectionUtils; - import java.security.PublicKey; import java.util.Map; diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/ChangeParamProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/ChangeParamProposal.java index 4fc6c5c943..243ec18f71 100644 --- a/core/src/main/java/bisq/core/dao/state/model/governance/ChangeParamProposal.java +++ b/core/src/main/java/bisq/core/dao/state/model/governance/ChangeParamProposal.java @@ -23,8 +23,7 @@ import bisq.core.dao.state.model.ImmutableDaoStateModel; import bisq.core.dao.state.model.blockchain.TxType; import bisq.common.app.Version; - -import org.springframework.util.CollectionUtils; +import bisq.common.util.CollectionUtils; import java.util.Date; import java.util.Map; diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java index b4edb69547..3cdc803928 100644 --- a/core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java +++ b/core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java @@ -25,13 +25,12 @@ import bisq.core.dao.state.model.blockchain.TxType; import bisq.common.app.Version; import bisq.common.config.BaseCurrencyNetwork; +import bisq.common.util.CollectionUtils; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.Coin; -import org.springframework.util.CollectionUtils; - import java.util.Date; import java.util.Map; diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/ConfiscateBondProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/ConfiscateBondProposal.java index be88a09adf..e442454ab7 100644 --- a/core/src/main/java/bisq/core/dao/state/model/governance/ConfiscateBondProposal.java +++ b/core/src/main/java/bisq/core/dao/state/model/governance/ConfiscateBondProposal.java @@ -23,8 +23,7 @@ import bisq.core.dao.state.model.ImmutableDaoStateModel; import bisq.core.dao.state.model.blockchain.TxType; import bisq.common.app.Version; - -import org.springframework.util.CollectionUtils; +import bisq.common.util.CollectionUtils; import java.util.Date; import java.util.Map; diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/GenericProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/GenericProposal.java index 90070bc4f0..fa8c71b556 100644 --- a/core/src/main/java/bisq/core/dao/state/model/governance/GenericProposal.java +++ b/core/src/main/java/bisq/core/dao/state/model/governance/GenericProposal.java @@ -23,8 +23,7 @@ import bisq.core.dao.state.model.ImmutableDaoStateModel; import bisq.core.dao.state.model.blockchain.TxType; import bisq.common.app.Version; - -import org.springframework.util.CollectionUtils; +import bisq.common.util.CollectionUtils; import java.util.Date; import java.util.Map; diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java index 040c4fd421..1012b74e05 100644 --- a/core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java +++ b/core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java @@ -25,13 +25,12 @@ import bisq.core.dao.state.model.blockchain.TxType; import bisq.common.app.Version; import bisq.common.config.BaseCurrencyNetwork; +import bisq.common.util.CollectionUtils; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.core.Coin; -import org.springframework.util.CollectionUtils; - import java.util.Date; import java.util.Map; diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/RemoveAssetProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/RemoveAssetProposal.java index ccd34c555c..db9cbf7522 100644 --- a/core/src/main/java/bisq/core/dao/state/model/governance/RemoveAssetProposal.java +++ b/core/src/main/java/bisq/core/dao/state/model/governance/RemoveAssetProposal.java @@ -23,8 +23,7 @@ import bisq.core.dao.state.model.ImmutableDaoStateModel; import bisq.core.dao.state.model.blockchain.TxType; import bisq.common.app.Version; - -import org.springframework.util.CollectionUtils; +import bisq.common.util.CollectionUtils; import java.util.Date; import java.util.Map; diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/RoleProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/RoleProposal.java index 48a6d3b137..a24a0b9542 100644 --- a/core/src/main/java/bisq/core/dao/state/model/governance/RoleProposal.java +++ b/core/src/main/java/bisq/core/dao/state/model/governance/RoleProposal.java @@ -23,8 +23,7 @@ import bisq.core.dao.state.model.ImmutableDaoStateModel; import bisq.core.dao.state.model.blockchain.TxType; import bisq.common.app.Version; - -import org.springframework.util.CollectionUtils; +import bisq.common.util.CollectionUtils; import java.util.Date; import java.util.Map; diff --git a/core/src/main/java/bisq/core/filter/Filter.java b/core/src/main/java/bisq/core/filter/Filter.java index 6c66d8e3dd..a750dc66b6 100644 --- a/core/src/main/java/bisq/core/filter/Filter.java +++ b/core/src/main/java/bisq/core/filter/Filter.java @@ -21,12 +21,11 @@ import bisq.network.p2p.storage.payload.ExpirablePayload; import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.crypto.Sig; +import bisq.common.util.CollectionUtils; import bisq.common.util.ExtraDataMapValidator; import com.google.protobuf.ByteString; -import org.springframework.util.CollectionUtils; - import com.google.common.annotations.VisibleForTesting; import java.security.PublicKey; diff --git a/core/src/main/java/bisq/core/offer/OfferPayload.java b/core/src/main/java/bisq/core/offer/OfferPayload.java index 56a990a7df..3f4411d87a 100644 --- a/core/src/main/java/bisq/core/offer/OfferPayload.java +++ b/core/src/main/java/bisq/core/offer/OfferPayload.java @@ -24,11 +24,10 @@ import bisq.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload; import bisq.common.crypto.PubKeyRing; import bisq.common.proto.ProtoUtil; +import bisq.common.util.CollectionUtils; import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.JsonExclude; -import org.springframework.util.CollectionUtils; - import java.security.PublicKey; import java.util.ArrayList; diff --git a/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java index fbeff74955..f902c06cde 100644 --- a/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java index f14ea15b97..87d439da45 100644 --- a/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java index 8067e7f95c..e2d5420f97 100644 --- a/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java index af7ae43396..9e907ff0a4 100644 --- a/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java @@ -21,9 +21,9 @@ import bisq.core.locale.BankUtil; import bisq.core.locale.CountryUtil; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java index 9ed5786290..e7bf05cd4e 100644 --- a/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java index 434a4efbdd..5e41ed26b2 100644 --- a/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java index cbd8b21fb5..223a66cf89 100644 --- a/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java @@ -18,9 +18,9 @@ package bisq.core.payment.payload; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java index ef8b032a54..8df00b891c 100644 --- a/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java index 45b63b9d3b..edcc0233fa 100644 --- a/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java index df349f9a27..b704f9d9db 100644 --- a/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java b/core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java index 2691b0f0a4..39551eefff 100644 --- a/core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java @@ -18,9 +18,9 @@ package bisq.core.payment.payload; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java index 90bf81ab83..424ca7ea14 100644 --- a/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/src/main/java/bisq/core/payment/payload/JapanBankAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/JapanBankAccountPayload.java index ed49cb7a75..2509e4b790 100644 --- a/core/src/main/java/bisq/core/payment/payload/JapanBankAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/JapanBankAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java index 855fac929c..6858dfd2a8 100644 --- a/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java index e958633a7d..8fcf4b5bb2 100644 --- a/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java @@ -21,9 +21,9 @@ import bisq.core.locale.BankUtil; import bisq.core.locale.CountryUtil; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java index 1ffc77eac6..865c122c1e 100644 --- a/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java index f5e2d6adab..a14d7679f7 100644 --- a/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java index e734e820ca..e5c66a351a 100644 --- a/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java index 6d7a490178..358699a5a9 100644 --- a/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java index 1d365d66f8..c15fc797da 100644 --- a/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java index fef979aebb..d081f6c5b0 100644 --- a/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java index 313117f987..3932cd822c 100644 --- a/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java index 75aee23735..c0aca44188 100644 --- a/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java @@ -21,9 +21,9 @@ import bisq.core.locale.Country; import bisq.core.locale.CountryUtil; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java index f57a96cb91..9b413c8227 100644 --- a/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java @@ -21,9 +21,9 @@ import bisq.core.locale.Country; import bisq.core.locale.CountryUtil; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java index 6d136651a9..66551c40e5 100644 --- a/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import com.google.common.base.Joiner; diff --git a/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java index 142d61f037..fc13a23335 100644 --- a/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java index 83b9ec3135..475ebdcebe 100644 --- a/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import org.apache.commons.lang3.ArrayUtils; diff --git a/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java index a48280200f..fdd0f5679f 100644 --- a/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java index fc168fc635..46a623c531 100644 --- a/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java index 9e040b599d..ffc36680b9 100644 --- a/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java @@ -19,9 +19,9 @@ package bisq.core.payment.payload; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java index db0722a222..2375456ec0 100644 --- a/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java +++ b/core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java @@ -21,9 +21,9 @@ import bisq.core.locale.BankUtil; import bisq.core.locale.CountryUtil; import bisq.core.locale.Res; -import com.google.protobuf.Message; +import bisq.common.util.CollectionUtils; -import org.springframework.util.CollectionUtils; +import com.google.protobuf.Message; import java.nio.charset.Charset; diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/Arbitrator.java b/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/Arbitrator.java index 12c5cb91f7..92d8c3e44c 100644 --- a/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/Arbitrator.java +++ b/core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/Arbitrator.java @@ -23,12 +23,11 @@ import bisq.network.p2p.NodeAddress; import bisq.common.crypto.PubKeyRing; import bisq.common.proto.ProtoUtil; +import bisq.common.util.CollectionUtils; import bisq.common.util.Utilities; import com.google.protobuf.ByteString; -import org.springframework.util.CollectionUtils; - import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/support/dispute/mediation/mediator/Mediator.java b/core/src/main/java/bisq/core/support/dispute/mediation/mediator/Mediator.java index f02b4aff92..80610ebc23 100644 --- a/core/src/main/java/bisq/core/support/dispute/mediation/mediator/Mediator.java +++ b/core/src/main/java/bisq/core/support/dispute/mediation/mediator/Mediator.java @@ -23,11 +23,10 @@ import bisq.network.p2p.NodeAddress; import bisq.common.crypto.PubKeyRing; import bisq.common.proto.ProtoUtil; +import bisq.common.util.CollectionUtils; import com.google.protobuf.ByteString; -import org.springframework.util.CollectionUtils; - import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java b/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java index 268506d06d..370a4800a0 100644 --- a/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java +++ b/core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java @@ -26,11 +26,10 @@ import bisq.common.app.Capabilities; import bisq.common.app.Capability; import bisq.common.crypto.PubKeyRing; import bisq.common.proto.ProtoUtil; +import bisq.common.util.CollectionUtils; import com.google.protobuf.ByteString; -import org.springframework.util.CollectionUtils; - import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java index 41c77aeb36..ad54321319 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java +++ b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java @@ -29,6 +29,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.crypto.Sig; import bisq.common.proto.persistable.PersistablePayload; +import bisq.common.util.CollectionUtils; import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.JsonExclude; @@ -38,8 +39,6 @@ import org.bitcoinj.core.Coin; import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.Fiat; -import org.springframework.util.CollectionUtils; - import java.security.PublicKey; import java.util.Date; diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java index ba1f6abaf2..cba342d54e 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java +++ b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java @@ -32,6 +32,7 @@ import bisq.common.app.Capabilities; import bisq.common.app.Capability; import bisq.common.crypto.Hash; import bisq.common.proto.persistable.PersistableEnvelope; +import bisq.common.util.CollectionUtils; import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.JsonExclude; import bisq.common.util.Utilities; @@ -42,8 +43,6 @@ import org.bitcoinj.core.Coin; import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.Fiat; -import org.springframework.util.CollectionUtils; - import com.google.common.base.Charsets; import java.util.Date; diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java b/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java index dbe8f62231..a2e3eadd7a 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java +++ b/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java @@ -21,12 +21,11 @@ import bisq.network.p2p.PrefixedSealedAndSignedMessage; import bisq.network.p2p.storage.messages.AddOncePayload; import bisq.common.crypto.Sig; +import bisq.common.util.CollectionUtils; import bisq.common.util.ExtraDataMapValidator; import com.google.protobuf.ByteString; -import org.springframework.util.CollectionUtils; - import java.security.PublicKey; import java.util.Map;