Skip to content

Commit cbd2b4c

Browse files
KhushbooMerKhushbooMer
authored
Merge pull request #5 from KhushbooMer/resolved-comments
resolved few comments
2 parents 726f268 + e319786 commit cbd2b4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4306
-2358
lines changed

‎README.md‎

Lines changed: 370 additions & 198 deletions
Large diffs are not rendered by default.

‎build.gradle‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
plugins {
2+
id 'java'
3+
id 'application'
4+
}
5+
6+
group 'io.imagekit.sampleapp'
7+
version '1.0-SNAPSHOT'
8+
9+
sourceCompatibility = 1.8
10+
11+
repositories {
12+
mavenCentral()
13+
}
14+
15+
application {
16+
mainClassName 'io.imagekit.sampleapp.App'
17+
}
18+
19+
test {
20+
useJUnitPlatform()
21+
}
22+
23+
dependencies {
24+
compile fileTree(include: ['*.jar'], dir: 'libs')
25+
compile project(':imagekit-sdk')
26+
testCompile group: 'junit', name: 'junit', version: '4.12'
27+
}
28+

‎imagekit-sdk/build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ repositories {
1212
mavenCentral()
1313
}
1414

15+
test {
16+
useJUnitPlatform()
17+
}
18+
1519
dependencies {
1620
compile 'commons-codec:commons-codec:1.13'
1721
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
@@ -22,4 +26,7 @@ dependencies {
2226
testCompile group: 'junit', name: 'junit', version: '4.12'
2327
testCompile "org.mockito:mockito-all:2.+"
2428
testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
29+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.4.1.3'
30+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.4.1'
31+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.4.1.1'
2532
}

‎imagekit-sdk/src/main/java/io/imagekit/sdk/ImageKit.java‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.imagekit.sdk.tasks.Calculation;
1616
import io.imagekit.sdk.tasks.RestClient;
1717
import io.imagekit.sdk.tasks.UrlGen;
18+
import retrofit2.http.QueryMap;
1819

1920
import java.util.List;
2021
import java.util.Map;
@@ -100,18 +101,18 @@ public Result upload(FileCreateRequest fileCreateRequest) throws InternalServerE
100101
public Result updateFileDetail(FileUpdateRequest fileUpdateRequest)
101102
throws ForbiddenException, TooManyRequestsException, InternalServerException, UnauthorizedException,
102103
BadRequestException, UnknownException {
103-
return restClient.updateDetail(fileUpdateRequest);
104+
return restClient.updateFileDetail(fileUpdateRequest);
104105
}
105106

106107
/**
107108
*
108-
* @param options is an map it may contain keys [ "path", "fileType", "tags",
109+
* @param getFileListRequest is an map it may contain keys [ "path", "fileType", "tags",
109110
* "includeFolder", "name", "limit", "skip"]
110111
* @return ResultList class that contains list of BaseFile
111112
*/
112-
public ResultList getFileList(Map<String, String> options) throws ForbiddenException, TooManyRequestsException,
113-
InternalServerException, UnauthorizedException, BadRequestException, UnknownException {
114-
return restClient.getFileList(options);
113+
public ResultList getFileList(GetFileListRequest getFileListRequest) throws ForbiddenException, TooManyRequestsException,
114+
InternalServerException, UnauthorizedException, BadRequestException, UnknownException, IllegalAccessException, InstantiationException {
115+
return restClient.getFileList(getFileListRequest);
115116
}
116117

117118
/**
@@ -347,6 +348,17 @@ public ResultRenameFile renameFile(RenameFileRequest renameFileRequest) throws C
347348
return restClient.renameFile(renameFileRequest);
348349
}
349350

351+
/**
352+
*
353+
* @param fileId & versionId
354+
* @return a Result class
355+
*/
356+
public Result restoreFileVersion(String fileId, String versionId)
357+
throws NotFoundException, BadRequestException, InternalServerException, UnknownException,
358+
ForbiddenException, TooManyRequestsException, UnauthorizedException {
359+
return restClient.restoreFileVersion(fileId, versionId);
360+
}
361+
350362
/**
351363
*
352364
* @param createFolderRequest which contains folderPath that is full path to the
@@ -372,7 +384,7 @@ public ResultNoContent deleteFolder(DeleteFolderRequest deleteFolderRequest)
372384
/**
373385
*
374386
* @param copyFolderRequest that contains sourceFolderPath, destinationPath,
375-
* includeVersions
387+
* includeFileVersions
376388
* @return Result class
377389
*/
378390
public ResultOfFolderActions copyFolder(CopyFolderRequest copyFolderRequest)

‎imagekit-sdk/src/main/java/io/imagekit/sdk/constants/Transformer.java‎

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,67 +5,68 @@
55

66
public class Transformer {
77

8-
private Map<String,String> trans=new HashMap<>();
9-
private static Transformer transformer;
8+
private Map<String, String> trans = new HashMap<>();
9+
private static Transformer transformer;
1010

11-
public static synchronized Transformer getInstance(){
12-
if (null!= transformer){
13-
return transformer;
14-
}
15-
transformer =new Transformer();
11+
public static synchronized Transformer getInstance() {
12+
if (null != transformer) {
13+
return transformer;
14+
}
15+
transformer = new Transformer();
1616

17-
transformer.trans.put("height" , "h");
18-
transformer.trans.put("width" , "w");
19-
transformer.trans.put("aspectRatio" , "ar");
20-
transformer.trans.put("quality" , "q");
21-
transformer.trans.put("crop" , "c");
22-
transformer.trans.put("cropMode" , "cm");
23-
transformer.trans.put("x" , "x");
24-
transformer.trans.put("y" , "y");
25-
transformer.trans.put("focus" , "fo");
26-
transformer.trans.put("format" , "f");
27-
transformer.trans.put("radius" , "r");
28-
transformer.trans.put("background" , "bg");
29-
transformer.trans.put("border" , "bo");
30-
transformer.trans.put("rotation" , "rt");
31-
transformer.trans.put("blur" , "bl");
32-
transformer.trans.put("named" , "n");
33-
transformer.trans.put("overlayImage" , "oi");
34-
transformer.trans.put("overlayX" , "ox");
35-
transformer.trans.put("overlayY" , "oy");
36-
transformer.trans.put("overlayFocus" , "ofo");
37-
transformer.trans.put("overlayHeight" , "oh");
38-
transformer.trans.put("overlayWidth" , "ow");
39-
transformer.trans.put("overlayText" , "ot");
40-
transformer.trans.put("overlayTextFontSize" , "ots");
41-
transformer.trans.put("overlayTextFontFamily" , "otf");
42-
transformer.trans.put("overlayTextColor" , "otc");
43-
transformer.trans.put("overlayAlpha" , "oa");
44-
transformer.trans.put("overlayTextTypography" , "ott");
45-
transformer.trans.put("overlayBackground" , "obg");
46-
transformer.trans.put("overlayImageTrim" , "oit");
47-
transformer.trans.put("progressive" , "pr");
48-
transformer.trans.put("lossless" , "lo");
49-
transformer.trans.put("trim" , "t");
50-
transformer.trans.put("metadata" , "md");
51-
transformer.trans.put("colorProfile" , "cp");
52-
transformer.trans.put("defaultImage" , "di");
53-
transformer.trans.put("dpr" , "dpr");
54-
transformer.trans.put("effectSharpen" , "e-sharpen");
55-
transformer.trans.put("effectUSM" , "e-usm");
56-
transformer.trans.put("effectContrast" , "e-contrast");
57-
transformer.trans.put("effectGray" , "e-grayscale");
58-
transformer.trans.put("original" , "orig");
17+
transformer.trans.put("height", "h");
18+
transformer.trans.put("width", "w");
19+
transformer.trans.put("aspectRatio", "ar");
20+
transformer.trans.put("quality", "q");
21+
transformer.trans.put("crop", "c");
22+
transformer.trans.put("cropMode", "cm");
23+
transformer.trans.put("x", "x");
24+
transformer.trans.put("y", "y");
25+
transformer.trans.put("focus", "fo");
26+
transformer.trans.put("format", "f");
27+
transformer.trans.put("radius", "r");
28+
transformer.trans.put("background", "bg");
29+
transformer.trans.put("border", "bo");
30+
transformer.trans.put("rotation", "rt");
31+
transformer.trans.put("blur", "bl");
32+
transformer.trans.put("named", "n");
33+
transformer.trans.put("overlayImage", "oi");
34+
transformer.trans.put("overlayX", "ox");
35+
transformer.trans.put("overlayY", "oy");
36+
transformer.trans.put("overlayFocus", "ofo");
37+
transformer.trans.put("overlayHeight", "oh");
38+
transformer.trans.put("overlayWidth", "ow");
39+
transformer.trans.put("overlayText", "ot");
40+
transformer.trans.put("overlayTextFontSize", "ots");
41+
transformer.trans.put("overlayTextFontFamily", "otf");
42+
transformer.trans.put("overlayTextColor", "otc");
43+
transformer.trans.put("overlayAlpha", "oa");
44+
transformer.trans.put("overlayTextTypography", "ott");
45+
transformer.trans.put("overlayBackground", "obg");
46+
transformer.trans.put("overlayImageTrim", "oit");
47+
transformer.trans.put("progressive", "pr");
48+
transformer.trans.put("lossless", "lo");
49+
transformer.trans.put("trim", "t");
50+
transformer.trans.put("metadata", "md");
51+
transformer.trans.put("colorProfile", "cp");
52+
transformer.trans.put("defaultImage", "di");
53+
transformer.trans.put("dpr", "dpr");
54+
transformer.trans.put("effectSharpen", "e-sharpen");
55+
transformer.trans.put("effectUSM", "e-usm");
56+
transformer.trans.put("effectContrast", "e-contrast");
57+
transformer.trans.put("effectGray", "e-grayscale");
58+
transformer.trans.put("original", "orig");
59+
transformer.trans.put("raw", "raw");
5960

60-
return transformer;
61-
}
61+
return transformer;
62+
}
6263

63-
private Transformer(){
64+
private Transformer() {
6465

65-
}
66+
}
6667

67-
public String transform(String key){
68-
return this.trans.get(key)!=null?this.trans.get(key):key;
69-
}
68+
public String transform(String key) {
69+
return this.trans.get(key) != null ? this.trans.get(key) : key;
70+
}
7071

7172
}

‎imagekit-sdk/src/main/java/io/imagekit/sdk/exceptions/BadRequestException.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,16 @@ public class BadRequestException extends Exception {
88
private String help;
99
private ResponseMetaData responseMetaData;
1010

11+
public ResponseMetaData getResponseMetaData() {
12+
return responseMetaData;
13+
}
14+
15+
public void setResponseMetaData(ResponseMetaData responseMetaData) {
16+
this.responseMetaData = responseMetaData;
17+
}
18+
1119
public BadRequestException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace,
12-
String message1, String help, ResponseMetaData responseMetaData) {
20+
String message1, String help, ResponseMetaData responseMetaData) {
1321
super(message, cause, enableSuppression, writableStackTrace);
1422
this.message = message1;
1523
this.help = help;

‎imagekit-sdk/src/main/java/io/imagekit/sdk/exceptions/ForbiddenException.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ public ForbiddenException(String message, Throwable cause, boolean enableSuppres
1616
this.responseMetaData = responseMetaData;
1717
}
1818

19+
public ResponseMetaData getResponseMetaData() {
20+
return responseMetaData;
21+
}
22+
23+
public void setResponseMetaData(ResponseMetaData responseMetaData) {
24+
this.responseMetaData = responseMetaData;
25+
}
26+
1927
@Override
2028
public String toString() {
2129
return "ForbiddenException{" + "message='" + message + '\'' + ", help='" + help + '\'' + ", responseMetaData="

‎imagekit-sdk/src/main/java/io/imagekit/sdk/exceptions/InternalServerException.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ public InternalServerException(String message, Throwable cause, boolean enableSu
1616
this.responseMetaData = responseMetaData;
1717
}
1818

19+
public ResponseMetaData getResponseMetaData() {
20+
return responseMetaData;
21+
}
22+
23+
public void setResponseMetaData(ResponseMetaData responseMetaData) {
24+
this.responseMetaData = responseMetaData;
25+
}
26+
1927
@Override
2028
public String toString() {
2129
return "InternalServerException{" + "message='" + message + '\'' + ", help='" + help + '\''

‎imagekit-sdk/src/main/java/io/imagekit/sdk/exceptions/NotFoundException.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ public NotFoundException(String message, Throwable cause, boolean enableSuppress
1616
this.responseMetaData = responseMetaData;
1717
}
1818

19+
public ResponseMetaData getResponseMetaData() {
20+
return responseMetaData;
21+
}
22+
23+
public void setResponseMetaData(ResponseMetaData responseMetaData) {
24+
this.responseMetaData = responseMetaData;
25+
}
26+
1927
@Override
2028
public String toString() {
2129
return "NotFoundException{" + "message='" + message + '\'' + ", help='" + help + '\'' + ", responseMetaData="

‎imagekit-sdk/src/main/java/io/imagekit/sdk/exceptions/PartialSuccessException.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ public PartialSuccessException(String message, Throwable cause, boolean enableSu
1616
this.responseMetaData = responseMetaData;
1717
}
1818

19+
public ResponseMetaData getResponseMetaData() {
20+
return responseMetaData;
21+
}
22+
23+
public void setResponseMetaData(ResponseMetaData responseMetaData) {
24+
this.responseMetaData = responseMetaData;
25+
}
26+
1927
@Override
2028
public String toString() {
2129
return "PartialSuccessException{" + "message='" + message + '\'' + ", help='" + help + '\''

0 commit comments

Comments
 (0)