chore: remove extra conditions from list (#211)

athakor · web-flow · commit 122e46bea767 · 2020-09-10T01:28:58.000+05:30
diff --git a/java-storage-nio/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java b/java-storage-nio/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
@@ -144,16 +144,14 @@ public Tuple<String, Iterable<StorageObject>> list(String bucket, Map<Option, ?>
     List<StorageObject> values = new ArrayList<>();
     Map<String, StorageObject> folders = new HashMap<>();
     for (StorageObject so : metadata.values()) {
-      if (!so.getName().startsWith(prefix)) {
+      if (!so.getBucket().equals(bucket) || !so.getName().startsWith(prefix)) {
         continue;
       }
       if (processedAsFolder(so, delimiter, prefix, folders)) {
         continue;
       }
       so.setSize(size(so));
-      if (so.getBucket().equals(bucket)) {
-        values.add(so);
-      }
+      values.add(so);
     }
     values.addAll(folders.values());
 

Original file line number	Diff line number	Diff line change
`@@ -144,16 +144,14 @@ public Tuple<String, Iterable<StorageObject>> list(String bucket, Map<Option, ?>`
`144`	`144`	`List<StorageObject> values = new ArrayList<>();`
`145`	`145`	`Map<String, StorageObject> folders = new HashMap<>();`
`146`	`146`	`for (StorageObject so : metadata.values()) {`
`147`		`- if (!so.getName().startsWith(prefix)) {`
	`147`	`+ if (!so.getBucket().equals(bucket) \|\| !so.getName().startsWith(prefix)) {`
`148`	`148`	`continue;`
`149`	`149`	`}`
`150`	`150`	`if (processedAsFolder(so, delimiter, prefix, folders)) {`
`151`	`151`	`continue;`
`152`	`152`	`}`
`153`	`153`	`so.setSize(size(so));`
`154`		`- if (so.getBucket().equals(bucket)) {`
`155`		`- values.add(so);`
`156`		`- }`
	`154`	`+ values.add(so);`
`157`	`155`	`}`
`158`	`156`	`values.addAll(folders.values());`
`159`	`157`