From 76940b0448e9fd4a814095ba4fc2e775032c7427 Mon Sep 17 00:00:00 2001
From: dmitry-fa <dmitry.fazunenko@qlogic.io>
Date: Mon, 15 Jun 2020 13:54:01 +0300
Subject: [PATCH] test: update FakeStorageRpc to extend StorageRpcTestBase

---
 .../contrib/nio/testing/FakeStorageRpc.java   | 168 +-----------------
 pom.xml                                       |   2 +-
 2 files changed, 3 insertions(+), 167 deletions(-)

diff --git a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
index 52106141..55d0b52b 100644
--- a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
+++ b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
@@ -17,20 +17,13 @@
 package com.google.cloud.storage.contrib.nio.testing;
 
 import com.google.api.services.storage.model.Bucket;
-import com.google.api.services.storage.model.BucketAccessControl;
-import com.google.api.services.storage.model.HmacKey;
-import com.google.api.services.storage.model.HmacKeyMetadata;
-import com.google.api.services.storage.model.Notification;
-import com.google.api.services.storage.model.ObjectAccessControl;
-import com.google.api.services.storage.model.Policy;
 import com.google.api.services.storage.model.ServiceAccount;
 import com.google.api.services.storage.model.StorageObject;
-import com.google.api.services.storage.model.TestIamPermissionsResponse;
 import com.google.cloud.Tuple;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageException;
-import com.google.cloud.storage.spi.v1.RpcBatch;
 import com.google.cloud.storage.spi.v1.StorageRpc;
+import com.google.cloud.storage.testing.StorageRpcTestBase;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -75,7 +68,7 @@
  * </ul>
  */
 @NotThreadSafe
-class FakeStorageRpc implements StorageRpc {
+class FakeStorageRpc extends StorageRpcTestBase {
 
   // fullname -> metadata
   Map<String, StorageObject> metadata = new HashMap<>();
@@ -97,11 +90,6 @@ void reset() {
     contents = new HashMap<>();
   }
 
-  @Override
-  public Bucket create(Bucket bucket, Map<Option, ?> options) throws StorageException {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public StorageObject create(StorageObject object, InputStream content, Map<Option, ?> options)
       throws StorageException {
@@ -117,11 +105,6 @@ public StorageObject create(StorageObject object, InputStream content, Map<Optio
     return object;
   }
 
-  @Override
-  public Tuple<String, Iterable<Bucket>> list(Map<Option, ?> options) throws StorageException {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public Tuple<String, Iterable<StorageObject>> list(String bucket, Map<Option, ?> options)
       throws StorageException {
@@ -243,12 +226,6 @@ public boolean delete(StorageObject object, Map<Option, ?> options) throws Stora
     return null != metadata.remove(key);
   }
 
-  @Override
-  public RpcBatch createBatch() {
-    // return new DefaultRpcBatch(storage);
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public StorageObject compose(
       Iterable<StorageObject> sources, StorageObject target, Map<Option, ?> targetOptions)
@@ -437,111 +414,6 @@ public RewriteResponse openRewrite(RewriteRequest rewriteRequest) throws Storage
         data.length);
   }
 
-  @Override
-  public RewriteResponse continueRewrite(RewriteResponse previousResponse) throws StorageException {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BucketAccessControl getAcl(String bucket, String entity, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean deleteAcl(String bucket, String entity, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BucketAccessControl createAcl(BucketAccessControl acl, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public BucketAccessControl patchAcl(BucketAccessControl acl, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public List<BucketAccessControl> listAcls(String bucket, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public HmacKey createHmacKey(String serviceAccountEmail, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Tuple<String, Iterable<HmacKeyMetadata>> listHmacKeys(Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public HmacKeyMetadata updateHmacKey(HmacKeyMetadata hmacKeyMetadata, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public HmacKeyMetadata getHmacKey(String accessId, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void deleteHmacKey(HmacKeyMetadata hmacKeyMetadata, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ObjectAccessControl getDefaultAcl(String bucket, String entity) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean deleteDefaultAcl(String bucket, String entity) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ObjectAccessControl createDefaultAcl(ObjectAccessControl acl) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ObjectAccessControl patchDefaultAcl(ObjectAccessControl acl) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public List<ObjectAccessControl> listDefaultAcls(String bucket) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ObjectAccessControl getAcl(String bucket, String object, Long generation, String entity) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean deleteAcl(String bucket, String object, Long generation, String entity) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ObjectAccessControl createAcl(ObjectAccessControl acl) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ObjectAccessControl patchAcl(ObjectAccessControl acl) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public List<ObjectAccessControl> listAcls(String bucket, String object, Long generation) {
-    throw new UnsupportedOperationException();
-  }
-
   private String fullname(StorageObject so) {
     return (so.getBucket() + "/" + so.getName());
   }
@@ -612,42 +484,6 @@ private static boolean processedAsFolder(
     return true;
   }
 
-  @Override
-  public Policy getIamPolicy(String bucket, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Policy setIamPolicy(String bucket, Policy policy, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public TestIamPermissionsResponse testIamPermissions(
-      String bucket, List<String> permissions, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean deleteNotification(String bucket, String notification) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public List<Notification> listNotifications(String bucket) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Notification createNotification(String bucket, Notification notification) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Bucket lockRetentionPolicy(Bucket bucket, Map<Option, ?> options) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public ServiceAccount getServiceAccount(String projectId) {
     return null;
diff --git a/pom.xml b/pom.xml
index 8a3bb4c5..24cf1eb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-storage</artifactId>
-        <version>1.108.0</version>
+        <version>1.109.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.apis</groupId>