Don't use String.format and string concatenation in precondition checks.

	Change on 2017/12/14 by idv <[email protected]>

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=179092962

Author: medb

bigquery/src/main/java/com/google/cloud/hadoop/io/bigquery/NoopFederatedExportToCloudStorage.java

@@ -37,18 +37,18 @@ configuration, getCommaSeparatedGcsPathList(table), fileFormat, bigQueryHelper,
     String inputType = fileFormat.getFormatIdentifier();
     String tableType = table.getExternalDataConfiguration().getSourceFormat();
     Preconditions.checkArgument(
-        inputType.equals(tableType), String.format(
-            "MapReduce fileFormat '%s' does not match BigQuery sourceFormat '%s'. Use the "
-                + "appropriate InputFormat.", inputType, tableType));
+        inputType.equals(tableType),
+        "MapReduce fileFormat '%s' does not match BigQuery sourceFormat '%s'. Use the "
+            + "appropriate InputFormat.",
+        inputType, tableType);
     gcsPaths = table.getExternalDataConfiguration().getSourceUris();
   }
 
   @VisibleForTesting
   static String getCommaSeparatedGcsPathList(final Table table) {
     Preconditions.checkNotNull(table.getExternalDataConfiguration());
     for (String uri : table.getExternalDataConfiguration().getSourceUris()) {
-      Preconditions.checkArgument(
-          uri.startsWith("gs://"), String.format("Invalid GCS resource: '%s'", uri));
+      Preconditions.checkArgument(uri.startsWith("gs://"), "Invalid GCS resource: '%s'", uri);
     }
     // FileInputFormat accepts a comma separated list of potentially globbed paths.
     return Joiner.on(",").join(table.getExternalDataConfiguration().getSourceUris());

bigquery/src/test/java/com/google/cloud/hadoop/io/bigquery/AbstractBigQueryIoIntegrationTestBase.java

@@ -168,8 +168,7 @@ public void setUp()
     }
 
     Preconditions.checkArgument(
-        !Strings.isNullOrEmpty(projectIdvalue),
-        String.format("Must provide %s", BIGQUERY_PROJECT_ID_ENVVARNAME));
+        !Strings.isNullOrEmpty(projectIdvalue), "Must provide %s", BIGQUERY_PROJECT_ID_ENVVARNAME);
     testDataset = testId + "_dataset";
     testBucket = testId + "_bucket";
 

gcsio/src/main/java/com/google/cloud/hadoop/gcsio/CacheEntry.java

@@ -19,7 +19,6 @@
 import com.google.api.client.util.Clock;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -178,9 +177,10 @@ public synchronized void clearItemInfo() {
   public synchronized GoogleCloudStorageItemInfo setItemInfo(
       GoogleCloudStorageItemInfo newItemInfo) {
     validateItemInfo(newItemInfo);
-    Preconditions.checkArgument(newItemInfo.getResourceId().equals(resourceId),
-        String.format("newItemInfo's resourceId (%s) doesn't match existing resourceId (%s)!",
-            newItemInfo.getResourceId(), resourceId));
+    Preconditions.checkArgument(
+        newItemInfo.getResourceId().equals(resourceId),
+        "newItemInfo's resourceId (%s) doesn't match existing resourceId (%s)!",
+        newItemInfo.getResourceId(), resourceId);
 
     if (itemInfo != null) {
       // TODO(user): Maybe skip the update if the newItemInfo has an older creationTime than

gcsio/src/main/java/com/google/cloud/hadoop/gcsio/CachedBucket.java

@@ -72,12 +72,12 @@ public String getName() {
    */
   private void validateStorageObjectId(StorageResourceId resourceId) {
     Preconditions.checkArgument(resourceId != null, "resourceId must not be null.");
-    Preconditions.checkArgument(resourceId.isStorageObject(),
-        String.format("resourceId must be a StorageObject, got: %s", resourceId));
+    Preconditions.checkArgument(
+        resourceId.isStorageObject(), "resourceId must be a StorageObject, got: %s", resourceId);
     Preconditions.checkArgument(
         resourceId.getBucketName().equals(getName()),
-        String.format("resourceId.getBucketName() (%s) doesn't match this.getName() (%s)",
-            resourceId.getBucketName(), getName()));
+        "resourceId.getBucketName() (%s) doesn't match this.getName() (%s)",
+        resourceId.getBucketName(), getName());
   }
 
   /**

gcsio/src/main/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageFileSystem.java

@@ -314,8 +314,8 @@ public SeekableByteChannel open(URI path, GoogleCloudStorageReadOptions readOpti
       throws IOException {
     LOG.debug("open({}, {})", path, readOptions);
     Preconditions.checkNotNull(path);
-    Preconditions.checkArgument(!FileInfo.isDirectoryPath(path),
-        "Cannot open a directory for reading: " + path);
+    Preconditions.checkArgument(
+        !FileInfo.isDirectoryPath(path), "Cannot open a directory for reading: %s", path);
 
     // Validate the given path. false == do not allow empty object name.
     StorageResourceId resourceId = pathCodec.validatePathAndGetId(path, false);

gcsio/src/main/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageImpl.java

@@ -298,8 +298,8 @@ void setBackOffFactory(BackOffFactory factory) {
   public WritableByteChannel create(StorageResourceId resourceId, CreateObjectOptions options)
       throws IOException {
     LOG.debug("create({})", resourceId);
-    Preconditions.checkArgument(resourceId.isStorageObject(),
-        "Expected full StorageObject id, got " + resourceId);
+    Preconditions.checkArgument(
+        resourceId.isStorageObject(), "Expected full StorageObject id, got %s", resourceId);
 
     /*
      * When performing mutations in GCS, even when we aren't concerned with parallel writers,
@@ -405,17 +405,17 @@ public WritableByteChannel create(StorageResourceId resourceId, CreateObjectOpti
   public WritableByteChannel create(StorageResourceId resourceId)
       throws IOException {
     LOG.debug("create({})", resourceId);
-    Preconditions.checkArgument(resourceId.isStorageObject(),
-        "Expected full StorageObject id, got " + resourceId);
+    Preconditions.checkArgument(
+        resourceId.isStorageObject(), "Expected full StorageObject id, got %s", resourceId);
 
     return create(resourceId, CreateObjectOptions.DEFAULT);
   }
 
   @Override
   public void createEmptyObject(StorageResourceId resourceId, CreateObjectOptions options)
       throws IOException {
-    Preconditions.checkArgument(resourceId.isStorageObject(),
-        "Expected full StorageObject id, got " + resourceId);
+    Preconditions.checkArgument(
+        resourceId.isStorageObject(), "Expected full StorageObject id, got %s", resourceId);
 
     Storage.Objects.Insert insertObject = prepareEmptyInsert(resourceId, options);
     try {
@@ -438,8 +438,8 @@ public void createEmptyObject(StorageResourceId resourceId, CreateObjectOptions
   public void createEmptyObject(StorageResourceId resourceId)
       throws IOException {
     LOG.debug("createEmptyObject({})", resourceId);
-    Preconditions.checkArgument(resourceId.isStorageObject(),
-        "Expected full StorageObject id, got " + resourceId);
+    Preconditions.checkArgument(
+        resourceId.isStorageObject(), "Expected full StorageObject id, got %s", resourceId);
     createEmptyObject(resourceId, CreateObjectOptions.DEFAULT);
   }
 
@@ -552,8 +552,8 @@ public SeekableByteChannel open(
       StorageResourceId resourceId, GoogleCloudStorageReadOptions readOptions)
       throws IOException {
     LOG.debug("open({}, {})", resourceId, readOptions);
-    Preconditions.checkArgument(resourceId.isStorageObject(),
-        "Expected full StorageObject id, got " + resourceId);
+    Preconditions.checkArgument(
+        resourceId.isStorageObject(), "Expected full StorageObject id, got %s", resourceId);
 
     // The underlying channel doesn't initially read data, which means that we won't see a
     // FileNotFoundException until read is called. As a result, in order to find out if the object
@@ -674,8 +674,10 @@ public void deleteObjects(List<StorageResourceId> fullObjectNames)
 
     // Validate that all the elements represent StorageObjects.
     for (StorageResourceId fullObjectName : fullObjectNames) {
-      Preconditions.checkArgument(fullObjectName.isStorageObject(),
-          "Expected full StorageObject names only, got: " + fullObjectName.toString());
+      Preconditions.checkArgument(
+          fullObjectName.isStorageObject(),
+          "Expected full StorageObject names only, got: %s",
+          fullObjectName);
     }
 
     // Gather exceptions to wrap in a composite exception at the end.
@@ -1335,11 +1337,12 @@ public static GoogleCloudStorageItemInfo createItemInfoForBucket(
       StorageResourceId resourceId, Bucket bucket) {
     Preconditions.checkArgument(resourceId != null, "resourceId must not be null");
     Preconditions.checkArgument(bucket != null, "bucket must not be null");
-    Preconditions.checkArgument(resourceId.isBucket(),
-        String.format("resourceId must be a Bucket. resourceId: %s", resourceId));
-    Preconditions.checkArgument(resourceId.getBucketName().equals(bucket.getName()),
-        String.format("resourceId.getBucketName() must equal bucket.getName(): '%s' vs '%s'",
-            resourceId.getBucketName(), bucket.getName()));
+    Preconditions.checkArgument(
+        resourceId.isBucket(), "resourceId must be a Bucket. resourceId: %s", resourceId);
+    Preconditions.checkArgument(
+        resourceId.getBucketName().equals(bucket.getName()),
+        "resourceId.getBucketName() must equal bucket.getName(): '%s' vs '%s'",
+        resourceId.getBucketName(), bucket.getName());
 
     // For buckets, size is 0.
     return new GoogleCloudStorageItemInfo(resourceId, bucket.getTimeCreated().getValue(),
@@ -1353,14 +1356,18 @@ public static GoogleCloudStorageItemInfo createItemInfoForStorageObject(
       StorageResourceId resourceId, StorageObject object) {
     Preconditions.checkArgument(resourceId != null, "resourceId must not be null");
     Preconditions.checkArgument(object != null, "object must not be null");
-    Preconditions.checkArgument(resourceId.isStorageObject(),
-        String.format("resourceId must be a StorageObject. resourceId: %s", resourceId));
-    Preconditions.checkArgument(resourceId.getBucketName().equals(object.getBucket()),
-        String.format("resourceId.getBucketName() must equal object.getBucket(): '%s' vs '%s'",
-            resourceId.getBucketName(), object.getBucket()));
-    Preconditions.checkArgument(resourceId.getObjectName().equals(object.getName()),
-        String.format("resourceId.getObjectName() must equal object.getName(): '%s' vs '%s'",
-            resourceId.getObjectName(), object.getName()));
+    Preconditions.checkArgument(
+        resourceId.isStorageObject(),
+        "resourceId must be a StorageObject. resourceId: %s",
+        resourceId);
+    Preconditions.checkArgument(
+        resourceId.getBucketName().equals(object.getBucket()),
+        "resourceId.getBucketName() must equal object.getBucket(): '%s' vs '%s'",
+        resourceId.getBucketName(), object.getBucket());
+    Preconditions.checkArgument(
+        resourceId.getObjectName().equals(object.getName()),
+        "resourceId.getObjectName() must equal object.getName(): '%s' vs '%s'",
+        resourceId.getObjectName(), object.getName());
 
     Map<String, byte[]> decodedMetadata =
         object.getMetadata() == null ? null : decodeMetadata(object.getMetadata());
@@ -1515,15 +1522,18 @@ public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
     // Assemble the return list in the same order as the input arguments.
     List<GoogleCloudStorageItemInfo> sortedItemInfos = new ArrayList<>();
     for (StorageResourceId resourceId : resourceIds) {
-      Preconditions.checkState(itemInfos.containsKey(resourceId),
-          String.format("Somehow missing resourceId '%s' from map: %s", resourceId, itemInfos));
+      Preconditions.checkState(
+          itemInfos.containsKey(resourceId),
+          "Somehow missing resourceId '%s' from map: %s",
+          resourceId, itemInfos);
       sortedItemInfos.add(itemInfos.get(resourceId));
     }
 
     // We expect the return list to be the same size, even if some entries were "not found".
-    Preconditions.checkState(sortedItemInfos.size() == resourceIds.size(), String.format(
-        "sortedItemInfos.size() (%d) != resourceIds.size() (%d). infos: %s, ids: %s",
-        sortedItemInfos.size(), resourceIds.size(),  sortedItemInfos, resourceIds));
+    Preconditions.checkState(
+        sortedItemInfos.size() == resourceIds.size(),
+        "sortedItemInfos.size() (%s) != resourceIds.size() (%s). infos: %s, ids: %s",
+        sortedItemInfos.size(), resourceIds.size(), sortedItemInfos, resourceIds);
     return sortedItemInfos;
   }
 
@@ -1589,18 +1599,18 @@ public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
     // Assemble the return list in the same order as the input arguments.
     List<GoogleCloudStorageItemInfo> sortedItemInfos = new ArrayList<>();
     for (UpdatableItemInfo itemInfo : itemInfoList) {
-      Preconditions.checkState(resultItemInfos.containsKey(itemInfo.getStorageResourceId()),
-          String.format(
-              "Missing resourceId '%s' from map: %s",
-              itemInfo.getStorageResourceId(),
-              resultItemInfos));
+      Preconditions.checkState(
+          resultItemInfos.containsKey(itemInfo.getStorageResourceId()),
+          "Missing resourceId '%s' from map: %s",
+          itemInfo.getStorageResourceId(), resultItemInfos);
       sortedItemInfos.add(resultItemInfos.get(itemInfo.getStorageResourceId()));
     }
 
     // We expect the return list to be the same size, even if some entries were "not found".
-    Preconditions.checkState(sortedItemInfos.size() == itemInfoList.size(), String.format(
-        "sortedItemInfos.size() (%d) != resourceIds.size() (%d). infos: %s, updateItemInfos: %s",
-        sortedItemInfos.size(), itemInfoList.size(), sortedItemInfos, itemInfoList));
+    Preconditions.checkState(
+        sortedItemInfos.size() == itemInfoList.size(),
+        "sortedItemInfos.size() (%s) != resourceIds.size() (%s). infos: %s, updateItemInfos: %s",
+        sortedItemInfos.size(), itemInfoList.size(), sortedItemInfos, itemInfoList);
     return sortedItemInfos;
   }
 
@@ -1733,8 +1743,8 @@ IOException wrapException(IOException e, String message,
   private StorageObject getObject(StorageResourceId resourceId)
       throws IOException {
     LOG.debug("getObject({})", resourceId);
-    Preconditions.checkArgument(resourceId.isStorageObject(),
-        "Expected full StorageObject id, got " + resourceId);
+    Preconditions.checkArgument(
+        resourceId.isStorageObject(), "Expected full StorageObject id, got %s", resourceId);
     String bucketName = resourceId.getBucketName();
     String objectName = resourceId.getObjectName();
     StorageObject object = null;