From d58fbab1b52297b4249653775f601d858eb7bdf5 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Sat, 29 Jun 2024 11:58:25 +0200 Subject: [PATCH] Removed pointless boolean Expression --- .../java/cash/z/wallet/sdk/rpc/Service.java | 6 +++--- .../api/gateway/resource/GatewayResource.java | 2 +- .../qortal/api/resource/ArbitraryResource.java | 4 ++-- .../qortal/api/resource/BlocksResource.java | 18 +++++++++--------- .../api/resource/CrossChainResource.java | 2 +- src/main/java/org/qortal/at/AT.java | 2 +- .../org/qortal/controller/BlockMinter.java | 4 ++-- .../java/org/qortal/controller/Controller.java | 2 +- .../org/qortal/controller/Synchronizer.java | 4 ++-- .../java/org/qortal/network/Handshake.java | 6 +++--- .../hsqldb/HSQLDBChatRepository.java | 4 ++-- .../repository/hsqldb/HSQLDBImportExport.java | 2 +- .../transaction/RewardShareTransaction.java | 2 +- .../utils/ArbitraryTransactionUtils.java | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/cash/z/wallet/sdk/rpc/Service.java b/src/main/java/cash/z/wallet/sdk/rpc/Service.java index 3ffc0247..87c51509 100644 --- a/src/main/java/cash/z/wallet/sdk/rpc/Service.java +++ b/src/main/java/cash/z/wallet/sdk/rpc/Service.java @@ -5290,7 +5290,7 @@ public final class Service { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(vendor_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, vendor_); } - if (taddrSupport_ != false) { + if (taddrSupport_) { output.writeBool(3, taddrSupport_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(chainName_)) { @@ -5341,7 +5341,7 @@ public final class Service { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(vendor_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, vendor_); } - if (taddrSupport_ != false) { + if (taddrSupport_) { size += com.google.protobuf.CodedOutputStream .computeBoolSize(3, taddrSupport_); } @@ -5729,7 +5729,7 @@ public final class Service { vendor_ = other.vendor_; onChanged(); } - if (other.getTaddrSupport() != false) { + if (other.getTaddrSupport()) { setTaddrSupport(other.getTaddrSupport()); } if (!other.getChainName().isEmpty()) { diff --git a/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java b/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java index a6ec61b6..fc67594e 100644 --- a/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java +++ b/src/main/java/org/qortal/api/gateway/resource/GatewayResource.java @@ -41,7 +41,7 @@ public class GatewayResource { private ArbitraryResourceStatus getStatus(Service service, String name, String identifier, Boolean build) { // If "build=true" has been specified in the query string, build the resource before returning its status - if (build != null && build == true) { + if (build != null && build) { try { ArbitraryDataReader reader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service, null); if (!reader.isBuilding()) { diff --git a/src/main/java/org/qortal/api/resource/ArbitraryResource.java b/src/main/java/org/qortal/api/resource/ArbitraryResource.java index 7752be8c..fe9e8524 100644 --- a/src/main/java/org/qortal/api/resource/ArbitraryResource.java +++ b/src/main/java/org/qortal/api/resource/ArbitraryResource.java @@ -119,7 +119,7 @@ public class ArbitraryResource { // Ensure that "default" and "identifier" parameters cannot coexist boolean defaultRes = Boolean.TRUE.equals(defaultResource); - if (defaultRes == true && identifier != null) { + if (defaultRes && identifier != null) { throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_CRITERIA, "identifier cannot be specified when requesting a default resource"); } @@ -1258,7 +1258,7 @@ public class ArbitraryResource { } // Finish here if user has requested a preview - if (preview != null && preview == true) { + if (preview != null && preview) { return this.preview(path, service); } diff --git a/src/main/java/org/qortal/api/resource/BlocksResource.java b/src/main/java/org/qortal/api/resource/BlocksResource.java index 22b40a1f..01d8d2ab 100644 --- a/src/main/java/org/qortal/api/resource/BlocksResource.java +++ b/src/main/java/org/qortal/api/resource/BlocksResource.java @@ -86,7 +86,7 @@ public class BlocksResource { // Check the database first BlockData blockData = repository.getBlockRepository().fromSignature(signature); if (blockData != null) { - if (includeOnlineSignatures == null || includeOnlineSignatures == false) { + if (includeOnlineSignatures == null || !includeOnlineSignatures) { blockData.setOnlineAccountsSignatures(null); } return blockData; @@ -95,7 +95,7 @@ public class BlocksResource { // Not found, so try the block archive blockData = repository.getBlockArchiveRepository().fromSignature(signature); if (blockData != null) { - if (includeOnlineSignatures == null || includeOnlineSignatures == false) { + if (includeOnlineSignatures == null || !includeOnlineSignatures) { blockData.setOnlineAccountsSignatures(null); } return blockData; @@ -304,7 +304,7 @@ public class BlocksResource { try (final Repository repository = RepositoryManager.getRepository()) { BlockData blockData = repository.getBlockRepository().getLastBlock(); - if (includeOnlineSignatures == null || includeOnlineSignatures == false) { + if (includeOnlineSignatures == null || !includeOnlineSignatures) { blockData.setOnlineAccountsSignatures(null); } @@ -474,7 +474,7 @@ public class BlocksResource { // Firstly check the database BlockData blockData = repository.getBlockRepository().fromHeight(height); if (blockData != null) { - if (includeOnlineSignatures == null || includeOnlineSignatures == false) { + if (includeOnlineSignatures == null || !includeOnlineSignatures) { blockData.setOnlineAccountsSignatures(null); } return blockData; @@ -483,7 +483,7 @@ public class BlocksResource { // Not found, so try the archive blockData = repository.getBlockArchiveRepository().fromHeight(height); if (blockData != null) { - if (includeOnlineSignatures == null || includeOnlineSignatures == false) { + if (includeOnlineSignatures == null || !includeOnlineSignatures) { blockData.setOnlineAccountsSignatures(null); } return blockData; @@ -596,7 +596,7 @@ public class BlocksResource { if (height > 1) { // Found match in Blocks table blockData = repository.getBlockRepository().fromHeight(height); - if (includeOnlineSignatures == null || includeOnlineSignatures == false) { + if (includeOnlineSignatures == null || !includeOnlineSignatures) { blockData.setOnlineAccountsSignatures(null); } return blockData; @@ -614,7 +614,7 @@ public class BlocksResource { throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.BLOCK_UNKNOWN); } - if (includeOnlineSignatures == null || includeOnlineSignatures == false) { + if (includeOnlineSignatures == null || !includeOnlineSignatures) { blockData.setOnlineAccountsSignatures(null); } @@ -651,7 +651,7 @@ public class BlocksResource { @QueryParam("includeOnlineSignatures") Boolean includeOnlineSignatures) { try (final Repository repository = RepositoryManager.getRepository()) { List blocks = new ArrayList<>(); - boolean shouldReverse = (reverse != null && reverse == true); + boolean shouldReverse = (reverse != null && reverse); int i = 0; while (i < count) { @@ -664,7 +664,7 @@ public class BlocksResource { break; } } - if (includeOnlineSignatures == null || includeOnlineSignatures == false) { + if (includeOnlineSignatures == null || !includeOnlineSignatures) { blockData.setOnlineAccountsSignatures(null); } diff --git a/src/main/java/org/qortal/api/resource/CrossChainResource.java b/src/main/java/org/qortal/api/resource/CrossChainResource.java index d3919d9b..9e411127 100644 --- a/src/main/java/org/qortal/api/resource/CrossChainResource.java +++ b/src/main/java/org/qortal/api/resource/CrossChainResource.java @@ -376,7 +376,7 @@ public class CrossChainResource { int maximumCount = maxtrades != null ? maxtrades : 10; long minimumPeriod = 4 * 60 * 60 * 1000L; // ms Boolean isFinished = Boolean.TRUE; - boolean useInversePrice = (inverse != null && inverse == true); + boolean useInversePrice = (inverse != null && inverse); try (final Repository repository = RepositoryManager.getRepository()) { Map> acctsByCodeHash = SupportedBlockchain.getFilteredAcctMap(foreignBlockchain); diff --git a/src/main/java/org/qortal/at/AT.java b/src/main/java/org/qortal/at/AT.java index e5cbf4e7..54356401 100644 --- a/src/main/java/org/qortal/at/AT.java +++ b/src/main/java/org/qortal/at/AT.java @@ -132,7 +132,7 @@ public class AT { // Nothing happened? if (state.getSteps() == 0 && Arrays.equals(stateHash, latestAtStateData.getStateHash())) // We currently want to execute frozen ATs, to maintain backwards support. - if (state.isFrozen() == false) + if (!state.isFrozen()) // this.atStateData will be null return Collections.emptyList(); diff --git a/src/main/java/org/qortal/controller/BlockMinter.java b/src/main/java/org/qortal/controller/BlockMinter.java index 49831cba..7272ee95 100644 --- a/src/main/java/org/qortal/controller/BlockMinter.java +++ b/src/main/java/org/qortal/controller/BlockMinter.java @@ -172,7 +172,7 @@ public class BlockMinter extends Thread { // Disregard peers that don't have a recent block, but only if we're not in recovery mode. // In that mode, we want to allow minting on top of older blocks, to recover stalled networks. - if (Synchronizer.getInstance().getRecoveryMode() == false) + if (!Synchronizer.getInstance().getRecoveryMode()) peers.removeIf(Controller.hasNoRecentBlock); // Don't mint if we don't have enough up-to-date peers as where would the transactions/consensus come from? @@ -197,7 +197,7 @@ public class BlockMinter extends Thread { // If our latest block isn't recent then we need to synchronize instead of minting, unless we're in recovery mode. if (!peers.isEmpty() && lastBlockData.getTimestamp() < minLatestBlockTimestamp) - if (Synchronizer.getInstance().getRecoveryMode() == false && recoverInvalidBlock == false) + if (!Synchronizer.getInstance().getRecoveryMode() && !recoverInvalidBlock) continue; // There are enough peers with a recent block and our latest block is recent diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java index 6d2562ab..30537b32 100644 --- a/src/main/java/org/qortal/controller/Controller.java +++ b/src/main/java/org/qortal/controller/Controller.java @@ -775,7 +775,7 @@ public class Controller extends Thread { public static final Predicate hasOldVersion = peer -> { final String minPeerVersion = Settings.getInstance().getMinPeerVersion(); - return peer.isAtLeastVersion(minPeerVersion) == false; + return !peer.isAtLeastVersion(minPeerVersion); }; public static final Predicate hasInvalidSigner = peer -> { diff --git a/src/main/java/org/qortal/controller/Synchronizer.java b/src/main/java/org/qortal/controller/Synchronizer.java index 5cffdbd4..306784f5 100644 --- a/src/main/java/org/qortal/controller/Synchronizer.java +++ b/src/main/java/org/qortal/controller/Synchronizer.java @@ -406,7 +406,7 @@ public class Synchronizer extends Thread { // If enough time has passed, enter recovery mode, which lifts some restrictions on who we can sync with and when we can mint long recoveryModeTimeout = Settings.getInstance().getRecoveryModeTimeout(); if (NTP.getTime() - timePeersLastAvailable > recoveryModeTimeout) { - if (recoveryMode == false) { + if (!recoveryMode) { LOGGER.info(String.format("Peers have been unavailable for %d minutes. Entering recovery mode...", recoveryModeTimeout/60/1000)); recoveryMode = true; } @@ -663,7 +663,7 @@ public class Synchronizer extends Thread { } } - if (useCachedSummaries == false) { + if (!useCachedSummaries) { if (summariesRequired > 0) { LOGGER.trace(String.format("Requesting %d block summar%s from peer %s after common block %.8s. Peer height: %d", summariesRequired, (summariesRequired != 1 ? "ies" : "y"), peer, Base58.encode(commonBlockSummary.getSignature()), peerHeight)); diff --git a/src/main/java/org/qortal/network/Handshake.java b/src/main/java/org/qortal/network/Handshake.java index 221e5e74..782ca2b7 100644 --- a/src/main/java/org/qortal/network/Handshake.java +++ b/src/main/java/org/qortal/network/Handshake.java @@ -70,15 +70,15 @@ public enum Handshake { peer.setPeersVersion(versionString, version); // Ensure the peer is running at least the version specified in MIN_PEER_VERSION - if (peer.isAtLeastVersion(MIN_PEER_VERSION) == false) { + if (!peer.isAtLeastVersion(MIN_PEER_VERSION)) { LOGGER.debug(String.format("Ignoring peer %s because it is on an old version (%s)", peer, versionString)); return null; } - if (Settings.getInstance().getAllowConnectionsWithOlderPeerVersions() == false) { + if (!Settings.getInstance().getAllowConnectionsWithOlderPeerVersions()) { // Ensure the peer is running at least the minimum version allowed for connections final String minPeerVersion = Settings.getInstance().getMinPeerVersion(); - if (peer.isAtLeastVersion(minPeerVersion) == false) { + if (!peer.isAtLeastVersion(minPeerVersion)) { LOGGER.debug(String.format("Ignoring peer %s because it is on an old version (%s)", peer, versionString)); return null; } diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java index 6bc4fa49..571a587d 100644 --- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java @@ -69,10 +69,10 @@ public class HSQLDBChatRepository implements ChatRepository { bindParams.add(chatReferenceBytes); } - if (hasChatReference != null && hasChatReference == true) { + if (hasChatReference != null && hasChatReference) { whereClauses.add("chat_reference IS NOT NULL"); } - else if (hasChatReference != null && hasChatReference == false) { + else if (hasChatReference != null && !hasChatReference) { whereClauses.add("chat_reference IS NULL"); } diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBImportExport.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBImportExport.java index 3e6dd534..4d62fed5 100644 --- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBImportExport.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBImportExport.java @@ -137,7 +137,7 @@ public class HSQLDBImportExport { String existingTradePrivateKey = (String) existingTradeBotDataItem.get("tradePrivateKey"); // Check if we already have an entry for this trade boolean found = allTradeBotData.stream().anyMatch(tradeBotData -> Base58.encode(tradeBotData.getTradePrivateKey()).equals(existingTradePrivateKey)); - if (found == false) + if (!found) // Add the data from the backup file to our "allTradeBotDataJson" array as it's not currently in the db allTradeBotDataJson.put(existingTradeBotDataItem); } diff --git a/src/main/java/org/qortal/transaction/RewardShareTransaction.java b/src/main/java/org/qortal/transaction/RewardShareTransaction.java index 635c8c8a..b2261181 100644 --- a/src/main/java/org/qortal/transaction/RewardShareTransaction.java +++ b/src/main/java/org/qortal/transaction/RewardShareTransaction.java @@ -43,7 +43,7 @@ public class RewardShareTransaction extends Transaction { } private RewardShareData getExistingRewardShare() throws DataException { - if (this.haveCheckedForExistingRewardShare == false) { + if (!this.haveCheckedForExistingRewardShare) { this.haveCheckedForExistingRewardShare = true; // Look up any existing reward-share (using transaction's reward-share public key) diff --git a/src/main/java/org/qortal/utils/ArbitraryTransactionUtils.java b/src/main/java/org/qortal/utils/ArbitraryTransactionUtils.java index 2d3a2358..f641255f 100644 --- a/src/main/java/org/qortal/utils/ArbitraryTransactionUtils.java +++ b/src/main/java/org/qortal/utils/ArbitraryTransactionUtils.java @@ -398,7 +398,7 @@ public class ArbitraryTransactionUtils { public static ArbitraryResourceStatus getStatus(Service service, String name, String identifier, Boolean build, boolean updateCache) { // If "build" has been specified, build the resource before returning its status - if (build != null && build == true) { + if (build != null && build) { try { ArbitraryDataReader reader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service, identifier); if (!reader.isBuilding()) {