Merge branch 'master' into logging-label

Author: pongad

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobConfiguration.java

@@ -36,7 +36,7 @@ public abstract class JobConfiguration implements Serializable {
   /**
    * Type of a BigQuery Job.
    */
-  enum Type {
+  public enum Type {
     /**
      * A Copy Job copies an existing table to another new or existing table. Instances of
      * {@code JobConfiguration} for this type are implemented by {@link CopyJobConfiguration}.

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java

@@ -118,6 +118,12 @@ public void testSetProjectId() {
     }
   }
 
+  @Test
+  public void testGetType() {
+    assertEquals(JobConfiguration.Type.COPY, COPY_JOB_CONFIGURATION.getType());
+    assertEquals(JobConfiguration.Type.COPY, COPY_JOB_CONFIGURATION_MULTIPLE_TABLES.getType());
+  }
+
   private void compareCopyJobConfiguration(CopyJobConfiguration expected,
       CopyJobConfiguration value) {
     assertEquals(expected, value);

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExtractJobConfigurationTest.java

@@ -125,6 +125,12 @@ public void testSetProjectId() {
     assertEquals("p", configuration.getSourceTable().getProject());
   }
 
+  @Test
+  public void testGetType() {
+    assertEquals(JobConfiguration.Type.EXTRACT, EXTRACT_CONFIGURATION.getType());
+    assertEquals(JobConfiguration.Type.EXTRACT, EXTRACT_CONFIGURATION_ONE_URI.getType());
+  }
+
   private void compareExtractJobConfiguration(ExtractJobConfiguration expected,
       ExtractJobConfiguration value) {
     assertEquals(expected, value);

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java

@@ -109,6 +109,11 @@ public void testSetProjectId() {
     assertEquals("p", configuration.getDestinationTable().getProject());
   }
 
+  @Test
+  public void testGetType() {
+    assertEquals(JobConfiguration.Type.LOAD, LOAD_CONFIGURATION.getType());
+  }
+
   private void compareLoadJobConfiguration(LoadJobConfiguration expected,
       LoadJobConfiguration value) {
     assertEquals(expected, value);

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java

@@ -19,18 +19,15 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.bigquery.JobInfo.CreateDisposition;
 import com.google.cloud.bigquery.JobInfo.WriteDisposition;
 import com.google.cloud.bigquery.QueryJobConfiguration.Priority;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-
-import org.junit.Test;
-
 import java.util.List;
 import java.util.Map;
+import org.junit.Test;
 
 public class QueryJobConfigurationTest {
 
@@ -134,6 +131,11 @@ public void testSetProjectId() {
     assertEquals("p", configuration.getDestinationTable().getProject());
   }
 
+  @Test
+  public void testGetType() {
+    assertEquals(JobConfiguration.Type.QUERY, QUERY_JOB_CONFIGURATION.getType());
+  }
+
   private void compareQueryJobConfiguration(QueryJobConfiguration expected,
       QueryJobConfiguration value) {
     assertEquals(expected, value);

google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java

@@ -33,6 +33,7 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Throwables;
 import com.google.common.collect.AbstractIterator;
+import com.google.common.net.UrlEscapers;
 import com.google.common.primitives.Ints;
 
 import java.io.BufferedInputStream;
@@ -48,6 +49,7 @@
 import java.nio.file.DirectoryStream.Filter;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.FileStore;
+import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.OpenOption;
@@ -209,6 +211,12 @@ public CloudStoragePath getPath(URI uri) {
         getFileSystem(CloudStorageUtil.stripPathFromUri(uri)), uri.getPath());
   }
 
+  /** Convenience method: replaces spaces with "%20", builds a URI, and calls getPath(uri). */
+  public CloudStoragePath getPath(String uriInStringForm) {
+    String escaped = UrlEscapers.urlFragmentEscaper().escape(uriInStringForm);
+    return getPath(URI.create(escaped));
+  }
+
   @Override
   public SeekableByteChannel newByteChannel(
       Path path, Set<? extends OpenOption> options, FileAttribute<?>... attrs) throws IOException {
@@ -351,6 +359,15 @@ public boolean deleteIfExists(Path path) throws IOException {
     initStorage();
     CloudStoragePath cloudPath = CloudStorageUtil.checkPath(path);
     if (cloudPath.seemsLikeADirectoryAndUsePseudoDirectories()) {
+      // if the "folder" is empty then we're fine, otherwise complain
+      // that we cannot act on folders.
+      try (DirectoryStream<Path> paths = Files.newDirectoryStream(path)) {
+        if (!paths.iterator().hasNext()) {
+          // "folder" isn't actually there in the first place, so: success!
+          // (we must return true so delete doesn't freak out)
+          return true;
+        }
+      }
       throw new CloudStoragePseudoDirectoryException(cloudPath);
     }
     return storage.delete(cloudPath.getBlobId());