mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 01:41:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace uses of Spring CollectionUtils

Browse Source 
See Javadoc in new bisq.common.util.CollectionUtils class.
This commit is contained in:
Chris Beams 2019-12-18 07:03:28 +01:00
parent f5a1854762
commit 2c7829948b
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
51 changed files with 116 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/bisq/common/proto/persistable/NavigationPath.java
View File

@ -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;

35
common/src/main/java/bisq/common/util/CollectionUtils.java Normal file
View File

@ -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());
}
}

3
core/src/main/java/bisq/core/alert/Alert.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalPayload.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/state/model/governance/ChangeParamProposal.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/state/model/governance/ConfiscateBondProposal.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/state/model/governance/GenericProposal.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/state/model/governance/RemoveAssetProposal.java
View File

@ -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;

3
core/src/main/java/bisq/core/dao/state/model/governance/RoleProposal.java
View File

@ -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;

3
core/src/main/java/bisq/core/filter/Filter.java
View File

@ -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;

3
core/src/main/java/bisq/core/offer/OfferPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/InstantCryptoCurrencyPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/JapanBankAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/RevolutAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java
View File

@ -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;

4
core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java
View File

@ -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;

3
core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/Arbitrator.java
View File

@ -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;

3
core/src/main/java/bisq/core/support/dispute/mediation/mediator/Mediator.java
View File

@ -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;

3
core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java
View File

@ -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;

3
core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java
View File

@ -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;

3
core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java
View File

@ -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;

3
p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java
View File

@ -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;