FakeStorageRpc with master changes

jart · mziccard · commit 85257a0ea851 · 2016-06-30T09:13:05.000+02:00
diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/FakeStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/testing/FakeStorageRpc.java
@@ -193,7 +193,8 @@ public boolean delete(StorageObject object, Map<Option, ?> options) throws Stora
 
   @Override
   public RpcBatch createBatch() {
-    return null;
+    //return new DefaultRpcBatch(storage);
+    throw new UnsupportedOperationException();
   }
 
   @Override
@@ -328,7 +329,7 @@ private void potentiallyThrow(Map<Option, ?> options) throws UnsupportedOperatio
       throw new UnsupportedOperationException();
     }
   }
-  
+
   // Returns true if this is a folder. Adds it to folders if it isn't already there.
   private static boolean processedAsFolder(StorageObject so, String delimiter, String prefix, /* inout */ Map<String, StorageObject> folders) {
     if (delimiter == null) {

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,8 @@ public boolean delete(StorageObject object, Map<Option, ?> options) throws Stora`
`193`	`193`
`194`	`194`	`@Override`
`195`	`195`	`public RpcBatch createBatch() {`
`196`		`- return null;`
	`196`	`+ //return new DefaultRpcBatch(storage);`
	`197`	`+ throw new UnsupportedOperationException();`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`@Override`
`@@ -328,7 +329,7 @@ private void potentiallyThrow(Map<Option, ?> options) throws UnsupportedOperatio`
`328`	`329`	`throw new UnsupportedOperationException();`
`329`	`330`	`}`
`330`	`331`	`}`
`331`		`-`
	`332`	`+`
`332`	`333`	`// Returns true if this is a folder. Adds it to folders if it isn't already there.`
`333`	`334`	`private static boolean processedAsFolder(StorageObject so, String delimiter, String prefix, /* inout */ Map<String, StorageObject> folders) {`
`334`	`335`	`if (delimiter == null) {`