2525import com .google .gcloud .storage .BlobId ;
2626import com .google .gcloud .storage .BlobInfo ;
2727import com .google .gcloud .storage .Bucket ;
28+ import com .google .gcloud .storage .BucketInfo ;
2829import com .google .gcloud .storage .CopyWriter ;
2930import com .google .gcloud .storage .Storage ;
3031import com .google .gcloud .storage .Storage .ComposeRequest ;
@@ -132,27 +133,27 @@ public void run(Storage storage, BlobId... blobIds) {
132133 if (blobIds .length == 1 ) {
133134 if (blobIds [0 ].name ().isEmpty ()) {
134135 // get Bucket
135- Bucket bucket = storage .get (blobIds [0 ].bucket ());
136+ Bucket bucket = Bucket .get (storage , blobIds [0 ].bucket ());
136137 if (bucket == null ) {
137138 System .out .println ("No such bucket" );
138139 return ;
139140 }
140- System .out .println ("Bucket info: " + bucket );
141+ System .out .println ("Bucket info: " + bucket . info () );
141142 } else {
142143 // get Blob
143- Blob blob = storage .get (blobIds [0 ]);
144+ Blob blob = Blob .get (storage , blobIds [0 ]);
144145 if (blob == null ) {
145146 System .out .println ("No such object" );
146147 return ;
147148 }
148- System .out .println ("Blob info: " + blob );
149+ System .out .println ("Blob info: " + blob . info () );
149150 }
150151 } else {
151152 // use batch to get multiple blobs.
152- List <Blob > blobs = storage .get (blobIds );
153+ List <Blob > blobs = Blob .get (storage , Arrays . asList ( blobIds ) );
153154 for (Blob blob : blobs ) {
154155 if (blob != null ) {
155- System .out .println (blob );
156+ System .out .println (blob . info () );
156157 }
157158 }
158159 }
@@ -183,7 +184,7 @@ private static class DeleteAction extends BlobsAction {
183184 @ Override
184185 public void run (Storage storage , BlobId ... blobIds ) {
185186 // use batch operation
186- List <Boolean > deleteResults = storage .delete (blobIds );
187+ List <Boolean > deleteResults = Blob .delete (storage , blobIds );
187188 int index = 0 ;
188189 for (Boolean deleted : deleteResults ) {
189190 if (deleted ) {
@@ -217,20 +218,20 @@ String parse(String... args) {
217218 public void run (Storage storage , String bucketName ) {
218219 if (bucketName == null ) {
219220 // list buckets
220- Iterator <Bucket > bucketIterator = storage .list ().iterateAll ();
221- while (bucketIterator .hasNext ()) {
222- System .out .println (bucketIterator .next ());
221+ Iterator <BucketInfo > bucketInfoIterator = storage .list ().iterateAll ();
222+ while (bucketInfoIterator .hasNext ()) {
223+ System .out .println (bucketInfoIterator .next ());
223224 }
224225 } else {
225226 // list a bucket's blobs
226- Bucket bucket = storage .get (bucketName );
227+ Bucket bucket = Bucket .get (storage , bucketName );
227228 if (bucket == null ) {
228229 System .out .println ("No such bucket" );
229230 return ;
230231 }
231232 Iterator <Blob > blobIterator = bucket .list ().iterateAll ();
232233 while (blobIterator .hasNext ()) {
233- System .out .println (blobIterator .next ());
234+ System .out .println (blobIterator .next (). info () );
234235 }
235236 }
236237 }
@@ -256,7 +257,8 @@ private void run(Storage storage, Path uploadFrom, BlobInfo blobInfo) throws IOE
256257 if (Files .size (uploadFrom ) > 1_000_000 ) {
257258 // When content is not available or large (1MB or more) it is recommended
258259 // to write it in chunks via the blob's channel writer.
259- try (WriteChannel writer = storage .writer (blobInfo )) {
260+ Blob blob = new Blob (storage , blobInfo );
261+ try (WriteChannel writer = blob .writer ()) {
260262 byte [] buffer = new byte [1024 ];
261263 try (InputStream input = Files .newInputStream (uploadFrom )) {
262264 int limit ;
@@ -309,7 +311,7 @@ public void run(Storage storage, Tuple<BlobId, Path> tuple) throws IOException {
309311 }
310312
311313 private void run (Storage storage , BlobId blobId , Path downloadTo ) throws IOException {
312- Blob blob = storage .get (blobId );
314+ Blob blob = Blob .get (storage , blobId );
313315 if (blob == null ) {
314316 System .out .println ("No such object" );
315317 return ;
@@ -318,7 +320,7 @@ private void run(Storage storage, BlobId blobId, Path downloadTo) throws IOExcep
318320 if (downloadTo != null ) {
319321 writeTo = new PrintStream (new FileOutputStream (downloadTo .toFile ()));
320322 }
321- if (blob .size () < 1_000_000 ) {
323+ if (blob .info (). size () < 1_000_000 ) {
322324 // Blob is small read all its content in one request
323325 byte [] content = blob .content ();
324326 writeTo .write (content );
@@ -436,13 +438,13 @@ public void run(Storage storage, Tuple<BlobId, Map<String, String>> tuple)
436438 }
437439
438440 private void run (Storage storage , BlobId blobId , Map <String , String > metadata ) {
439- Blob blob = storage .get (blobId );
441+ Blob blob = Blob .get (storage , blobId );
440442 if (blob == null ) {
441443 System .out .println ("No such object" );
442444 return ;
443445 }
444- Blob updateBlob = blob .toBuilder ().metadata (metadata ).build (). update ( );
445- System .out .println ("Updated " + updateBlob );
446+ Blob updateBlob = blob .update ( blob . info (). toBuilder ().metadata (metadata ).build ());
447+ System .out .println ("Updated " + updateBlob . info () );
446448 }
447449
448450 @ Override
@@ -486,8 +488,9 @@ public void run(Storage storage, Tuple<ServiceAccountAuthCredentials, BlobInfo>
486488 run (storage , tuple .x (), tuple .y ());
487489 }
488490
489- private void run (Storage storage , ServiceAccountAuthCredentials cred , BlobInfo blobInfo ) {
490- Blob blob = storage .get (blobInfo .blobId ());
491+ private void run (Storage storage , ServiceAccountAuthCredentials cred , BlobInfo blobInfo )
492+ throws IOException {
493+ Blob blob = new Blob (storage , blobInfo );
491494 System .out .println ("Signed URL: "
492495 + blob .signUrl (1 , TimeUnit .DAYS , SignUrlOption .serviceAccount (cred )));
493496 }
0 commit comments