more fixes

Author: scwhittle

examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/utils/SchemasUtils.java

@@ -140,7 +140,7 @@ public static String getGcsFileAsString(String filePath) {
       result = FileSystems.match(filePath);
       checkArgument(
           result.status() == MatchResult.Status.OK && !result.metadata().isEmpty(),
-          "Failed to match any files with the pattern: " + filePath);
+          "Failed to match any files with the pattern: %s", filePath);
 
       List<ResourceId> rId =
           result.metadata().stream()

runners/direct-java/src/main/java/org/apache/beam/runners/direct/SplittableProcessElementsEvaluatorFactory.java

@@ -65,7 +65,7 @@ class SplittableProcessElementsEvaluatorFactory<
               public DoFnLifecycleManager load(final AppliedPTransform<?, ?, ?> application) {
                 checkArgument(
                     ProcessElements.class.isInstance(application.getTransform()),
-                    "No know extraction of the fn from " + application);
+                    "No know extraction of the fn from %s", application);
                 final ProcessElements<
                         InputT, OutputT, RestrictionT, PositionT, WatermarkEstimatorStateT>
                     transform =

runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java

@@ -101,7 +101,8 @@ public ParDoFn create(
           SerializableUtils.deserializeFromByteArray(serializedCombineFn, "serialized combine fn");
       checkArgument(
           combineFnObj instanceof AppliedCombineFn,
-          "unexpected kind of AppliedCombineFn: " + combineFnObj.getClass().getName());
+          "unexpected kind of AppliedCombineFn: %s",
+              combineFnObj.getClass().getName());
       combineFn = (AppliedCombineFn<?, ?, ?, ?>) combineFnObj;
     }
 
@@ -110,14 +111,14 @@ public ParDoFn create(
     Coder<?> inputCoder = CloudObjects.coderFromCloudObject(CloudObject.fromSpec(inputCoderObject));
     checkArgument(
         inputCoder instanceof WindowedValueCoder,
-        "Expected WindowedValueCoder for inputCoder, got: " + inputCoder.getClass().getName());
+        "Expected WindowedValueCoder for inputCoder, got: %s", inputCoder.getClass().getName());
     @SuppressWarnings("unchecked")
     WindowedValueCoder<?> windowedValueCoder = (WindowedValueCoder<?>) inputCoder;
 
     Coder<?> elemCoder = windowedValueCoder.getValueCoder();
     checkArgument(
         elemCoder instanceof KvCoder,
-        "Expected KvCoder for inputCoder, got: " + elemCoder.getClass().getName());
+        "Expected KvCoder for inputCoder, got: %s", elemCoder.getClass().getName());
     @SuppressWarnings("unchecked")
     KvCoder<?, ?> kvCoder = (KvCoder<?, ?>) elemCoder;
 

runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/InMemoryReader.java

@@ -67,7 +67,7 @@ public InMemoryReader(
     checkArgument(this.startIndex >= 0, "negative start index: %s", startIndex);
     checkArgument(
         this.endIndex >= this.startIndex,
-        "end index before start: [" + this.startIndex + ", " + this.endIndex + ")");
+        "end index before start: [%s, %s)", this.startIndex, this.endIndex);
     this.coder = coder;
   }
 

sdks/java/core/src/main/java/org/apache/beam/sdk/io/TFRecordReadSchemaTransformConfiguration.java

@@ -63,7 +63,8 @@ public void validate() {
     if (errorHandling != null) {
       checkArgument(
           !Strings.isNullOrEmpty(errorHandling.getOutput()),
-          invalidConfigMessage + "Output must not be empty if error handling specified.");
+          "%sOutput must not be empty if error handling specified.",
+          invalidConfigMessage);
     }
   }
 

sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java

@@ -325,7 +325,8 @@ public Schema(List<Field> fields, Options options) {
     for (Field field : this.fields) {
       Preconditions.checkArgument(
           fieldIndicesMutable.get(field.getName()) == null,
-          "Duplicate field " + field.getName() + " added to schema");
+          "Duplicate field %s added to schema",
+          field.getName());
       encodingPositions.put(field.getName(), index);
       fieldIndicesMutable.put(field.getName(), index++);
     }

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOWriteTest.java

@@ -1,4 +1,4 @@
-/*
+check/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -540,7 +540,7 @@ private void verifySideInputs() {
       assertThat(
           fakeDatasetService.getAllRows("project-id", "dataset-id", "userid-" + entry.getKey()),
           containsInAnyOrder(Iterables.toArray(entry.getValue(), TableRow.class)));
-      checkLineageSinkMetric(pipelineResult, "project-id.dataset-id.userid-%s" + entry.getKey());
+      checkLineageSinkMetric(pipelineResult, "project-id.dataset-id.userid-" + entry.getKey());
     }
   }
 

sdks/java/io/hadoop-format/src/main/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIO.java

@@ -555,9 +555,8 @@ private void validateConfiguration(Configuration configuration) {
       if (configuration.get("mapreduce.job.inputformat.class").endsWith("DBInputFormat")) {
         checkArgument(
             configuration.get(DBConfiguration.INPUT_ORDER_BY_PROPERTY) != null,
-            "Configuration must contain \""
-                + DBConfiguration.INPUT_ORDER_BY_PROPERTY
-                + "\" when using DBInputFormat");
+            "Configuration must contain \"%s\" when using DBInputFormat",
+            DBConfiguration.INPUT_ORDER_BY_PROPERTY));
       }
     }
 
@@ -1062,7 +1061,7 @@ public SerializableSplit() {}
 
     public SerializableSplit(InputSplit split) {
       checkArgument(
-          split instanceof Writable, String.format("Split is not of type Writable: %s", split));
+          split instanceof Writable, "Split is not of type Writable: %s", split);
       this.inputSplit = split;
     }
 
@@ -1684,14 +1683,17 @@ private void validateConfiguration(Configuration conf) {
       checkArgument(conf != null, "Configuration can not be null");
       checkArgument(
           conf.get(OUTPUT_FORMAT_CLASS_ATTR) != null,
-          "Configuration must contain \"" + OUTPUT_FORMAT_CLASS_ATTR + "\"");
+          "Configuration must contain \"%s\"",
+          OUTPUT_FORMAT_CLASS_ATTR);
       checkArgument(
           conf.get(OUTPUT_KEY_CLASS) != null,
-          "Configuration must contain \"" + OUTPUT_KEY_CLASS + "\"");
+          "Configuration must contain \"%s\"",
+          OUTPUT_KEY_CLASS);
       checkArgument(
           conf.get(OUTPUT_VALUE_CLASS) != null,
-          "Configuration must contain \"" + OUTPUT_VALUE_CLASS + "\"");
-      checkArgument(conf.get(JOB_ID) != null, "Configuration must contain \"" + JOB_ID + "\"");
+          "Configuration must contain \"%s\"",
+          OUTPUT_VALUE_CLASS);
+      checkArgument(conf.get(JOB_ID) != null, "Configuration must contain \"%s\"", JOB_ID);
     }
 
     /**