Merge pull request #17493 from iterate-ch/feature/GH-17139

Update dependency.

Author: dkocher

backblaze/pom.xml

@@ -25,7 +25,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <b2-version>2.1.0</b2-version>
+        <b2-version>2.2.0</b2-version>
     </properties>
 
     <dependencyManagement>

backblaze/src/main/java/ch/cyberduck/core/b2/B2ListService.java

@@ -21,38 +21,32 @@
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 
-import java.util.Collections;
-
 public class B2ListService implements ListService {
 
     private final B2Session session;
     private final B2VersionIdProvider fileid;
 
-    private Path bucket;
+    private final AttributedList<Path> buckets;
 
     public B2ListService(final B2Session session, final B2VersionIdProvider fileid) {
+        this(session, fileid, AttributedList.EMPTY);
+    }
+
+    public B2ListService(final B2Session session, final B2VersionIdProvider fileid, final AttributedList<Path> buckets) {
         this.session = session;
         this.fileid = fileid;
+        this.buckets = buckets;
     }
 
     @Override
     public AttributedList<Path> list(final Path directory, final ListProgressListener listener) throws BackgroundException {
         if(directory.isRoot()) {
-            if(bucket != null) {
-                final AttributedList<Path> buckets = new AttributedList<>(Collections.singleton(bucket));
-                listener.chunk(directory, buckets);
-                return buckets;
+            if(buckets.isEmpty()) {
+                return new B2BucketListService(session, fileid).list(directory, listener);
             }
-            return new B2BucketListService(session, fileid).list(directory, listener);
+            listener.chunk(directory, buckets);
+            return buckets;
         }
         return new B2ObjectListService(session, fileid).list(directory, listener);
     }
-
-    /**
-     * @param bucket When present, access is restricted to one bucket.
-     */
-    public B2ListService withBucket(final Path bucket) {
-        this.bucket = bucket;
-        return this;
-    }
 }

backblaze/src/main/java/ch/cyberduck/core/b2/B2Session.java

@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.AttributedList;
 import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostKeyCallback;
@@ -34,13 +35,13 @@
 import ch.cyberduck.core.ssl.X509TrustManager;
 import ch.cyberduck.core.threading.CancelCallback;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.util.EnumSet;
+import java.util.stream.Collectors;
 
 import synapticloop.b2.B2ApiClient;
 import synapticloop.b2.exception.B2ApiException;
@@ -52,7 +53,7 @@ public class B2Session extends HttpSession<B2ApiClient> {
     private B2ErrorResponseInterceptor retryHandler;
 
     private final B2VersionIdProvider fileid = new B2VersionIdProvider(this);
-    private final B2ListService listService = new B2ListService(this, fileid);
+    private final AttributedList<Path> buckets = new AttributedList<>();
 
     public B2Session(final Host host, final X509TrustManager trust, final X509KeyManager key) {
         super(host, trust, key);
@@ -88,10 +89,10 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
             // Save tokens for 401 error response when expired
             final B2AuthorizeAccountResponse response = client.authenticate(accountId, applicationKey);
             // When present, access is restricted to one bucket
-            if(StringUtils.isNotBlank(response.getBucketId())) {
-                final PathAttributes attributes = new PathAttributes();
-                attributes.setVersionId(response.getBucketId());
-                listService.withBucket(new Path(PathNormalizer.normalize(response.getBucketName()), EnumSet.of(Path.Type.directory, Path.Type.volume), attributes));
+            if(!response.getBuckets().isEmpty()) {
+                buckets.addAll(response.getBuckets().entrySet().stream().map(entry ->
+                        new Path(PathNormalizer.normalize(entry.getValue()), EnumSet.of(Path.Type.directory, Path.Type.volume),
+                                new PathAttributes().setVersionId(entry.getKey()))).collect(Collectors.toSet()));
             }
             retryHandler.setTokens(accountId, applicationKey, response.getAuthorizationToken());
             if(preferences.getBoolean("b2.upload.largeobject.auto")) {
@@ -116,7 +117,7 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     @SuppressWarnings("unchecked")
     public <T> T _getFeature(final Class<T> type) {
         if(type == ListService.class) {
-            return (T) listService;
+            return (T) new B2ListService(this, fileid, buckets);
         }
         if(type == Touch.class) {
             return (T) new B2TouchFeature(this, fileid);