Skip to content

Commit 829ebde

Browse files
author
Jevgeni Koltšin
committed
removed APIVersion
1 parent c290afc commit 829ebde

28 files changed

+131
-195
lines changed

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

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/java/com/creatubbles/api/request/amazon/UploadS3FileRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.creatubbles.api.request.amazon;
22

3-
import com.creatubbles.api.APIVersion;
43
import com.creatubbles.api.core.CreatubblesRequest;
54
import com.creatubbles.api.response.amazon.UploadS3FileResponse;
65
import com.creatubbles.api.util.HttpUtil;
@@ -11,7 +10,6 @@
1110
/**
1211
* Created by Jevgeni on 28.10.2015.
1312
*/
14-
@APIVersion(2)
1513
public class UploadS3FileRequest extends CreatubblesRequest<UploadS3FileResponse> {
1614

1715
private byte[] data;

src/main/java/com/creatubbles/api/request/auth/OAuthAccessTokenRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77

88
import org.glassfish.jersey.client.JerseyWebTarget;
99

10-
import com.creatubbles.api.APIVersion;
1110
import com.creatubbles.api.CreatubblesAPI;
1211
import com.creatubbles.api.core.CreatubblesRequest;
1312
import com.creatubbles.api.response.auth.OAuthAccessTokenResponse;
1413

1514
import static com.creatubbles.api.util.EndPoints.OAUTH_TOKEN;
1615

17-
@APIVersion(2)
1816
public class OAuthAccessTokenRequest extends CreatubblesRequest<OAuthAccessTokenResponse> {
1917

2018
private final String clientId, clientSecret;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.creatubbles.api.request.creation;
22

3-
import com.creatubbles.api.APIVersion;
43
import com.creatubbles.api.core.CreatubblesRequest;
54
import com.creatubbles.api.response.creation.CreateCreationResponse;
65
import com.creatubbles.api.util.EndPoints;
76
import com.creatubbles.api.util.HttpMethod;
87

9-
@APIVersion(2)
108
public class CreateCreationRequest extends CreatubblesRequest<CreateCreationResponse> {
119

1210
public CreateCreationRequest(String accessToken) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.creatubbles.api.request.creation;
22

3-
import com.creatubbles.api.APIVersion;
43
import com.creatubbles.api.core.CreatubblesRequest;
54
import com.creatubbles.api.response.creation.CreationsUploadsResponse;
65
import com.creatubbles.api.util.EndPoints;
76
import com.creatubbles.api.util.HttpMethod;
87
import com.creatubbles.api.util.HttpUtil;
98

10-
@APIVersion(2)
119
public class CreationsUploadsRequest extends CreatubblesRequest<CreationsUploadsResponse> {
1210

1311
private String extension;
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package com.creatubbles.api.request.creation;
2-
3-
import com.creatubbles.api.core.CreatubblesRequest;
4-
import com.creatubbles.api.response.creation.GetCreationResponse;
5-
import com.creatubbles.api.util.EndPoints;
6-
import com.creatubbles.api.util.HttpMethod;
7-
8-
9-
public class GetCreationRequest extends CreatubblesRequest<GetCreationResponse> {
10-
11-
public GetCreationRequest(String id, String accessToken) {
12-
super(EndPoints.CREATION.format(id), HttpMethod.GET, accessToken);
13-
}
14-
15-
@Override
16-
public Class<? extends GetCreationResponse> getResponseClass() {
17-
return GetCreationResponse.class;
18-
}
19-
}
1+
package com.creatubbles.api.request.creation;
2+
3+
import com.creatubbles.api.core.CreatubblesRequest;
4+
import com.creatubbles.api.response.creation.GetCreationResponse;
5+
import com.creatubbles.api.util.EndPoints;
6+
import com.creatubbles.api.util.HttpMethod;
7+
8+
9+
public class GetCreationRequest extends CreatubblesRequest<GetCreationResponse> {
10+
11+
public GetCreationRequest(String id, String accessToken) {
12+
super(EndPoints.CREATION.format(id), HttpMethod.GET, accessToken);
13+
}
14+
15+
@Override
16+
public Class<? extends GetCreationResponse> getResponseClass() {
17+
return GetCreationResponse.class;
18+
}
19+
}
Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
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.GetCreationsResponse;
6-
import com.creatubbles.api.util.EndPoints;
7-
import com.creatubbles.api.util.HttpMethod;
8-
9-
@APIVersion(2)
10-
public class GetCreationsRequest extends CreatubblesRequest<GetCreationsResponse> {
11-
12-
public enum Params {
13-
page,
14-
per_page,
15-
gallery_id,
16-
user_id,
17-
sort,
18-
search,
19-
20-
;
21-
}
22-
23-
public enum Sort {
24-
popular,
25-
recent,
26-
27-
;
28-
}
29-
30-
public GetCreationsRequest(String userId, String authToken) {
31-
this(userId, 1, authToken);
32-
}
33-
34-
public GetCreationsRequest(String userId, int page, String accessToken) {
35-
super(EndPoints.CREATIONS.getTemplate(), HttpMethod.GET, accessToken);
36-
setUrlParameter(Params.user_id.name(), userId);
37-
setUrlParameter(Params.page.name(), String.valueOf(page));
38-
}
39-
40-
@Override
41-
public Class<? extends GetCreationsResponse> getResponseClass() {
42-
return GetCreationsResponse.class;
43-
}
44-
}
1+
package com.creatubbles.api.request.creation;
2+
3+
import com.creatubbles.api.core.CreatubblesRequest;
4+
import com.creatubbles.api.response.creation.GetCreationsResponse;
5+
import com.creatubbles.api.util.EndPoints;
6+
import com.creatubbles.api.util.HttpMethod;
7+
8+
public class GetCreationsRequest extends CreatubblesRequest<GetCreationsResponse> {
9+
10+
public enum Params {
11+
page,
12+
per_page,
13+
gallery_id,
14+
user_id,
15+
sort,
16+
search,
17+
18+
;
19+
}
20+
21+
public enum Sort {
22+
popular,
23+
recent,
24+
25+
;
26+
}
27+
28+
public GetCreationsRequest(String userId, String authToken) {
29+
this(userId, 1, authToken);
30+
}
31+
32+
public GetCreationsRequest(String userId, int page, String accessToken) {
33+
super(EndPoints.CREATIONS.getTemplate(), HttpMethod.GET, accessToken);
34+
setUrlParameter(Params.user_id.name(), userId);
35+
setUrlParameter(Params.page.name(), String.valueOf(page));
36+
}
37+
38+
@Override
39+
public Class<? extends GetCreationsResponse> getResponseClass() {
40+
return GetCreationsResponse.class;
41+
}
42+
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.creatubbles.api.request.creation;
22

3-
import com.creatubbles.api.APIVersion;
43
import com.creatubbles.api.core.CreatubblesRequest;
54
import com.creatubbles.api.response.creation.PingCreationsUploadsResponse;
65
import com.creatubbles.api.util.HttpMethod;
76

87
/**
98
* Created by Jevgeni on 22.12.2015.
109
*/
11-
@APIVersion(2)
1210
public class PingCreationsUploadsRequest extends CreatubblesRequest<PingCreationsUploadsResponse> {
1311

1412
public PingCreationsUploadsRequest(String url, String accessToken) {

src/main/java/com/creatubbles/api/request/creator/GetCreatorsRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.creatubbles.api.request.creator;
22

3-
import com.creatubbles.api.APIVersion;
43
import com.creatubbles.api.core.CreatubblesRequest;
54
import com.creatubbles.api.response.creator.GetCreatorsResponse;
65
import com.creatubbles.api.util.EndPoints;
76
import com.creatubbles.api.util.HttpMethod;
87

9-
@APIVersion(2)
108
public class GetCreatorsRequest extends CreatubblesRequest<GetCreatorsResponse> {
119

1210
public GetCreatorsRequest(String userId, String token) {

src/main/java/com/creatubbles/api/request/gallery/CreateGalleryRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.creatubbles.api.request.gallery;
22

3-
import com.creatubbles.api.APIVersion;
43
import com.creatubbles.api.CreatubblesAPI;
54
import com.creatubbles.api.core.CreatubblesRequest;
65
import com.creatubbles.api.core.Gallery;
76
import com.creatubbles.api.response.gallery.CreateGalleryResponse;
87
import com.creatubbles.api.util.EndPoints;
98
import com.creatubbles.api.util.HttpMethod;
109

11-
@APIVersion(2)
1210
public class CreateGalleryRequest extends CreatubblesRequest<CreateGalleryResponse> {
1311

1412
public CreateGalleryRequest(Gallery gallery, String accessToken) {

0 commit comments

Comments
 (0)