Don't reuse BufStep args across invocations

CHANGES.md

@@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * New static method to `DiffMessageFormatter` which allows to retrieve diffs with their line numbers ([#1960](https://github.com/diffplug/spotless/issues/1960))
+### Fixed
+* Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 * Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))

lib/src/main/java/com/diffplug/spotless/protobuf/BufStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -64,34 +63,33 @@ public FormatterStep create() {
 
  private State createState() {
  String instructions = "https://docs.buf.build/installation";
- ForeignExe exeAbsPath = ForeignExe.nameAndVersion("buf", version)
+ ForeignExe exe = ForeignExe.nameAndVersion("buf", version)
  .pathToExe(pathToExe)
  .versionRegex(Pattern.compile("(\\S*)"))
  .fixCantFind("Try following the instructions at " + instructions + ", or else tell Spotless where it is with {@code buf().pathToExe('path/to/executable')}");
- return new State(this, exeAbsPath);
+ return new State(this, exe);
  }
 
  @SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
  static class State implements Serializable {
  private static final long serialVersionUID = -1825662356883926318L;
  // used for up-to-date checks and caching
  final String version;
- final transient ForeignExe exe;
+
  // used for executing
- private transient @Nullable List<String> args;
+ private final transient ForeignExe exe;
+ private transient String exeAbsPath;
 
- State(BufStep step, ForeignExe exeAbsPath) {
+ State(BufStep step, ForeignExe exe) {
  this.version = step.version;
- this.exe = Objects.requireNonNull(exeAbsPath);
+ this.exe = Objects.requireNonNull(exe);
  }
 
  String format(ProcessRunner runner, String input, File file) throws IOException, InterruptedException {
- if (args == null) {
- args = Arrays.asList(
- exe.confirmVersionAndGetAbsolutePath(),
- "format",
- file.getAbsolutePath());
+ if (exeAbsPath == null) {
+ exeAbsPath = exe.confirmVersionAndGetAbsolutePath();
  }
+ List<String> args = List.of(exeAbsPath, "format", file.getAbsolutePath());
  return runner.exec(input.getBytes(StandardCharsets.UTF_8), args).assertExitZero(StandardCharsets.UTF_8);
  }
 

plugin-gradle/CHANGES.md

@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix a regression in BufStep where the same arguments were being provided to every `buf` invocation. ([#1976](https://github.com/diffplug/spotless/issues/1976))
 ### Changes
 * Use palantir-java-format 2.39.0 on Java 21. ([#1948](https://github.com/diffplug/spotless/pull/1948))
 * Bump default `ktlint` version to latest `1.0.1` -> `1.1.1`. ([#1973](https://github.com/diffplug/spotless/pull/1973))