Update sbt to 1.11.7, sbt-mdoc to 2.8.0, sbt-java-formatter to 0.10.0… (#5815)

kellen · web-flow · commit a450123f7966 · 2025-11-17T13:46:46.000-05:00
diff --git a/.sbtopts b/.sbtopts
@@ -5,3 +5,9 @@
 -Dscio.ignoreVersionWarning=true
 -Dorg.slf4j.simpleLogger.defaultLogLevel=info
 -Dorg.slf4j.simpleLogger.logFile=scio.log
+# required for sbt-java-formatter
+-J--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
diff --git a/build.sbt b/build.sbt
@@ -104,14 +104,14 @@ val magnoliaVersion = "1.1.10"
 val magnolifyVersion = "0.7.4"
 val metricsVersion = "4.2.37"
 val munitVersion = "1.2.1"
-val neo4jDriverVersion = "4.4.20"
+val neo4jDriverVersion = "4.4.21"
 val ndArrayVersion = "0.3.3"
 val parquetExtraVersion = "0.4.3"
 val parquetVersion = "1.16.0"
-val pprintVersion = "0.9.0"
+val pprintVersion = "0.9.4"
 val protobufGenericVersion = "0.2.9"
-val scalacheckVersion = "1.18.1"
-val scalaCollectionCompatVersion = "2.13.0"
+val scalacheckVersion = "1.18.0"
+val scalaCollectionCompatVersion = "2.14.0"
 val scalaMacrosVersion = "2.1.1"
 val scalatestVersion = "3.2.19"
 val shapelessVersion = "2.3.13"
@@ -1909,7 +1909,7 @@ lazy val integration = project
       "com.google.guava" % "guava" % guavaVersion,
       "com.google.http-client" % "google-http-client" % gcpBom.key.value,
       "com.google.protobuf" % "protobuf-java" % protobufVersion,
-      "com.microsoft.sqlserver" % "mssql-jdbc" % "13.2.0.jre11",
+      "com.microsoft.sqlserver" % "mssql-jdbc" % "13.2.1.jre11",
       "joda-time" % "joda-time" % jodaTimeVersion,
       "org.apache.beam" % "beam-sdks-java-core" % beamVersion,
       "org.apache.beam" % "beam-sdks-java-io-google-cloud-platform" % beamVersion,
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.6
+sbt.version=1.11.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -9,14 +9,14 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.0")
 addSbtPlugin("com.here.platform" % "sbt-bom" % "1.0.30")
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0")
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.8")
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
 addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.9.0")
 addSbtPlugin("com.github.sbt" % "sbt-site" % "1.7.0")
 addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")
 addSbtPlugin("com.github.sbt" % "sbt-paradox-material-theme" % "0.7.0")
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.2")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.8.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.1")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
 
diff --git a/scalafix/project/build.properties b/scalafix/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.6
+sbt.version=1.11.7
diff --git a/scio-core/src/main/java/com/spotify/scio/options/ScioOptions.java b/scio-core/src/main/java/com/spotify/scio/options/ScioOptions.java
@@ -81,7 +81,8 @@ enum CheckEnabled {
   void setNullableCoders(boolean value);
 
   @Description(
-      "Colon-separated mapping of fully-qualified class name to location of Zstd dictionary for that class com.MyClass:gs://bucket/file.bin")
+      "Colon-separated mapping of fully-qualified class name to location of Zstd dictionary for"
+          + " that class com.MyClass:gs://bucket/file.bin")
   List<String> getZstdDictionary();
 
   void setZstdDictionary(List<String> value);
diff --git a/scio-examples/src/main/java/org/apache/beam/examples/WindowedWordCount.java b/scio-examples/src/main/java/org/apache/beam/examples/WindowedWordCount.java
@@ -91,6 +91,7 @@
  */
 public class WindowedWordCount {
   static final int WINDOW_SIZE = 10; // Default window duration in minutes
+
   /**
    * Concept #2: A DoFn that sets the data element timestamp. This is a silly method, just for this
    * example, for the bounded data case.
diff --git a/scio-examples/src/main/java/org/apache/beam/examples/complete/game/GameStats.java b/scio-examples/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
@@ -150,6 +150,7 @@ public void processElement(ProcessContext c) {
       return filtered;
     }
   }
+
   // [END DocInclude_AbuseDetect]
 
   /** Calculate and output an element's session duration. */
diff --git a/scio-examples/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java b/scio-examples/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
@@ -276,6 +276,7 @@ public PCollection<KV<String, Integer>> expand(PCollection<GameActionInfo> infos
           .apply("ExtractTeamScore", new ExtractAndSumScore("team"));
     }
   }
+
   // [END DocInclude_WindowAndTrigger]
 
   // [START DocInclude_ProcTimeTrigger]
diff --git a/scio-examples/src/main/java/org/apache/beam/examples/complete/game/UserScore.java b/scio-examples/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
@@ -169,6 +169,7 @@ public PCollection<KV<String, Integer>> expand(PCollection<GameActionInfo> gameI
           .apply(Sum.integersPerKey());
     }
   }
+
   // [END DocInclude_USExtractXform]
 
   /** Options supported by {@link UserScore}. */
diff --git a/scio-examples/src/main/java/org/apache/beam/examples/complete/game/injector/InjectorUtils.java b/scio-examples/src/main/java/org/apache/beam/examples/complete/game/injector/InjectorUtils.java
@@ -48,11 +48,12 @@ public static Pubsub getClient(final HttpTransport httpTransport, final JsonFact
     }
     if (credential.getClientAuthentication() != null) {
       System.out.println(
-          "\n***Warning! You are not using service account credentials to "
-              + "authenticate.\nYou need to use service account credentials for this example,"
-              + "\nsince user-level credentials do not have enough pubsub quota,\nand so you will run "
-              + "out of PubSub quota very quickly.\nSee "
-              + "https://developers.google.com/identity/protocols/application-default-credentials.");
+          "\n"
+              + "***Warning! You are not using service account credentials to authenticate.\n"
+              + "You need to use service account credentials for this example,\n"
+              + "since user-level credentials do not have enough pubsub quota,\n"
+              + "and so you will run out of PubSub quota very quickly.\n"
+              + "See https://developers.google.com/identity/protocols/application-default-credentials.");
       System.exit(1);
     }
     HttpRequestInitializer initializer = new RetryHttpInitializerWrapper(credential);
diff --git a/scio-examples/src/main/java/org/apache/beam/examples/subprocess/kernel/SubProcessIOFiles.java b/scio-examples/src/main/java/org/apache/beam/examples/subprocess/kernel/SubProcessIOFiles.java
@@ -56,7 +56,9 @@ public String getOutFileLocation() {
     return outFileLocation;
   }
 
-  /** @param workerWorkingDirectory */
+  /**
+   * @param workerWorkingDirectory
+   */
   public SubProcessIOFiles(String workerWorkingDirectory) {
 
     this.uuid = UUID.randomUUID().toString();
diff --git a/scio-examples/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java b/scio-examples/src/test/java/org/apache/beam/examples/complete/game/HourlyTeamScoreTest.java
@@ -57,8 +57,10 @@ public class HourlyTeamScoreTest implements Serializable {
         "user13_ApricotQuokka,ApricotQuokka,15,1447955630000,2015-11-19 09:53:53.444",
         "user6_AmberNumbat,AmberNumbat,11,1447955630000,2015-11-19 09:53:53.444",
         "user7_AlmondWallaby,AlmondWallaby,15,1447955630000,2015-11-19 09:53:53.444",
-        "user7_AndroidGreenKookaburra,AndroidGreenKookaburra,12,1447955630000,2015-11-19 09:53:53.444",
-        "user7_AndroidGreenKookaburra,AndroidGreenKookaburra,11,1447955630000,2015-11-19 09:53:53.444",
+        "user7_AndroidGreenKookaburra,AndroidGreenKookaburra,12,1447955630000,2015-11-19"
+            + " 09:53:53.444",
+        "user7_AndroidGreenKookaburra,AndroidGreenKookaburra,11,1447955630000,2015-11-19"
+            + " 09:53:53.444",
         "user19_BisqueBilby,BisqueBilby,6,1447955630000,2015-11-19 09:53:53.444",
         "user19_BisqueBilby,BisqueBilby,8,1447955630000,2015-11-19 09:53:53.444",
         // time gap...
diff --git a/scio-examples/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java b/scio-examples/src/test/java/org/apache/beam/examples/complete/game/LeaderBoardTest.java
@@ -55,6 +55,7 @@ public class LeaderBoardTest implements Serializable {
   private Instant baseTime = new Instant(0);
 
   @Rule public TestPipeline p = TestPipeline.create();
+
   /** Some example users, on two separate teams. */
   private enum TestUser {
     RED_ONE("scarlet", "red"),
diff --git a/scio-examples/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java b/scio-examples/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
@@ -52,9 +52,11 @@ public class UserScoreTest implements Serializable {
         "user13_ApricotQuokka,ApricotQuokka,15,1447955630000,2015-11-19 09:53:53.444",
         "user6_AmberNumbat,AmberNumbat,11,1447955630000,2015-11-19 09:53:53.444",
         "user7_AlmondWallaby,AlmondWallaby,15,1447955630000,2015-11-19 09:53:53.444",
-        "user7_AndroidGreenKookaburra,AndroidGreenKookaburra,12,1447955630000,2015-11-19 09:53:53.444",
+        "user7_AndroidGreenKookaburra,AndroidGreenKookaburra,12,1447955630000,2015-11-19"
+            + " 09:53:53.444",
         "user6_AliceBlueDingo,AliceBlueDingo,4,xxxxxxx,2015-11-19 09:53:53.444",
-        "user7_AndroidGreenKookaburra,AndroidGreenKookaburra,11,1447955630000,2015-11-19 09:53:53.444",
+        "user7_AndroidGreenKookaburra,AndroidGreenKookaburra,11,1447955630000,2015-11-19"
+            + " 09:53:53.444",
         "THIS IS A PARSE ERROR,2015-11-19 09:53:53.444",
         "user19_BisqueBilby,BisqueBilby,6,1447955630000,2015-11-19 09:53:53.444",
         "user19_BisqueBilby,BisqueBilby,8,1447955630000,2015-11-19 09:53:53.444"
diff --git a/scio-grpc/src/main/java/com/spotify/scio/grpc/GrpcDoFn.java b/scio-grpc/src/main/java/com/spotify/scio/grpc/GrpcDoFn.java
@@ -125,7 +125,9 @@ public Builder<RequestT, ResponseT, ClientT> withChannelSupplier(
       return this;
     }
 
-    /** @param newClientFn creates the gRPC async stub from the channel */
+    /**
+     * @param newClientFn creates the gRPC async stub from the channel
+     */
     public Builder<RequestT, ResponseT, ClientT> withNewClientFn(
         SerializableFunction<Channel, ClientT> newClientFn) {
       this.newClientFn = newClientFn;
@@ -152,7 +154,9 @@ public Builder<RequestT, ResponseT, ClientT> withMaxPendingRequests(int maxPendi
       return this;
     }
 
-    /** @param cacheSupplier supplier for lookup cache. */
+    /**
+     * @param cacheSupplier supplier for lookup cache.
+     */
     public Builder<RequestT, ResponseT, ClientT> withCacheSupplier(
         CacheSupplier<RequestT, ResponseT> cacheSupplier) {
       this.cacheSupplier = cacheSupplier;
diff --git a/scio-parquet/src/main/java/com/spotify/scio/parquet/BeamInputFile.java b/scio-parquet/src/main/java/com/spotify/scio/parquet/BeamInputFile.java
@@ -144,8 +144,8 @@ public SeekableInputStream newStream() throws IOException {
       if (!className.equals("H1SeekableInputStream")
           && !className.equals("H2SeekableInputStream")) {
         LOG.warn(
-            "Vectored read was requested for file {}, but Parquet vector bridge returned non-vectorized stream "
-                + "{}. Is parquet-hadoop available on the classpath?",
+            "Vectored read was requested for file {}, but Parquet vector bridge returned"
+                + " non-vectorized stream {}. Is parquet-hadoop available on the classpath?",
             resourceId,
             stream.getClass());
       }
diff --git a/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/BucketMetadataUtil.java b/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/BucketMetadataUtil.java
@@ -56,7 +56,9 @@ public static class SourceMetadata<V> {
       this.mapping = mapping;
     }
 
-    /** @return smallest number of buckets for this set of inputs. */
+    /**
+     * @return smallest number of buckets for this set of inputs.
+     */
     int leastNumBuckets() {
       return mapping.values().stream().mapToInt(v -> v.metadata.getNumBuckets()).min().getAsInt();
     }
diff --git a/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/SortedBucketIO.java b/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/SortedBucketIO.java
@@ -301,7 +301,8 @@ protected void xformCheck() {
           "One of TransformFn<K, V> or TransformFnWithSideInputContext<K, V> must be set by via()");
       Preconditions.checkState(
           !((toFinalResultT != null) && (toFinalResultTWithSides != null)), // only one defined
-          "At most one of of TransformFn<K, V> or TransformFnWithSideInputContext<K, V> may be set");
+          "At most one of of TransformFn<K, V> or TransformFnWithSideInputContext<K, V> may be"
+              + " set");
       if (toFinalResultTWithSides != null) {
         Preconditions.checkNotNull(
             this.sides,
diff --git a/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/SortedBucketSource.java b/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/SortedBucketSource.java
@@ -150,7 +150,9 @@ protected SortedBucketSource(
 
   protected abstract Function<SortedBucketIO.ComparableKeyBytes, KeyType> toKeyFn();
 
-  /** @return A split source of the implementing subtype */
+  /**
+   * @return A split source of the implementing subtype
+   */
   protected abstract SortedBucketSource<KeyType> createSplitSource(
       int splitNum, int totalParallelism, long estSplitSize);
 
@@ -210,7 +212,8 @@ public List<? extends BoundedSource<KV<KeyType, CoGbkResult>>> split(
     final long estSplitSize = estimatedSizeBytes / numSplits;
     final DecimalFormat sizeFormat = new DecimalFormat("0.00");
     LOG.info(
-        "Parallelism was adjusted by {}splitting source of size {} MB into {} source(s) of size {} MB",
+        "Parallelism was adjusted by {}splitting source of size {} MB into {} source(s) of size {}"
+            + " MB",
         effectiveParallelism > 1 ? "further " : "",
         sizeFormat.format(estimatedSizeBytes / 1000000.0),
         numSplits,
@@ -331,7 +334,8 @@ static class TraversableOnceIterable<V> implements Iterable<V> {
     public Iterator<V> iterator() {
       Preconditions.checkArgument(
           !called,
-          "CoGbkResult .iterator() can only be called once. To be re-iterable, it must be materialized as a List.");
+          "CoGbkResult .iterator() can only be called once. To be re-iterable, it must be"
+              + " materialized as a List.");
       called = true;
       return underlying;
     }
@@ -549,9 +553,7 @@ private static List<Metadata> sampleDirectory(ResourceId directory, String filep
     }
 
     long getOrSampleByteSize() {
-      return getInputs()
-          .entrySet()
-          .parallelStream()
+      return getInputs().entrySet().parallelStream()
           .mapToLong(
               entry -> {
                 // Take at most 10 buckets from the directory to sample
diff --git a/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/SortedBucketTransform.java b/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/SortedBucketTransform.java
@@ -357,7 +357,8 @@ public List<? extends BoundedSource<BucketItem>> split(
 
       final DecimalFormat sizeFormat = new DecimalFormat("0.00");
       LOG.info(
-          "Parallelism was adjusted by {}splitting source of size {} MB into {} source(s) of size {} MB",
+          "Parallelism was adjusted by {}splitting source of size {} MB into {} source(s) of size"
+              + " {} MB",
           effectiveParallelism > 1 ? "further " : "",
           sizeFormat.format(estimatedSizeBytes / 1000000.0),
           numSplits,
@@ -377,8 +378,7 @@ public List<? extends BoundedSource<BucketItem>> split(
     public long getEstimatedSizeBytes(final PipelineOptions options) throws Exception {
       if (estimatedSizeBytes == -1) {
         estimatedSizeBytes =
-            sources
-                .parallelStream()
+            sources.parallelStream()
                 .mapToLong(SortedBucketSource.BucketedInput::getOrSampleByteSize)
                 .sum();
         LOG.info("Estimated byte size is " + estimatedSizeBytes);
diff --git a/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/SourceSpec.java b/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/SourceSpec.java
@@ -77,7 +77,8 @@ public int getParallelism(TargetParallelism targetParallelism) {
     if (targetParallelism.getValue() > greatestNumBuckets)
       LOG.warn(
           String.format(
-              "You have selected a parallelism > the greatest number of buckets (%d). Unless you are applying a SortedBucketTransform, consider a lower number.",
+              "You have selected a parallelism > the greatest number of buckets (%d). Unless you"
+                  + " are applying a SortedBucketTransform, consider a lower number.",
               greatestNumBuckets));
     return targetParallelism.getValue();
   }
diff --git a/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/TFRecordCodec.java b/scio-smb/src/main/java/org/apache/beam/sdk/extensions/smb/TFRecordCodec.java
@@ -84,7 +84,8 @@ byte[] read(ReadableByteChannel inChannel) throws IOException {
     if (data.hasRemaining()) {
       throw new IOException(
           String.format(
-              "EOF while reading record of length %d. Read only %d bytes. Input might be truncated.",
+              "EOF while reading record of length %d. Read only %d bytes. Input might be"
+                  + " truncated.",
               length, data.position()));
     }
 
diff --git a/scio-smb/src/main/java/org/apache/beam/sdk/extensions/sorter/BufferedExternalSorter.java b/scio-smb/src/main/java/org/apache/beam/sdk/extensions/sorter/BufferedExternalSorter.java
@@ -135,7 +135,8 @@ public void add(KV<byte[], byte[]> record) throws IOException {
         // Flushing contents of in memory sorter to external sorter so we can rely on external
         // from here on out
         LOG.info(
-            "InMemorySorter buffer exceeded memoryMb limit. Transferring from in-memory to external sort.");
+            "InMemorySorter buffer exceeded memoryMb limit. Transferring from in-memory to external"
+                + " sort.");
         transferToExternalSorter();
       }
     }
diff --git a/scio-smb/src/test/java/org/apache/beam/sdk/extensions/smb/BucketMetadataTest.java b/scio-smb/src/test/java/org/apache/beam/sdk/extensions/smb/BucketMetadataTest.java
@@ -184,15 +184,18 @@ public void testOldBucketMetadataIgnoresExtraFields() throws Exception {
     final String serializedAvro =
         "{\"type\":\"org.apache.beam.sdk.extensions.smb.AvroBucketMetadata\",\"version\":"
             + futureVersion
-            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"MURMUR3_32\",\"keyField\":\"user_id\", \"extra_field\":\"foo\"}";
+            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"MURMUR3_32\",\"keyField\":\"user_id\","
+            + " \"extra_field\":\"foo\"}";
     final String serializedJson =
         "{\"type\":\"org.apache.beam.sdk.extensions.smb.JsonBucketMetadata\",\"version\":"
             + futureVersion
-            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"MURMUR3_32\",\"keyField\":\"user_id\", \"extra_field\":\"foo\"}";
+            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"MURMUR3_32\",\"keyField\":\"user_id\","
+            + " \"extra_field\":\"foo\"}";
     final String serializedTensorflow =
         "{\"type\":\"org.apache.beam.sdk.extensions.smb.TensorFlowBucketMetadata\",\"version\":"
             + futureVersion
-            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"MURMUR3_32\",\"keyField\":\"user_id\", \"extra_field\":\"foo\"}";
+            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"MURMUR3_32\",\"keyField\":\"user_id\","
+            + " \"extra_field\":\"foo\"}";
 
     // Assert that no exception is thrown decoding.
     Assert.assertEquals(
@@ -210,19 +213,23 @@ public void testDoesntFailOnUnknownHashType() throws Exception {
     final String serializedAvro =
         "{\"type\":\"org.apache.beam.sdk.extensions.smb.AvroBucketMetadata\",\"version\":"
             + futureVersion
-            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"SOME_HASH_TYPE\",\"keyField\":\"user_id\", \"extra_field\":\"foo\"}";
+            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"SOME_HASH_TYPE\",\"keyField\":\"user_id\","
+            + " \"extra_field\":\"foo\"}";
     final String serializedJson =
         "{\"type\":\"org.apache.beam.sdk.extensions.smb.JsonBucketMetadata\",\"version\":"
             + futureVersion
-            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"SOME_HASH_TYPE\",\"keyField\":\"user_id\", \"extra_field\":\"foo\"}";
+            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"SOME_HASH_TYPE\",\"keyField\":\"user_id\","
+            + " \"extra_field\":\"foo\"}";
     final String serializedPq =
         "{\"type\":\"org.apache.beam.sdk.extensions.smb.ParquetBucketMetadata\",\"version\":"
             + futureVersion
-            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"SOME_HASH_TYPE\",\"keyField\":\"user_id\", \"extra_field\":\"foo\"}";
+            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"SOME_HASH_TYPE\",\"keyField\":\"user_id\","
+            + " \"extra_field\":\"foo\"}";
     final String serializedTf =
         "{\"type\":\"org.apache.beam.sdk.extensions.smb.TensorFlowBucketMetadata\",\"version\":"
             + futureVersion
-            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"SOME_HASH_TYPE\",\"keyField\":\"user_id\", \"extra_field\":\"foo\"}";
+            + ",\"numBuckets\":2,\"numShards\":1,\"keyClass\":\"java.lang.String\",\"hashType\":\"SOME_HASH_TYPE\",\"keyField\":\"user_id\","
+            + " \"extra_field\":\"foo\"}";
 
     // Assert that no exception is thrown decoding.
     final JsonBucketMetadata jsonBucketMetadata =

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.11.6`
	`1`	`+sbt.version=1.11.7`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ public void processElement(ProcessContext c) {`
`150`	`150`	`return filtered;`
`151`	`151`	`}`
`152`	`152`	`}`
	`153`	`+`
`153`	`154`	`// [END DocInclude_AbuseDetect]`
`154`	`155`
`155`	`156`	`/** Calculate and output an element's session duration. */`
Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,7 @@ public PCollection<KV<String, Integer>> expand(PCollection<GameActionInfo> infos`
`276`	`276`	`.apply("ExtractTeamScore", new ExtractAndSumScore("team"));`
`277`	`277`	`}`
`278`	`278`	`}`
	`279`	`+`
`279`	`280`	`// [END DocInclude_WindowAndTrigger]`
`280`	`281`
`281`	`282`	`// [START DocInclude_ProcTimeTrigger]`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ public PCollection<KV<String, Integer>> expand(PCollection<GameActionInfo> gameI`
`169`	`169`	`.apply(Sum.integersPerKey());`
`170`	`170`	`}`
`171`	`171`	`}`
	`172`	`+`
`172`	`173`	`// [END DocInclude_USExtractXform]`
`173`	`174`
`174`	`175`	`/** Options supported by {@link UserScore}. */`