Skip to content

Commit 4c3626f

Browse files
Plugins implemented
1 parent 61b24aa commit 4c3626f

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

src/main/java/com/contentstack/sdk/Asset.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ public Asset configure(JSONObject jsonObject) {
8787
* <b>Example :</b><br>
8888
*
8989
* <pre class="prettyprint">
90-
* Stack stack = Contentstack.stack("apiKey", "deliveryToken", "environment");
91-
* Asset asset = stack.asset(asset_uid);
92-
* asset.setHeader();
93-
* </pre>
90+
* Stack stack = Contentstack.stack("apiKey", "deliveryToken", "environment");
91+
* Asset asset = stack.asset(asset_uid);
92+
* asset.setHeader();
93+
* </pre>
9494
*/
9595
public void setHeader(@NotNull String headerKey, @NotNull String headerValue) {
9696
headers.put(headerKey, headerValue);
@@ -108,10 +108,10 @@ public void setHeader(@NotNull String headerKey, @NotNull String headerValue) {
108108
* <b>Example :</b><br>
109109
*
110110
* <pre class="prettyprint">
111-
* Stack stack = Contentstack.stack("apiKey", "deliveryToken", "environment");
112-
* Asset asset = stack.asset(asset_uid);
113-
* asset.removeHeader();
114-
* </pre>
111+
* Stack stack = Contentstack.stack("apiKey", "deliveryToken", "environment");
112+
* Asset asset = stack.asset(asset_uid);
113+
* asset.removeHeader();
114+
* </pre>
115115
*/
116116
public void removeHeader(@NotNull String headerKey) {
117117
headers.remove(headerKey);

src/main/java/com/contentstack/sdk/CSHttpConnection.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,20 +191,21 @@ private void getService(String requestUrl) throws IOException {
191191
this.headers.put(CONTENT_TYPE, APPLICATION_JSON);
192192

193193
Request request = null;
194-
if (this.config.plugins!=null){
194+
if (this.config.plugins != null) {
195195
request = pluginRequestImp(requestUrl);
196-
//this.headers = request.headers();
197-
//requestUrl = request.url();
196+
this.headers.clear();
197+
Request finalRequest = request;
198+
request.headers().names().forEach(key -> {
199+
this.headers.put(key, finalRequest.headers().get(key));
200+
});
201+
requestUrl = request.url().toString();
198202
}
199203

200-
//Call call = client.newCall(request);
201204
Response<ResponseBody> response = this.service.getRequest(requestUrl, this.headers).execute();
202205
if (response.isSuccessful()) {
203206
assert response.body() != null;
204-
205-
// TODO: On Response result
206-
if (request!=null){
207-
response = pluginResponseImp( request, response);
207+
if (request != null) {
208+
response = pluginResponseImp(request, response);
208209
}
209210
responseJSON = new JSONObject(response.body().string());
210211
if (this.config.livePreviewEntry != null && !this.config.livePreviewEntry.isEmpty()) {
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.contentstack.sdk;
22

33
import okhttp3.Request;
4+
import okhttp3.ResponseBody;
45
import retrofit2.Response;
56

67
public interface ContentstackPlugin {
78

89
void onRequest(Stack stack, Request request);
910

10-
Response onResponse(Stack stack, Request request, Response response);
11+
Response<ResponseBody> onResponse(Stack stack, Request request, Response response);
1112
}

src/test/java/com/contentstack/sdk/TestContentstackPlugin.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,19 @@ void testContentstackPlugin() {
6565
plugins.add(plugin1);
6666
plugins.add(plugin2);
6767

68-
6968
// Create a config instance:
7069
Config config = new Config();
7170
config.setPlugins(plugins);
7271

7372
Stack stack = Contentstack.stack(API_KEY, DELIVERY_TOKEN, ENV, config);
7473
ContentType contentType = stack.contentType("fakeCT");
75-
Entry entry = contentType.entry();
74+
Entry entry = contentType.entry("something_demo");
75+
entry.fetch(new EntryResultCallBack() {
76+
@Override
77+
public void onCompletion(ResponseType responseType, Error error) {
78+
79+
}
80+
});
7681

7782
} catch (IllegalAccessException e) {
7883
throw new RuntimeException(e);

0 commit comments

Comments
 (0)