Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1452: Replace size with contentLength 

Tracking B2 v2 API changes.
This commit is contained in:
Andrew Gaul 2018-09-28 12:04:42 -07:00
parent ce163f3498
commit 750809f97f
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
providers/b2/src/main/java/org/jclouds/b2/blobstore/B2BlobStore.java
View File

@ -205,9 +205,9 @@ public final class B2BlobStore extends BaseBlobStore {
} else { } else {
Map<String, String> userMetadata = ImmutableMap.of(); Map<String, String> userMetadata = ImmutableMap.of();
ContentMetadata metadata = ContentMetadataBuilder.create() ContentMetadata metadata = ContentMetadataBuilder.create()
.contentLength(entry.size()) .contentLength(entry.contentLength())
.build(); .build();
builder.add(new BlobMetadataImpl(null, entry.fileName(), null, null, null, null, entry.uploadTimestamp(), userMetadata, null, container, metadata, entry.size())); builder.add(new BlobMetadataImpl(null, entry.fileName(), null, null, null, null, entry.uploadTimestamp(), userMetadata, null, container, metadata, entry.contentLength()));
} }
} }
return new PageSetImpl<StorageMetadata>(builder.build(), list.nextFileName()); return new PageSetImpl<StorageMetadata>(builder.build(), list.nextFileName());

12
providers/b2/src/main/java/org/jclouds/b2/domain/B2ObjectList.java
View File

@ -41,12 +41,16 @@ public abstract class B2ObjectList {
public abstract Action action(); public abstract Action action();
@Nullable public abstract String fileId(); @Nullable public abstract String fileId();
public abstract String fileName(); public abstract String fileName();
public abstract long size(); public abstract long contentLength();
@Deprecated
public long size() {
return contentLength();
}
public abstract Date uploadTimestamp(); public abstract Date uploadTimestamp();
@SerializedNames({"action", "fileId", "fileName", "size", "uploadTimestamp"}) @SerializedNames({"action", "fileId", "fileName", "contentLength", "uploadTimestamp"})
public static Entry create(Action action, @Nullable String fileId, String fileName, long size, long uploadTimestamp) { public static Entry create(Action action, @Nullable String fileId, String fileName, long contentLength, long uploadTimestamp) {
return new AutoValue_B2ObjectList_Entry(action, fileId, fileName, size, new Date(uploadTimestamp)); return new AutoValue_B2ObjectList_Entry(action, fileId, fileName, contentLength, new Date(uploadTimestamp));
} }
} }
} }

4
providers/b2/src/test/resources/list_file_names_response.json
View File

@ -4,14 +4,14 @@
"action": "upload", "action": "upload",
"fileId": "4_z27c88f1d182b150646ff0b16_f1004ba650fe24e6b_d20150809_m012853_c100_v0009990_t0000", "fileId": "4_z27c88f1d182b150646ff0b16_f1004ba650fe24e6b_d20150809_m012853_c100_v0009990_t0000",
"fileName": "files/hello.txt", "fileName": "files/hello.txt",
"size": 6, "contentLength": 6,
"uploadTimestamp": 1439083733000 "uploadTimestamp": 1439083733000
}, },
{ {
"action": "upload", "action": "upload",
"fileId": "4_z27c88f1d182b150646ff0b16_f1004ba650fe24e6c_d20150809_m012854_c100_v0009990_t0000", "fileId": "4_z27c88f1d182b150646ff0b16_f1004ba650fe24e6c_d20150809_m012854_c100_v0009990_t0000",
"fileName": "files/world.txt", "fileName": "files/world.txt",
"size": 6, "contentLength": 6,
"uploadTimestamp": 1439083734000 "uploadTimestamp": 1439083734000
} }
], ],

6
providers/b2/src/test/resources/list_file_versions_response.json
View File

@ -4,21 +4,21 @@
"action": "upload", "action": "upload",
"fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886245_d20150809_m232316_c100_v0009990_t0003", "fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886245_d20150809_m232316_c100_v0009990_t0003",
"fileName": "files/hello.txt", "fileName": "files/hello.txt",
"size": 6, "contentLength": 6,
"uploadTimestamp": 1439162596000 "uploadTimestamp": 1439162596000
}, },
{ {
"action": "hide", "action": "hide",
"fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886247_d20150809_m232323_c100_v0009990_t0005", "fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886247_d20150809_m232323_c100_v0009990_t0005",
"fileName": "files/world.txt", "fileName": "files/world.txt",
"size": 0, "contentLength": 0,
"uploadTimestamp": 1439162603000 "uploadTimestamp": 1439162603000
}, },
{ {
"action": "upload", "action": "upload",
"fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886246_d20150809_m232316_c100_v0009990_t0003", "fileId": "4_z27c88f1d182b150646ff0b16_f100920ddab886246_d20150809_m232316_c100_v0009990_t0003",
"fileName": "files/world.txt", "fileName": "files/world.txt",
"size": 6, "contentLength": 6,
"uploadTimestamp": 1439162596000 "uploadTimestamp": 1439162596000
} }
], ],