Skip to content

Update Spotless Gradle plugin #8333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fab-10 merged 1 commit into from
Feb 20, 2025
Merged

Update Spotless Gradle plugin #8333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public static GraphQLError of(final TransactionInvalidReason transactionInvalidR
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;
Expand Down
2 changes: 1 addition & 1 deletion ...um/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static RpcErrorType convertTransactionInvalidReason(
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:
Expand Down
2 changes: 1 addition & 1 deletion ...er/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private JsonRpcResponse handleEnclaveException(
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;
}
Expand Down
2 changes: 1 addition & 1 deletion ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/DataStoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private KeyValueStorage constructKeyValueStorage(
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();
}
Expand Down
122 changes: 61 additions & 61 deletions evm/src/main/java/org/hyperledger/besu/evm/EVM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,71 +261,71 @@ public void runToHalt(final MessageFrame frame, final OperationTracer tracing) {
? 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);
Expand Down
74 changes: 37 additions & 37 deletions evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1Validation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,38 +173,38 @@ String validateCode(
}
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;
Expand Down Expand Up @@ -648,12 +648,12 @@ String validateStack(
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];
Expand Down
Loading