Skip to content

Commit bfaede5

Browse files
committed
added few changes
1 parent 6542f40 commit bfaede5

File tree

4 files changed

+51
-12
lines changed

4 files changed

+51
-12
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,8 +882,10 @@ System.out.println(result.getResponseMetaData().getMap());
882882

883883
**24. Create CustomMetaDataFields**
884884

885-
It creates the CustomMetaDataFields with many available types with param name `type` as per the
885+
It creates the CustomMetaDataFields as per the
886886
[API documentation here](https://docs.imagekit.io/api-reference/custom-metadata-fields-api/create-custom-metadata-field).
887+
888+
Check for the [Allowed Values In The Schema](https://docs.imagekit.io/api-reference/custom-metadata-fields-api/create-custom-metadata-field#allowed-values-in-the-schema-object).
887889
The argument to the `createCustomMetaDataFields()` method is the object of `CustomMetaDataFieldCreateRequest` class.
888890

889891
#### Examples:

imagekit-sdk/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ dependencies {
2626
testCompile group: 'junit', name: 'junit', version: '4.12'
2727
testCompile "org.mockito:mockito-all:2.+"
2828
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'
2932
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ public Result updateFileDetail(FileUpdateRequest fileUpdateRequest)
110110
* "includeFolder", "name", "limit", "skip"]
111111
* @return ResultList class that contains list of BaseFile
112112
*/
113-
public ResultList getFileList(@QueryMap GetFileListRequest getFileListRequest) throws ForbiddenException, TooManyRequestsException,
114-
InternalServerException, UnauthorizedException, BadRequestException, UnknownException, IllegalAccessException {
115-
return restClient.getFileList(getFileListRequest);
113+
public ResultList getFileList(Map<String, String> options) throws ForbiddenException, TooManyRequestsException,
114+
InternalServerException, UnauthorizedException, BadRequestException, UnknownException, IllegalAccessException, InstantiationException {
115+
return restClient.getFileList(options);
116116
}
117117

118118
/**

imagekit-sdk/src/main/java/io/imagekit/sdk/tasks/RestClient.java

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.imagekit.sdk.tasks;
22

3+
import com.fasterxml.jackson.databind.JavaType;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.google.gson.Gson;
46
import com.google.gson.JsonElement;
57
import com.google.gson.JsonParser;
@@ -37,6 +39,9 @@
3739
import okhttp3.*;
3840

3941
import java.io.IOException;
42+
import java.lang.reflect.Field;
43+
import java.util.Arrays;
44+
import java.util.HashMap;
4045
import java.util.List;
4146
import java.util.Locale;
4247
import java.util.Map;
@@ -114,29 +119,58 @@ public Result updateFileDetail(FileUpdateRequest fileUpdateRequest)
114119
return result;
115120
}
116121

117-
public ResultList getFileList(GetFileListRequest getFileListRequest) throws ForbiddenException, TooManyRequestsException,
118-
InternalServerException, UnauthorizedException, BadRequestException, UnknownException {
122+
public ResultList getFileList(Map<String, String> options) throws ForbiddenException, TooManyRequestsException,
123+
InternalServerException, UnauthorizedException, BadRequestException, UnknownException, InstantiationException, IllegalAccessException {
119124
ResultList resultList = new ResultList();
120125
Map<String, String> headers = Utils.getHeaders(imageKit);
121126

122-
// ObjectMap objectMapper = new ObjectMapper();
123-
// ModelMapp
124127
QueryMaker queryMaker = new QueryMaker();
125-
// for (Map.Entry<String, String> entry : ) {
126-
// queryMaker.put(String.format("%s=%s", entry.getKey(), entry.getValue()));
128+
// Map<String, String> options = new HashMap<>();
129+
// if (getFileListRequest.getType() != null) {
130+
// options.put("type", getFileListRequest.getType());
131+
// }
132+
// if (getFileListRequest.getSort() != null) {
133+
// options.put("sort", getFileListRequest.getSort());
134+
// }
135+
// if (getFileListRequest.getPath() != null) {
136+
// options.put("path", getFileListRequest.getPath());
137+
// }
138+
// if (getFileListRequest.getSearchQuery() != null) {
139+
// options.put("searchQuery", getFileListRequest.getSearchQuery());
140+
// }
141+
// if (getFileListRequest.getFileType() != null) {
142+
// options.put("fileType", getFileListRequest.getFileType());
143+
// }
144+
// if (getFileListRequest.getLimit() != null) {
145+
// options.put("limit", getFileListRequest.getLimit());
127146
// }
147+
// if (getFileListRequest.getSkip() != null) {
148+
// options.put("skip", getFileListRequest.getSkip());
149+
// }
150+
// if (getFileListRequest.getTags() != null) {
151+
// options.put("tags", Arrays.toString(getFileListRequest.getTags()));
152+
// }
153+
System.out.println("options:==> " + options);
154+
for (Map.Entry<String, String> entry : options.entrySet()) {
155+
queryMaker.put(String.format("%s=%s", entry.getKey(), entry.getValue()));
156+
}
157+
158+
System.out.println("queryMake:--> " + queryMaker.get());
128159

129160
String url = String.format(Locale.US, API_BASE_URL.concat("v1/files?%s"), queryMaker.get());
130161

162+
System.out.println("url:--> " + url);
131163
request = new Request.Builder().url(url).get().headers(Headers.of(headers)).build();
132164

133165
try {
134166
Response response = client.newCall(request).execute();
135167
String respBody = "";
136168
if (response.code() == 200) {
137169
respBody = response.body().string();
138-
List<BaseFile> files = new Gson().fromJson(respBody, new TypeToken<List<BaseFile>>() {
139-
}.getType());
170+
// System.out.println("respBody:==> " + respBody);
171+
List<BaseFile> files = new Gson().fromJson(respBody,
172+
new TypeToken<List<BaseFile>>() {
173+
}.getType());
140174
resultList.setResults(files);
141175
resultList.setRaw(respBody);
142176
} else {

0 commit comments

Comments
 (0)