work in progress

aozarov · aozarov · commit 02a8550fe942 · 2015-04-14T15:57:24.000-07:00
diff --git a/src/main/java/com/google/gcloud/spi/StorageRpc.java b/src/main/java/com/google/gcloud/spi/StorageRpc.java
@@ -1 +1 @@
-/* * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * *       http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */package com.google.gcloud.spi;import com.google.api.services.storage.model.Bucket;import com.google.api.services.storage.model.StorageObject;import com.google.gcloud.storage.BlobReadChannel;import com.google.gcloud.storage.BlobWriteChannel;import java.io.IOException;import java.nio.ByteBuffer;import java.util.Iterator;public interface StorageRpc {  Bucket create(Bucket bucket) throws IOException;  StorageObject create(StorageObject object, ByteBuffer content) throws IOException;  Iterator<Bucket> list() throws IOException;  Iterator<StorageObject> list(String bucket, String prefix, String delimiter, String cursor,      boolean versions, int limit) throws IOException;  Bucket get(Bucket bucket) throws IOException;  StorageObject get(StorageObject object) throws IOException;  Bucket patch(Bucket bucket) throws IOException;  StorageObject patch(StorageObject storageObject) throws IOException;  void delete(Bucket bucket) throws  IOException;  void delete(StorageObject object) throws IOException;  StorageObject compose(String bucket, Iterable<String> src, StorageObject dest) throws IOException;  StorageObject copy(StorageObject from, StorageObject to) throws IOException;  BlobReadChannel reader(StorageObject from) throws IOException;  BlobWriteChannel writer(StorageObject to) throws IOException;}
+/* * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * *       http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */package com.google.gcloud.spi;import com.google.api.services.storage.model.Bucket;import com.google.api.services.storage.model.StorageObject;import com.google.gcloud.storage.BlobReadChannel;import com.google.gcloud.storage.BlobWriteChannel;import java.io.IOException;import java.nio.ByteBuffer;import java.util.Iterator;public interface StorageRpc {  Bucket create(Bucket bucket) throws IOException;  StorageObject create(StorageObject object, ByteBuffer content) throws IOException;  Iterator<Bucket> list() throws IOException;  Iterator<StorageObject> list(String bucket, String prefix, String delimiter, String cursor,      boolean versions, int limit) throws IOException;  Bucket get(String bucket) throws IOException;  StorageObject get(String bucket, String object) throws IOException;  Bucket patch(Bucket bucket) throws IOException;  StorageObject patch(StorageObject storageObject) throws IOException;  void delete(Bucket bucket) throws  IOException;  void delete(StorageObject object) throws IOException;  StorageObject compose(String bucket, Iterable<String> src, StorageObject dest) throws IOException;  StorageObject copy(StorageObject from, StorageObject to) throws IOException;  BlobReadChannel reader(StorageObject from) throws IOException;  BlobWriteChannel writer(StorageObject to) throws IOException;}
diff --git a/src/main/java/com/google/gcloud/storage/StorageService.java b/src/main/java/com/google/gcloud/storage/StorageService.java
@@ -24,22 +24,25 @@
 public interface StorageService extends Service<StorageServiceOptions> {
 
   // todo: consider what to do with predefinedAcl
+
   // todo: consider supplying create/update/delete options (varargs) for
   // ifGenerationMatch, ifGenerationNotMatch, ifMetagenerationMatch,
   // ifMetagenerationNotMatch, ifSourceGenerationMatch, ifSourceGenerationNotMatch
   // ifSourceMetagenerationMatch and ifSourceMetagenerationNotMatch
 
+  // todo: provide way for construct signed URLs - https://cloud.google.com/storage/docs/access-control#Signed-URLs
+
   Bucket create(Bucket bucket);
 
   Blob create(Blob blob, ByteBuffer content);
 
-  Bucket get(Bucket bucket);
+  Bucket get(String bucket);
 
-  Blob get(Blob blob);
+  Blob get(String bucket, String blob);
 
   Iterator<Bucket> list();
 
-  Iterator<Blob> list(Bucket bucket, ListOptions settings);
+  Iterator<Blob> list(String bucket, ListOptions settings);
 
   Bucket update(Bucket bucket);
 
diff --git a/src/main/java/com/google/gcloud/storage/StorageServiceImpl.java b/src/main/java/com/google/gcloud/storage/StorageServiceImpl.java
@@ -53,18 +53,18 @@ public Blob create(Blob blob, ByteBuffer content) {
   }
 
   @Override
-  public Bucket get(Bucket bucket) {
+  public Bucket get(String bucket) {
     try {
-      return Bucket.fromPb(storageRpc.get(bucket.toPb()));
+      return Bucket.fromPb(storageRpc.get(bucket));
     } catch (IOException ex) {
       throw new StorageServiceException(ex);
     }
   }
 
   @Override
-  public Blob get(Blob blob) {
+  public Blob get(String bucket, String blob) {
     try {
-      return Blob.fromPb(storageRpc.get(blob.toPb()));
+      return Blob.fromPb(storageRpc.get(bucket, blob));
     } catch (IOException ex) {
       throw new StorageServiceException(ex);
     }
@@ -80,11 +80,11 @@ public Iterator<Bucket> list() {
   }
 
   @Override
-  public Iterator<Blob> list(Bucket bucket, ListOptions settings) {
+  public Iterator<Blob> list(String bucket, ListOptions settings) {
     try {
       String delimiter = settings.recursive() ? options().pathDelimiter() : null;
       return Iterators.transform(
-          storageRpc.list(bucket.name(), settings.prefix(), delimiter, settings.cursor(),
+          storageRpc.list(bucket, settings.prefix(), delimiter, settings.cursor(),
               settings.includeOlderVersions(), settings.maxResults()),
           Blob.FROM_PB_FUNCTION);
     } catch (IOException ex) {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-/* * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */package com.google.gcloud.spi;import com.google.api.services.storage.model.Bucket;import com.google.api.services.storage.model.StorageObject;import com.google.gcloud.storage.BlobReadChannel;import com.google.gcloud.storage.BlobWriteChannel;import java.io.IOException;import java.nio.ByteBuffer;import java.util.Iterator;public interface StorageRpc { Bucket create(Bucket bucket) throws IOException; StorageObject create(StorageObject object, ByteBuffer content) throws IOException; Iterator<Bucket> list() throws IOException; Iterator<StorageObject> list(String bucket, String prefix, String delimiter, String cursor, boolean versions, int limit) throws IOException; Bucket get(Bucket bucket) throws IOException; StorageObject get(StorageObject object) throws IOException; Bucket patch(Bucket bucket) throws IOException; StorageObject patch(StorageObject storageObject) throws IOException; void delete(Bucket bucket) throws IOException; void delete(StorageObject object) throws IOException; StorageObject compose(String bucket, Iterable<String> src, StorageObject dest) throws IOException; StorageObject copy(StorageObject from, StorageObject to) throws IOException; BlobReadChannel reader(StorageObject from) throws IOException; BlobWriteChannel writer(StorageObject to) throws IOException;}
	`1`	+/* * Copyright 2015 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */package com.google.gcloud.spi;import com.google.api.services.storage.model.Bucket;import com.google.api.services.storage.model.StorageObject;import com.google.gcloud.storage.BlobReadChannel;import com.google.gcloud.storage.BlobWriteChannel;import java.io.IOException;import java.nio.ByteBuffer;import java.util.Iterator;public interface StorageRpc { Bucket create(Bucket bucket) throws IOException; StorageObject create(StorageObject object, ByteBuffer content) throws IOException; Iterator<Bucket> list() throws IOException; Iterator<StorageObject> list(String bucket, String prefix, String delimiter, String cursor, boolean versions, int limit) throws IOException; Bucket get(String bucket) throws IOException; StorageObject get(String bucket, String object) throws IOException; Bucket patch(Bucket bucket) throws IOException; StorageObject patch(StorageObject storageObject) throws IOException; void delete(Bucket bucket) throws IOException; void delete(StorageObject object) throws IOException; StorageObject compose(String bucket, Iterable<String> src, StorageObject dest) throws IOException; StorageObject copy(StorageObject from, StorageObject to) throws IOException; BlobReadChannel reader(StorageObject from) throws IOException; BlobWriteChannel writer(StorageObject to) throws IOException;}