Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit 0794f0d

Browse files
SynapticloopSynapticloop
Synapticloop
authored and
Synapticloop
committed
documentation and api refactor
1 parent 6c37b9b commit 0794f0d

5 files changed

Lines changed: 62 additions & 24 deletions

File tree

‎src/main/java/synapticloop/b2/B2ApiClient.java‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,26 @@ public B2BucketResponse createBucket(String bucketName, BucketType bucketType) t
5353
return(new B2CreateBucketRequest(getB2AuthorizeAccountResponse(), bucketName, bucketType).getResponse());
5454
}
5555

56+
/**
57+
* Delete a bucket by the bucket identifier
58+
*
59+
* @param bucketId the id of the bucket to delete
60+
*
61+
* @return the delete bucket response
62+
*
63+
* @throws B2ApiException if something went wrong with the call, or the bucket was not empty
64+
*/
5665
public B2BucketResponse deleteBucket(String bucketId) throws B2ApiException {
5766
return(new B2DeleteBucketRequest(getB2AuthorizeAccountResponse(), bucketId).getResponse());
5867
}
5968

69+
/**
70+
* List all of the buckets in the account
71+
*
72+
* @return the list of buckets for the account
73+
*
74+
* @throws B2ApiException if something went wrong
75+
*/
6076
public List<B2BucketResponse> listBuckets() throws B2ApiException {
6177
return(new B2ListBucketsRequest(getB2AuthorizeAccountResponse()).getResponse());
6278
}
@@ -65,14 +81,14 @@ public B2FileResponse getFileInfo(String fileId) throws B2ApiException {
6581
return(new B2GetFileInfoRequest(getB2AuthorizeAccountResponse(), fileId).getResponse());
6682
}
6783

68-
public B2UploadFileRequest uploadFile(String bucketId, File file) throws B2ApiException {
84+
public B2UploadFileRequest uploadFile(String bucketId, String fileName, File file) throws B2ApiException {
6985
B2GetUploadUrlResponse b2GetUploadUrlResponse = new B2GetUploadUrlRequest(getB2AuthorizeAccountResponse(), bucketId).getResponse();
70-
return(new B2UploadFileRequest(getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, file));
86+
return(new B2UploadFileRequest(getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, fileName, file));
7187
}
7288

73-
public B2UploadFileRequest uploadFile(String bucketId, File file, String mimeType) throws B2ApiException {
89+
public B2UploadFileRequest uploadFile(String bucketId, String fileName, File file, String mimeType) throws B2ApiException {
7490
B2GetUploadUrlResponse b2GetUploadUrlResponse = new B2GetUploadUrlRequest(getB2AuthorizeAccountResponse(), bucketId).getResponse();
75-
return(new B2UploadFileRequest(getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, file, mimeType));
91+
return(new B2UploadFileRequest(getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, fileName, file, mimeType));
7692
}
7793

7894
public B2DeleteFileVersionResponse deleteFileVersion(String fileName, String fileId) throws B2ApiException {

‎src/main/java/synapticloop/b2/request/B2UploadFileRequest.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,16 @@
2525

2626
public class B2UploadFileRequest extends BaseB2Request {
2727
private File file = null;
28-
private String fileName = null;
2928
private String mimeType = null;
30-
private String authorizationToken = null;
3129
private Map<String, String> fileInfo = null;
30+
private String fileName = null;
3231

33-
public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, B2GetUploadUrlResponse b2GetUploadUrlResponse, File file) {
32+
public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, B2GetUploadUrlResponse b2GetUploadUrlResponse, String fileName, File file) {
3433
super(b2AuthorizeAccountResponse);
34+
this.fileName = fileName;
3535
this.url = b2GetUploadUrlResponse.getUploadUrl();
36-
this.authorizationToken = b2GetUploadUrlResponse.getAuthorizationToken();
3736
this.file = file;
38-
this.fileName = file.getName();
39-
37+
4038
// now go through and add in the 'X-Bz-Info-*' headers
4139
if(null != fileInfo) {
4240
Iterator<String> iterator = fileInfo.keySet().iterator();
@@ -48,18 +46,18 @@ public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse
4846
}
4947

5048

51-
public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, B2GetUploadUrlResponse b2GetUploadUrlResponse, File file, Map<String, String> fileInfo) {
49+
public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, B2GetUploadUrlResponse b2GetUploadUrlResponse, String fileName, File file, Map<String, String> fileInfo) {
5250
super(b2AuthorizeAccountResponse);
5351
this.fileInfo = fileInfo;
5452
}
5553

56-
public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, B2GetUploadUrlResponse b2GetUploadUrlResponse, File file, String mimeType) {
57-
this(b2AuthorizeAccountResponse, b2GetUploadUrlResponse, file);
54+
public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, B2GetUploadUrlResponse b2GetUploadUrlResponse, String fileName, File file, String mimeType) {
55+
this(b2AuthorizeAccountResponse, b2GetUploadUrlResponse, fileName, file);
5856
this.mimeType = mimeType;
5957
}
6058

61-
public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, B2GetUploadUrlResponse b2GetUploadUrlResponse, File file, String mimeType, Map<String, String> fileInfo) {
62-
this(b2AuthorizeAccountResponse, b2GetUploadUrlResponse, file, fileInfo);
59+
public B2UploadFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, B2GetUploadUrlResponse b2GetUploadUrlResponse, String fileName, File file, String mimeType, Map<String, String> fileInfo) {
60+
this(b2AuthorizeAccountResponse, b2GetUploadUrlResponse, fileName, file, fileInfo);
6361
}
6462

6563
public B2FileResponse getResponse() throws B2ApiException {
@@ -74,9 +72,8 @@ public B2FileResponse getResponse() throws B2ApiException {
7472
} catch (UnsupportedEncodingException ex) {
7573
// should never happen
7674
}
77-
headers.put(HEADER_X_BZ_CONTENT_SHA1, Helper.calculateSha1(file));
7875

79-
headers.put("Authorization", authorizationToken);
76+
headers.put(HEADER_X_BZ_CONTENT_SHA1, Helper.calculateSha1(file));
8077

8178
return(new B2FileResponse(executePost(file)));
8279
}

‎src/test/java/synapticloop/b2/B2ApiClientTest.java‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,46 @@
11
package synapticloop.b2;
2-
import static org.junit.Assert.*;
2+
import java.util.UUID;
33

44
import org.junit.Before;
55
import org.junit.Test;
66

7+
import synapticloop.b2.exception.B2ApiException;
8+
import synapticloop.b2.helper.B2TestHelper;
9+
import synapticloop.b2.response.B2BucketResponse;
10+
711

812
public class B2ApiClientTest {
13+
public static final String B2_ACCOUNT_ID = "B2_ACCOUNT_ID";
14+
public static final String B2_APPLICATION_KEY = "B2_APPLICATION_KEY";
915
private B2ApiClient b2ApiClient;
1016

1117
@Before
1218
public void setup() {
13-
b2ApiClient = new B2ApiClient(null, null);
19+
boolean isOK = true;
20+
String b2AccountId = System.getenv(B2_ACCOUNT_ID);
21+
String b2ApplicationKey = System.getenv(B2_APPLICATION_KEY);
22+
23+
if(null == b2AccountId) {
24+
System.err.println("Could not find the environment variable '" + B2_ACCOUNT_ID + "', cannot continue with tests, exiting...");
25+
isOK = false;
26+
}
27+
28+
if(null == b2ApplicationKey) {
29+
System.err.println("Could not find the environment variable '" + B2_APPLICATION_KEY + "', cannot continue with tests, exiting...");
30+
isOK = false;
31+
}
32+
33+
if(!isOK) {
34+
System.exit(-1);
35+
}
36+
37+
b2ApiClient = new B2ApiClient(b2AccountId, b2ApplicationKey);
1438
}
1539

1640
@Test
17-
public void testClient() {
18-
assertNull(null);
41+
public void testBuckets() throws B2ApiException {
42+
B2BucketResponse createBucket = b2ApiClient.createBucket(B2TestHelper.B2_BUCKET_PREFIX + UUID.randomUUID().toString(), BucketType.ALL_PRIVATE);
43+
b2ApiClient.deleteBucket(createBucket.getBucketId());
1944
}
2045

2146
}

‎src/test/java/synapticloop/b2/helper/B2TestHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@ public static B2FileResponse uploadTemporaryFileToBucket(String bucketId) throws
125125
} catch(IOException ioex) {
126126
throw new B2ApiException("Could not create temporary file", ioex);
127127
}
128-
return(new B2UploadFileRequest(getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, file).getResponse());
128+
return(new B2UploadFileRequest(getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, file.getName(), file).getResponse());
129129
}
130130
}

‎src/test/java/synapticloop/b2/request/B2UploadAndDeleteFileRequestTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import synapticloop.b2.helper.B2TestHelper;
1212
import synapticloop.b2.response.B2BucketResponse;
1313
import synapticloop.b2.response.B2DeleteFileVersionResponse;
14-
import synapticloop.b2.response.B2GetUploadUrlResponse;
1514
import synapticloop.b2.response.B2FileResponse;
15+
import synapticloop.b2.response.B2GetUploadUrlResponse;
1616

1717

1818
public class B2UploadAndDeleteFileRequestTest {
@@ -30,7 +30,7 @@ public void testFileUpload() throws Exception {
3030
fileWriter.write("hello world!");
3131
fileWriter.flush();
3232
fileWriter.close();
33-
B2FileResponse b2UploadFileResponse = new B2UploadFileRequest(B2TestHelper.getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, file).getResponse();
33+
B2FileResponse b2UploadFileResponse = new B2UploadFileRequest(B2TestHelper.getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, file.getName(), file).getResponse();
3434

3535
String fileName = b2UploadFileResponse.getFileName();
3636
String fileId = b2UploadFileResponse.getFileId();

0 commit comments

Comments
 (0)