From 609904e509e170d94b47340ce71a9b2095f8b5c7 Mon Sep 17 00:00:00 2001 From: lukelee-sl <109538178+lukelee-sl@users.noreply.github.com> Date: Thu, 8 Dec 2022 20:40:42 -0800 Subject: [PATCH] gradle modifications to support java 19 (#4797) * gradle modifications to support java 19 Signed-off-by: lukelee-sl Signed-off-by: Danno Ferrin Co-authored-by: Danno Ferrin --- build.gradle | 6 +- .../api/jsonrpc/JsonRpcResponseUtils.java | 8 +- .../besu/ethereum/core/BlockBody.java | 8 +- .../core/LogsBloomFilterTestCaseSpec.java | 4 +- .../eth/manager/RespondingEthPeer.java | 4 +- .../netty/NettyConnectionInitializer.java | 8 +- .../ethereum/p2p/peers/PeerTestHelper.java | 8 +- .../besu/ethereum/rlp/RLPDecodingHelpers.java | 4 +- .../besu/ethereum/trie/RestoreVisitor.java | 4 +- .../besu/ethereum/trie/StoredNode.java | 4 +- gradle/verification-metadata.xml | 87 +++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- .../services/tasks/CachingTaskCollection.java | 4 +- 13 files changed, 133 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 50b805555..74d81663c 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ import net.ltgt.gradle.errorprone.CheckSeverity import java.text.SimpleDateFormat plugins { - id 'com.diffplug.spotless' version '6.10.0' + id 'com.diffplug.spotless' version '6.12.0' id 'com.github.ben-manes.versions' version '0.42.0' id 'com.github.hierynomus.license' version '0.16.1-fix' id 'com.jfrog.artifactory' version '4.28.3' @@ -83,7 +83,7 @@ allprojects { version = rootProject.version jacoco { - toolVersion = '0.8.7' + toolVersion = '0.8.8' if (project.tasks.findByName('referenceTests')) { applyTo referenceTests } @@ -131,7 +131,7 @@ allprojects { target 'src/**/*.java' targetExclude '**/src/reference-test/**', '**/src/main/generated/**', '**/src/test/generated/**', '**/src/jmh/generated/**' removeUnusedImports() - googleJavaFormat('1.10.0') + googleJavaFormat('1.15.0') importOrder 'org.hyperledger', 'java', '' trimTrailingWhitespace() endWithNewline() diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java index 5c285f99d..8cf8684dc 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java @@ -67,12 +67,16 @@ public class JsonRpcResponseUtils { /** Hex is base 16 */ private static final int HEX_RADIX = 16; - /** @param values hex encoded values. */ + /** + * @param values hex encoded values. + */ public JsonRpcResponse response(final Map values) { return response(values, new ArrayList<>()); } - /** @param values hex encoded values. */ + /** + * @param values hex encoded values. + */ public JsonRpcResponse response( final Map values, final List transactions) { diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java index 8ae7024b3..cfc85b9bc 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java @@ -38,13 +38,17 @@ public class BlockBody implements org.hyperledger.besu.plugin.data.BlockBody { return EMPTY; } - /** @return The list of transactions of the block. */ + /** + * @return The list of transactions of the block. + */ @Override public List getTransactions() { return transactions; } - /** @return The list of ommers of the block. */ + /** + * @return The list of ommers of the block. + */ @Override public List getOmmers() { return ommers; diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java index 8cbe7bfc3..d12433564 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java @@ -51,7 +51,9 @@ public class LogsBloomFilterTestCaseSpec { return logs; } - /** @return - 2048-bit representation of each log entry, except data, of each transaction. */ + /** + * @return - 2048-bit representation of each log entry, except data, of each transaction. + */ public LogsBloomFilter getLogsBloomFilter() { return logsBloomFilter; } diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java index 6da54910c..15a76de39 100644 --- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java @@ -189,7 +189,9 @@ public class RespondingEthPeer { } } - /** @return True if any requests were processed */ + /** + * @return True if any requests were processed + */ public boolean respond(final Responder responder) { // Respond to queued messages final List currentMessages = new ArrayList<>(); diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java index 17ff6a053..35b2af16c 100644 --- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java @@ -193,7 +193,9 @@ public class NettyConnectionInitializer return connectionFuture; } - /** @return a channel initializer for outbound connections */ + /** + * @return a channel initializer for outbound connections + */ @Nonnull private ChannelInitializer outboundChannelInitializer( final Peer peer, final CompletableFuture connectionFuture) { @@ -211,7 +213,9 @@ public class NettyConnectionInitializer }; } - /** @return a channel initializer for inbound connections */ + /** + * @return a channel initializer for inbound connections + */ private ChannelInitializer inboundChannelInitializer() { return new ChannelInitializer() { @Override diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java index 7f5085bcc..95ed20699 100644 --- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java @@ -43,14 +43,18 @@ public class PeerTestHelper { return EnodeURLImpl.builder().ipAddress("127.0.0.1").useDefaultPorts().nodeId(Peer.randomId()); } - /** @return A LocalNode that is setup and ready. */ + /** + * @return A LocalNode that is setup and ready. + */ public static LocalNode createLocalNode() { final MutableLocalNode localNode = createMutableLocalNode(); localNode.setEnode(enode()); return localNode; } - /** @return A MutableLocalNode that is not ready (the enode has not been set). */ + /** + * @return A MutableLocalNode that is not ready (the enode has not been set). + */ public static MutableLocalNode createMutableLocalNode() { return MutableLocalNode.create("clientId", 5, Arrays.asList(Capability.create("eth", 63))); } diff --git a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java index b52f3b3ce..670a6b83f 100644 --- a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java @@ -181,7 +181,9 @@ class RLPDecodingHelpers { this.payloadSize = payloadSize; } - /** @return the size of the byte string holding the rlp-encoded value and metadata */ + /** + * @return the size of the byte string holding the rlp-encoded value and metadata + */ int getEncodedSize() { final long encodedSize = elementEnd() - elementStart + 1; try { diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RestoreVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RestoreVisitor.java index 6fb046352..392148387 100644 --- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RestoreVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RestoreVisitor.java @@ -145,7 +145,9 @@ public class RestoreVisitor implements PathNodeVisitor { this.refRlp = refRlp; } - /** @return True if the node needs to be persisted. */ + /** + * @return True if the node needs to be persisted. + */ @Override public boolean isDirty() { return false; diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java index 269b8e57c..8314b9b00 100644 --- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java @@ -34,7 +34,9 @@ class StoredNode implements Node { this.hash = hash; } - /** @return True if the node needs to be persisted. */ + /** + * @return True if the node needs to be persisted. + */ @Override public boolean isDirty() { return false; diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a559b5d77..96ce1603b 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -38,6 +38,11 @@ + + + + + @@ -68,6 +73,14 @@ + + + + + + + + @@ -76,6 +89,14 @@ + + + + + + + + @@ -84,6 +105,14 @@ + + + + + + + + @@ -1081,6 +1110,14 @@ + + + + + + + + @@ -3750,6 +3787,14 @@ + + + + + + + + @@ -3760,6 +3805,11 @@ + + + + + @@ -4052,6 +4102,14 @@ + + + + + + + + @@ -4060,11 +4118,24 @@ + + + + + + + + + + + + + @@ -4073,6 +4144,14 @@ + + + + + + + + @@ -4081,6 +4160,14 @@ + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684f..070cb702f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java index 64833873e..fa112d97b 100644 --- a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java +++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java @@ -92,7 +92,9 @@ public class CachingTaskCollection implements TaskCollection { return size() == 0; } - /** @return True if all tasks have been removed and processed. */ + /** + * @return True if all tasks have been removed and processed. + */ @Override public synchronized boolean allTasksCompleted() { return cacheSize() == 0 && wrappedCollection.allTasksCompleted();