Skip to content

Commit 8308fbd

Browse files
author
Jevgeni Koltšin
committed
api v2. ping uploads.
1 parent 8c77272 commit 8308fbd

File tree

7 files changed

+82
-4
lines changed

7 files changed

+82
-4
lines changed

src/main/java/com/creatubbles/api/CreatubblesAPI.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.creatubbles.api.request.creation.CreateCreationRequest;
77
import com.creatubbles.api.request.creation.CreationsUploadsRequest;
88
import com.creatubbles.api.request.creation.GetCreationsRequest;
9+
import com.creatubbles.api.request.creation.PingCreationsUploadsRequest;
910
import com.creatubbles.api.request.creator.GetCreatorsRequest;
1011
import com.creatubbles.api.request.user.UserProfileRequest;
1112
import com.creatubbles.api.response.auth.OAuthAccessTokenResponse;
@@ -46,7 +47,8 @@ public class CreatubblesAPI {
4647
public final static JerseyClient CLIENT = JerseyClientBuilder
4748
.createClient()
4849
.property(ClientProperties.CONNECT_TIMEOUT, 5000)
49-
.property(ClientProperties.READ_TIMEOUT, 5000);
50+
.property(ClientProperties.READ_TIMEOUT, 5000)
51+
.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, Boolean.TRUE);
5052

5153
public static String buildURL(final String endPoint) {
5254
String base = staging ? EndPoints.URL_BASE_STAGING : EndPoints.URL_BASE;
@@ -85,11 +87,15 @@ public static void main(String[] args) throws IOException {
8587
CreationsUploadsRequest creationsUploads = new CreationsUploadsRequest(createCreationResponse.creation.id, accessToken);
8688
CreationsUploadsResponse creationsUploadsResponse = creationsUploads.execute().getResponse();
8789
System.out.println(creationsUploadsResponse.url);
90+
System.out.println(creationsUploadsResponse.id);
8891

8992
File file = new File("C:/dev/1.png");
9093
byte[] data = Files.readAllBytes(file.toPath());
9194
UploadS3ImageRequest uploadS3Image = new UploadS3ImageRequest(data, creationsUploadsResponse.url);
9295
uploadS3Image.execute().getResponse();
96+
97+
PingCreationsUploadsRequest pingCreationsUploads = new PingCreationsUploadsRequest(creationsUploadsResponse.id, accessToken);
98+
pingCreationsUploads.execute().getResponse();
9399
System.out.println("-Finish-");
94100
}
95101

src/main/java/com/creatubbles/api/core/User.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,38 @@ public class User {
77
public int signed_up_as;
88
public String access_token;
99
public String password;
10+
11+
@Override
12+
public int hashCode() {
13+
final int prime = 31;
14+
int result = 1;
15+
result = prime * result + id.hashCode();
16+
result = prime * result + ((username == null) ? 0 : username.hashCode());
17+
return result;
18+
}
19+
20+
@Override
21+
public boolean equals(Object obj) {
22+
if (this == obj) {
23+
return true;
24+
}
25+
if (obj == null) {
26+
return false;
27+
}
28+
if (getClass() != obj.getClass()) {
29+
return false;
30+
}
31+
User other = (User) obj;
32+
if (id == null && other.id != null) {
33+
return false;
34+
} else if (!id.equals(other.id)) {
35+
return false;
36+
}
37+
if (username == null && other.username != null) {
38+
return false;
39+
} else if (!username.equals(other.username)) {
40+
return false;
41+
}
42+
return true;
43+
}
1044
}

src/main/java/com/creatubbles/api/request/creation/CreationsUploadsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class CreationsUploadsRequest extends CreatubblesRequest<CreationsUploadsResponse> {
1111

1212
public CreationsUploadsRequest(String creationId, String accessToken) {
13-
super(String.format(EndPoints.CREATIONS_UPLOAD, creationId), HttpMethod.POST, accessToken);
13+
super(String.format(EndPoints.CREATIONS_UPLOADS, creationId), HttpMethod.POST, accessToken);
1414
}
1515

1616
@Override
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.creatubbles.api.request.creation;
2+
3+
import com.creatubbles.api.APIVersion;
4+
import com.creatubbles.api.core.CreatubblesRequest;
5+
import com.creatubbles.api.response.creation.PingCreationsUploadsResponse;
6+
import com.creatubbles.api.util.EndPoints;
7+
import com.creatubbles.api.util.HttpMethod;
8+
9+
/**
10+
* Created by Jevgeni on 22.12.2015.
11+
*/
12+
@APIVersion(2)
13+
public class PingCreationsUploadsRequest extends CreatubblesRequest<PingCreationsUploadsResponse> {
14+
15+
public PingCreationsUploadsRequest(int uploadId, String accessToken) {
16+
super(String.format(EndPoints.PING_CREATIONS_UPLOADS, uploadId), HttpMethod.PUT, accessToken);
17+
}
18+
19+
@Override
20+
public Class<? extends PingCreationsUploadsResponse> getResponseClass() {
21+
return PingCreationsUploadsResponse.class;
22+
}
23+
}

src/main/java/com/creatubbles/api/response/creation/CreationsUploadsResponse.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
@APIVersion(2)
1010
public class CreationsUploadsResponse extends CreatubblesResponse implements JsonDeserializer<CreationsUploadsResponse> {
1111

12+
public int id;
1213
public String url;
1314

1415
@Override
@@ -24,8 +25,10 @@ private void deserializeData(JsonObject jsonObject) {
2425
JsonObject data = jsonObject.getAsJsonObject("data");
2526
if (data != null) {
2627
JsonObject attributes = data.getAsJsonObject("attributes");
27-
if (attributes != null) {
28+
JsonElement idE = data.get("id");
29+
if (idE != null && attributes != null) {
2830
url = attributes.get("url").getAsString();
31+
id = idE.getAsInt();
2932
}
3033
}
3134
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.creatubbles.api.response.creation;
2+
3+
import com.creatubbles.api.APIVersion;
4+
import com.creatubbles.api.core.CreatubblesResponse;
5+
6+
/**
7+
* Created by Jevgeni on 22.12.2015.
8+
*/
9+
@APIVersion(2)
10+
public class PingCreationsUploadsResponse extends CreatubblesResponse {
11+
}

src/main/java/com/creatubbles/api/util/EndPoints.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class EndPoints {
3434
public static final String USERS = "users";
3535
public static final String USERS_PROFILE = "users/%s";
3636
public static final String CREATIONS = "creations";
37-
public static final String CREATIONS_UPLOAD = "creations/%s/uploads";
37+
public static final String CREATIONS_UPLOADS = "creations/%s/uploads";
38+
public static final String PING_CREATIONS_UPLOADS = "uploads/%s";
3839

3940
}

0 commit comments

Comments
 (0)