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

Commit 6997e77

Browse files
SynapticloopSynapticloop
Synapticloop
authored and
Synapticloop
committed
updated code with new apis
1 parent 85dfece commit 6997e77

20 files changed

+87
-276
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
import synapticloop.b2.request.B2ListBucketsRequest;
4343
import synapticloop.b2.request.B2ListFileNamesRequest;
4444
import synapticloop.b2.request.B2ListFileVersionsRequest;
45+
import synapticloop.b2.request.B2RequestProperties;
4546
import synapticloop.b2.request.B2UpdateBucketRequest;
4647
import synapticloop.b2.request.B2UploadFileRequest;
47-
import synapticloop.b2.request.BaseB2Request;
4848
import synapticloop.b2.response.B2AuthorizeAccountResponse;
4949
import synapticloop.b2.response.B2BucketResponse;
5050
import synapticloop.b2.response.B2DeleteFileVersionResponse;
@@ -177,7 +177,7 @@ public B2BucketResponse deleteBucket(String bucketId) throws B2ApiException {
177177
*/
178178
public B2BucketResponse deleteBucketFully(String bucketId) throws B2ApiException {
179179
B2ListFilesResponse b2ListFilesResponse = new B2ListFileVersionsRequest(client, b2AuthorizeAccountResponse, bucketId,
180-
BaseB2Request.MAX_FILE_COUNT_RETURN).getResponse();
180+
B2RequestProperties.MAX_FILE_COUNT_RETURN).getResponse();
181181
String nextFileName = b2ListFilesResponse.getNextFileName();
182182
String nextFileId = b2ListFilesResponse.getNextFileId();
183183
while(true) {
@@ -191,7 +191,7 @@ public B2BucketResponse deleteBucketFully(String bucketId) throws B2ApiException
191191
break;
192192
} else {
193193
b2ListFilesResponse = new B2ListFileVersionsRequest(client, b2AuthorizeAccountResponse, bucketId,
194-
BaseB2Request.MAX_FILE_COUNT_RETURN, nextFileName, nextFileId).getResponse();
194+
B2RequestProperties.MAX_FILE_COUNT_RETURN, nextFileName, nextFileId).getResponse();
195195
nextFileName = b2ListFilesResponse.getNextFileName();
196196
nextFileId = b2ListFilesResponse.getNextFileId();
197197
}

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package synapticloop.b2.request;
22

3-
import org.slf4j.Logger;
4-
import org.slf4j.LoggerFactory;
3+
import java.io.IOException;
4+
5+
import org.apache.http.impl.client.CloseableHttpClient;
6+
import org.apache.http.util.EntityUtils;
57

68
import synapticloop.b2.exception.B2ApiException;
79
import synapticloop.b2.response.B2AuthorizeAccountResponse;
@@ -24,17 +26,19 @@
2426
*/
2527

2628
public class B2CancelLargeFileRequest extends BaseB2Request {
27-
private static final Logger LOGGER = LoggerFactory.getLogger(B2CancelLargeFileRequest.class);
2829
private static final String B2_CANCEL_LARGE_FILE = BASE_API + "b2_cancel_large_file";
2930

30-
protected B2CancelLargeFileRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String fileId) {
31-
super(b2AuthorizeAccountResponse);
32-
url = b2AuthorizeAccountResponse.getApiUrl() + B2_CANCEL_LARGE_FILE;
31+
protected B2CancelLargeFileRequest(CloseableHttpClient client, B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String fileId) {
32+
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_CANCEL_LARGE_FILE);
3333

34-
requestBodyStringData.put(KEY_FILE_ID, fileId);
34+
requestBodyData.put(B2RequestProperties.KEY_FILE_ID, fileId);
3535
}
3636

3737
public B2FileResponse getResponse() throws B2ApiException {
38-
return(new B2FileResponse(executePost(LOGGER)));
38+
try {
39+
return(new B2FileResponse(EntityUtils.toString(executePost().getEntity())));
40+
} catch(IOException e) {
41+
throw new B2ApiException(e);
42+
}
3943
}
4044
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,9 @@ public B2CreateBucketRequest(CloseableHttpClient client, B2AuthorizeAccountRespo
6161

6262
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_CREATE_BUCKET);
6363

64-
<<<<<<< HEAD
65-
requestBodyStringData.put(KEY_ACCOUNT_ID, b2AuthorizeAccountResponse.getAccountId());
66-
requestBodyStringData.put(KEY_BUCKET_NAME, bucketName);
67-
requestBodyStringData.put(KEY_BUCKET_TYPE, bucketType.toString());
68-
=======
6964
requestBodyData.put(B2RequestProperties.KEY_ACCOUNT_ID, b2AuthorizeAccountResponse.getAccountId());
7065
requestBodyData.put(B2RequestProperties.KEY_BUCKET_NAME, bucketName);
7166
requestBodyData.put(B2RequestProperties.KEY_BUCKET_TYPE, bucketType.toString());
72-
>>>>>>> master
7367
}
7468

7569
/**

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,8 @@ public B2DeleteBucketRequest(CloseableHttpClient client, B2AuthorizeAccountRespo
5050

5151
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_DELETE_BUCKET);
5252

53-
<<<<<<< HEAD
54-
requestBodyStringData.put(KEY_ACCOUNT_ID, b2AuthorizeAccountResponse.getAccountId());
55-
requestBodyStringData.put(KEY_BUCKET_ID, bucketId);
56-
=======
5753
requestBodyData.put(B2RequestProperties.KEY_ACCOUNT_ID, b2AuthorizeAccountResponse.getAccountId());
5854
requestBodyData.put(B2RequestProperties.KEY_BUCKET_ID, bucketId);
59-
>>>>>>> master
6055
}
6156

6257
/**

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,8 @@ public B2DeleteFileVersionRequest(CloseableHttpClient client, B2AuthorizeAccount
5858

5959
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_DELETE_FILE_VERSION);
6060

61-
<<<<<<< HEAD
62-
requestBodyStringData.put(KEY_FILE_NAME, fileName);
63-
requestBodyStringData.put(KEY_FILE_ID, fileId);
64-
=======
6561
requestBodyData.put(B2RequestProperties.KEY_FILE_NAME, Helper.urlEncodeFileName(fileName));
6662
requestBodyData.put(B2RequestProperties.KEY_FILE_ID, fileId);
67-
>>>>>>> master
6863
}
6964

7065
/**

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ public class B2GetFileInfoRequest extends BaseB2Request {
4848
public B2GetFileInfoRequest(CloseableHttpClient client, B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String fileId) {
4949
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_GET_FILE_INFO);
5050

51-
<<<<<<< HEAD
52-
requestBodyStringData.put(KEY_FILE_ID, fileId);
53-
=======
5451
requestBodyData.put(B2RequestProperties.KEY_FILE_ID, fileId);
55-
>>>>>>> master
5652
}
5753

5854
/**

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,11 @@ public class B2GetUploadUrlRequest extends BaseB2Request {
4545
public B2GetUploadUrlRequest(CloseableHttpClient client, B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String bucketId) {
4646
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_GET_UPLOAD_URL);
4747

48-
<<<<<<< HEAD
49-
requestBodyStringData.put(KEY_BUCKET_ID, bucketId);
50-
}
51-
52-
public B2GetUploadUrlRequest(B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String bucketId, Map<String, String> fileInfo) {
53-
super(b2AuthorizeAccountResponse);
54-
url = b2AuthorizeAccountResponse.getApiUrl() + B2_GET_UPLOAD_URL;
55-
56-
requestBodyStringData.put(KEY_BUCKET_ID, bucketId);
57-
=======
5848
requestBodyData.put(B2RequestProperties.KEY_BUCKET_ID, bucketId);
5949
}
6050

6151
public B2GetUploadUrlRequest(CloseableHttpClient client, B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String bucketId, Map<String, String> fileInfo) {
6252
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_GET_UPLOAD_URL);
63-
>>>>>>> master
6453

6554
requestBodyData.put(B2RequestProperties.KEY_BUCKET_ID, bucketId);
6655
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@ public class B2HideFileRequest extends BaseB2Request {
4242
public B2HideFileRequest(CloseableHttpClient client, B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String bucketId, String fileName) {
4343
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_HIDE_FILE);
4444

45-
<<<<<<< HEAD
46-
requestBodyStringData.put(KEY_BUCKET_ID, bucketId);
47-
requestBodyStringData.put(KEY_FILE_NAME, fileName);
48-
=======
4945
requestBodyData.put(B2RequestProperties.KEY_BUCKET_ID, bucketId);
5046
requestBodyData.put(B2RequestProperties.KEY_FILE_NAME, Helper.urlEncode(fileName));
51-
>>>>>>> master
5247
}
5348

5449
/**

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ public class B2ListBucketsRequest extends BaseB2Request {
4141
public B2ListBucketsRequest(CloseableHttpClient client, B2AuthorizeAccountResponse b2AuthorizeAccountResponse) {
4242
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_LIST_BUCKETS);
4343

44-
<<<<<<< HEAD
45-
requestBodyStringData.put(KEY_ACCOUNT_ID, b2AuthorizeAccountResponse.getAccountId());
46-
=======
4744
requestBodyData.put(B2RequestProperties.KEY_ACCOUNT_ID, b2AuthorizeAccountResponse.getAccountId());
48-
>>>>>>> master
4945
}
5046

5147
/**

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,36 +45,21 @@ public class B2ListFileNamesRequest extends BaseB2Request {
4545

4646
private static final int DEFAULT_MAX_FILE_COUNT = 100;
4747

48-
<<<<<<< HEAD
49-
requestBodyStringData.put(KEY_BUCKET_ID, bucketId);
50-
requestBodyIntegerData.put(KEY_MAX_FILE_COUNT, maxFileCount);
51-
=======
5248
public B2ListFileNamesRequest(CloseableHttpClient client, B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String bucketId) throws B2ApiException {
5349
this(client, b2AuthorizeAccountResponse, bucketId, null, DEFAULT_MAX_FILE_COUNT);
54-
>>>>>>> master
5550
}
5651

5752
public B2ListFileNamesRequest(CloseableHttpClient client, B2AuthorizeAccountResponse b2AuthorizeAccountResponse, String bucketId, String startFileName, Integer maxFileCount) throws B2ApiException {
5853
super(client, b2AuthorizeAccountResponse, b2AuthorizeAccountResponse.getApiUrl() + B2_LIST_FILE_NAMES);
5954

6055
requestBodyData.put(B2RequestProperties.KEY_BUCKET_ID, bucketId);
6156

62-
<<<<<<< HEAD
63-
requestBodyStringData.put(KEY_BUCKET_ID, bucketId);
64-
if(null != startFileName) {
65-
requestBodyStringData.put(KEY_START_FILE_NAME, startFileName);
66-
}
67-
68-
if(null != maxFileCount) {
69-
requestBodyIntegerData.put(KEY_MAX_FILE_COUNT, maxFileCount);
70-
=======
7157
if(null != startFileName) {
7258
requestBodyData.put(B2RequestProperties.KEY_START_FILE_NAME, Helper.urlEncode(startFileName));
7359
}
7460

7561
if(maxFileCount > MAX_FILE_COUNT_RETURN) {
7662
throw new B2ApiException("Maximum return file count is " + MAX_FILE_COUNT_RETURN);
77-
>>>>>>> master
7863
}
7964

8065
requestBodyData.put(B2RequestProperties.KEY_MAX_FILE_COUNT, maxFileCount);

0 commit comments

Comments
 (0)