Update Spotless Gradle plugin (#8333)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
2026-01-08 23:08:15 -05:00 · 2025-02-20 05:44:56 +01:00
parent 65baa304d4
commit 0e54416026
8 changed files with 166 additions and 2640 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ import java.text.SimpleDateFormat
 import java.util.regex.Pattern

 plugins {
-  id 'com.diffplug.spotless' version '6.25.0'
+  id 'com.diffplug.spotless' version '7.0.2'
  id 'com.github.jk1.dependency-license-report' version '2.9'
  id 'com.jfrog.artifactory' version '5.2.5'
  id 'me.champeau.jmh' version '0.7.2' apply false
@@ -213,7 +213,7 @@ configure(allprojects - project(':platform')) {
      target 'src/**/*.java'
      targetExclude '**/src/reference-test/**', '**/src/main/generated/**', '**/src/test/generated/**', '**/src/jmh/generated/**'
      removeUnusedImports()
-      googleJavaFormat('1.22.0')
+      googleJavaFormat('1.25.2')
      importOrder 'org.hyperledger', 'java', ''
      trimTrailingWhitespace()
      endWithNewline()
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java
@@ -160,7 +160,7 @@ public enum GraphQLError {
      case EXCEEDS_BLOCK_GAS_LIMIT -> EXCEEDS_BLOCK_GAS_LIMIT;
      case TX_SENDER_NOT_AUTHORIZED -> TX_SENDER_NOT_AUTHORIZED;
      case CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE -> CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE;
-        // Private Transaction Invalid Reasons
+      // Private Transaction Invalid Reasons
      case PRIVATE_TRANSACTION_FAILED -> PRIVATE_TRANSACTION_FAILED;
      case GAS_PRICE_TOO_LOW -> GAS_PRICE_TOO_LOW;
      case TX_FEECAP_EXCEEDED -> TX_FEECAP_EXCEEDED;
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java
@@ -44,7 +44,7 @@ public class JsonRpcErrorConverter {
        return RpcErrorType.REPLAY_PROTECTED_SIGNATURE_REQUIRED;
      case TX_SENDER_NOT_AUTHORIZED:
        return RpcErrorType.TX_SENDER_NOT_AUTHORIZED;
-        // Private Transaction Invalid Reasons
+      // Private Transaction Invalid Reasons
      case PRIVATE_TRANSACTION_INVALID:
        return RpcErrorType.PRIVATE_TRANSACTION_INVALID;
      case PRIVATE_TRANSACTION_FAILED:
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java
@@ -182,7 +182,7 @@ public class PrivGetTransactionReceipt implements JsonRpcMethod {
          LOG.warn(
              "Unable to decrypt payload with configured privacy node key. Check if your 'privacy-public-key-file' property matches your Enclave public key.");
        }
-        // fall through
+      // fall through
      default:
        throw e;
    }
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/DataStoreModule.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/DataStoreModule.java
@@ -139,7 +139,7 @@ public class DataStoreModule {
        return rocksDBFactory.get().create(segment, commonConfiguration, metricsSystem);
      default:
        System.err.println("Unknown key, continuing as though 'memory' was specified");
-        // fall through
+      // fall through
      case "memory":
        return new InMemoryKeyValueStorage();
    }
--- a/evm/src/main/java/org/hyperledger/besu/evm/EVM.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/EVM.java
@@ -261,71 +261,71 @@ public class EVM {
                      ? Push0Operation.staticOperation(frame)
                      : InvalidOperation.invalidOperationResult(opcode);
              case 0x60, // PUSH1-32
-                      0x61,
-                      0x62,
-                      0x63,
-                      0x64,
-                      0x65,
-                      0x66,
-                      0x67,
-                      0x68,
-                      0x69,
-                      0x6a,
-                      0x6b,
-                      0x6c,
-                      0x6d,
-                      0x6e,
-                      0x6f,
-                      0x70,
-                      0x71,
-                      0x72,
-                      0x73,
-                      0x74,
-                      0x75,
-                      0x76,
-                      0x77,
-                      0x78,
-                      0x79,
-                      0x7a,
-                      0x7b,
-                      0x7c,
-                      0x7d,
-                      0x7e,
-                      0x7f ->
+                  0x61,
+                  0x62,
+                  0x63,
+                  0x64,
+                  0x65,
+                  0x66,
+                  0x67,
+                  0x68,
+                  0x69,
+                  0x6a,
+                  0x6b,
+                  0x6c,
+                  0x6d,
+                  0x6e,
+                  0x6f,
+                  0x70,
+                  0x71,
+                  0x72,
+                  0x73,
+                  0x74,
+                  0x75,
+                  0x76,
+                  0x77,
+                  0x78,
+                  0x79,
+                  0x7a,
+                  0x7b,
+                  0x7c,
+                  0x7d,
+                  0x7e,
+                  0x7f ->
                  PushOperation.staticOperation(frame, code, pc, opcode - PUSH_BASE);
              case 0x80, // DUP1-16
-                      0x81,
-                      0x82,
-                      0x83,
-                      0x84,
-                      0x85,
-                      0x86,
-                      0x87,
-                      0x88,
-                      0x89,
-                      0x8a,
-                      0x8b,
-                      0x8c,
-                      0x8d,
-                      0x8e,
-                      0x8f ->
+                  0x81,
+                  0x82,
+                  0x83,
+                  0x84,
+                  0x85,
+                  0x86,
+                  0x87,
+                  0x88,
+                  0x89,
+                  0x8a,
+                  0x8b,
+                  0x8c,
+                  0x8d,
+                  0x8e,
+                  0x8f ->
                  DupOperation.staticOperation(frame, opcode - DupOperation.DUP_BASE);
              case 0x90, // SWAP1-16
-                      0x91,
-                      0x92,
-                      0x93,
-                      0x94,
-                      0x95,
-                      0x96,
-                      0x97,
-                      0x98,
-                      0x99,
-                      0x9a,
-                      0x9b,
-                      0x9c,
-                      0x9d,
-                      0x9e,
-                      0x9f ->
+                  0x91,
+                  0x92,
+                  0x93,
+                  0x94,
+                  0x95,
+                  0x96,
+                  0x97,
+                  0x98,
+                  0x99,
+                  0x9a,
+                  0x9b,
+                  0x9c,
+                  0x9d,
+                  0x9e,
+                  0x9f ->
                  SwapOperation.staticOperation(frame, opcode - SWAP_BASE);
              default -> { // unoptimized operations
                frame.setCurrentOperation(currentOperation);
--- a/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1Validation.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1Validation.java
@@ -173,38 +173,38 @@ public class CodeV1Validation implements EOFValidator {
          }
          break;
        case PushOperation.PUSH_BASE,
-            PushOperation.PUSH_BASE + 1,
-            PushOperation.PUSH_BASE + 2,
-            PushOperation.PUSH_BASE + 3,
-            PushOperation.PUSH_BASE + 4,
-            PushOperation.PUSH_BASE + 5,
-            PushOperation.PUSH_BASE + 6,
-            PushOperation.PUSH_BASE + 7,
-            PushOperation.PUSH_BASE + 8,
-            PushOperation.PUSH_BASE + 9,
-            PushOperation.PUSH_BASE + 10,
-            PushOperation.PUSH_BASE + 11,
-            PushOperation.PUSH_BASE + 12,
-            PushOperation.PUSH_BASE + 13,
-            PushOperation.PUSH_BASE + 14,
-            PushOperation.PUSH_BASE + 15,
-            PushOperation.PUSH_BASE + 16,
-            PushOperation.PUSH_BASE + 17,
-            PushOperation.PUSH_BASE + 18,
-            PushOperation.PUSH_BASE + 19,
-            PushOperation.PUSH_BASE + 20,
-            PushOperation.PUSH_BASE + 21,
-            PushOperation.PUSH_BASE + 22,
-            PushOperation.PUSH_BASE + 23,
-            PushOperation.PUSH_BASE + 24,
-            PushOperation.PUSH_BASE + 25,
-            PushOperation.PUSH_BASE + 26,
-            PushOperation.PUSH_BASE + 27,
-            PushOperation.PUSH_BASE + 28,
-            PushOperation.PUSH_BASE + 29,
-            PushOperation.PUSH_BASE + 30,
-            PushOperation.PUSH_BASE + 31,
-            PushOperation.PUSH_BASE + 32:
+        PushOperation.PUSH_BASE + 1,
+        PushOperation.PUSH_BASE + 2,
+        PushOperation.PUSH_BASE + 3,
+        PushOperation.PUSH_BASE + 4,
+        PushOperation.PUSH_BASE + 5,
+        PushOperation.PUSH_BASE + 6,
+        PushOperation.PUSH_BASE + 7,
+        PushOperation.PUSH_BASE + 8,
+        PushOperation.PUSH_BASE + 9,
+        PushOperation.PUSH_BASE + 10,
+        PushOperation.PUSH_BASE + 11,
+        PushOperation.PUSH_BASE + 12,
+        PushOperation.PUSH_BASE + 13,
+        PushOperation.PUSH_BASE + 14,
+        PushOperation.PUSH_BASE + 15,
+        PushOperation.PUSH_BASE + 16,
+        PushOperation.PUSH_BASE + 17,
+        PushOperation.PUSH_BASE + 18,
+        PushOperation.PUSH_BASE + 19,
+        PushOperation.PUSH_BASE + 20,
+        PushOperation.PUSH_BASE + 21,
+        PushOperation.PUSH_BASE + 22,
+        PushOperation.PUSH_BASE + 23,
+        PushOperation.PUSH_BASE + 24,
+        PushOperation.PUSH_BASE + 25,
+        PushOperation.PUSH_BASE + 26,
+        PushOperation.PUSH_BASE + 27,
+        PushOperation.PUSH_BASE + 28,
+        PushOperation.PUSH_BASE + 29,
+        PushOperation.PUSH_BASE + 30,
+        PushOperation.PUSH_BASE + 31,
+        PushOperation.PUSH_BASE + 32:
          final int multiByteDataLen = operationNum - PushOperation.PUSH_BASE;
          pcPostInstruction += multiByteDataLen;
          break;
@@ -648,12 +648,12 @@ public class CodeV1Validation implements EOFValidator {
                    targetCs.inputs);
              }
            }
-            // fall through for terminal op handling
+          // fall through for terminal op handling
          case StopOperation.OPCODE,
-              ReturnContractOperation.OPCODE,
-              ReturnOperation.OPCODE,
-              RevertOperation.OPCODE,
-              InvalidOperation.OPCODE:
+          ReturnContractOperation.OPCODE,
+          ReturnOperation.OPCODE,
+          RevertOperation.OPCODE,
+          InvalidOperation.OPCODE:
            // terminal op, reset currentMin and currentMax to forward set values
            if (nextPC < codeLength) {
              currentMax = stack_max[nextPC];
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml