Skip to content

Commit 02ef72d

Browse files
Merge pull request #28 from contentstack/development
Development
2 parents 7655050 + ae0a51e commit 02ef72d

23 files changed

+311
-277
lines changed

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
11

22
## CHANGELOG
33

4+
## Version 1.5.6
5+
###### Date: 27-Jan-2021
6+
Document updated
7+
8+
New Features:
9+
• None
10+
11+
## Version 1.5.5
12+
###### Date: 22-Jan-2021
13+
Bug fix: Error contains information like
14+
- Error message
15+
- Error code
16+
- Error Details
17+
18+
Language Enum:
19+
- GERMEN changed to GERMAN
20+
- Deprecated Language Enum
21+
- Deprecated LanguageCode Enum
22+
23+
New Features:
24+
• None
25+
426
------------------------------------------------
527

628
## Version 1.5.4

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ To use the Contentstack Java SDK to your existing project, perform the steps giv
2020
<dependency>
2121
<groupId>com.contentstack.sdk</groupId>
2222
<artifactId>java</artifactId>
23-
<version>1.5.4</version>
23+
<version>1.5.6</version>
2424
</dependency>
2525
```
2626

2727
2. **Gradle**
2828
```
29-
implementation 'com.contentstack.sdk:java:1.5.4'
29+
implementation 'com.contentstack.sdk:java:1.5.6'
3030
```
3131

3232
### Key Concepts for using Contentstack

pom.xml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.contentstack.sdk</groupId>
88
<artifactId>java</artifactId>
9-
<version>1.5.4</version>
9+
<version>1.5.6</version>
1010
<packaging>jar</packaging>
11-
1211
<name>contentstack-java</name>
1312
<description>Java SDK for Contentstack Content Delivery API, Contentstack is a headless CMS with an API-first approach
1413
</description>
@@ -118,10 +117,8 @@
118117
<!--
119118
# Run tests and generate .xml reports
120119
mvn test
121-
122120
# Convert .xml reports into .html report, but without the CSS or images
123121
mvn surefire-report:report-only
124-
125122
# Put the CSS and images where they need to be without the rest of the
126123
# time-consuming stuff
127124
mvn surefire-report:report site -DgenerateReports=false
@@ -172,7 +169,7 @@
172169
</goals>
173170
<configuration>
174171
<additionalOptions>-Xdoclint:none</additionalOptions>
175-
<!-- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>-->
172+
<!-- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>-->
176173
<use>false</use>
177174
<use>false</use>
178175
<source>1.8</source>
@@ -194,18 +191,18 @@
194191
<groupId>org.apache.maven.plugins</groupId>
195192
<artifactId>maven-site-plugin</artifactId>
196193
<version>3.3</version>
197-
<!-- <configuration>-->
198-
<!-- <reportPlugins>-->
199-
<!-- <plugin>-->
200-
<!-- <groupId>org.apache.maven.plugins</groupId>-->
201-
<!-- <artifactId>maven-javadoc-plugin</artifactId>-->
202-
<!-- <configuration>-->
203-
<!-- &lt;!&ndash;suppress UnresolvedMavenProperty &ndash;&gt;-->
204-
<!-- <additionalparam>${javadoc.opts}</additionalparam>-->
205-
<!-- </configuration>-->
206-
<!-- </plugin>-->
207-
<!-- </reportPlugins>-->
208-
<!-- </configuration>-->
194+
<!-- <configuration>-->
195+
<!-- <reportPlugins>-->
196+
<!-- <plugin>-->
197+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
198+
<!-- <artifactId>maven-javadoc-plugin</artifactId>-->
199+
<!-- <configuration>-->
200+
<!-- &lt;!&ndash;suppress UnresolvedMavenProperty &ndash;&gt;-->
201+
<!-- <additionalparam>${javadoc.opts}</additionalparam>-->
202+
<!-- </configuration>-->
203+
<!-- </plugin>-->
204+
<!-- </reportPlugins>-->
205+
<!-- </configuration>-->
209206
</plugin>
210207

211208
<!--
@@ -294,11 +291,12 @@
294291
<goals>
295292
<goal>report</goal>
296293
</goals>
294+
297295
</execution>
298296
</executions>
299297
</plugin>
300298

301299
</plugins>
302300
</build>
303301

304-
</project>
302+
</project>

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class Asset {
2323
public JSONObject urlQueries = new JSONObject();
2424
protected LinkedHashMap<String, Object> headerGroup_app;
2525
protected LinkedHashMap<String, Object> headerGroup_local;
26-
protected com.contentstack.sdk.Stack stackInstance;
26+
protected Stack stackInstance;
2727

2828
protected Asset(){
2929
this.headerGroup_local = new LinkedHashMap<>();
@@ -55,21 +55,20 @@ protected void setStackInstance(Stack stack) {
5555
* <br>1. Single Attachment :-<br>
5656
* <pre class="prettyprint linenums:1">
5757
* //'blt5d4sample2633b' is a dummy Application API key
58-
* Stack stack = Contentstack.stack("blt5d4sample2633b", "bltdtsample_accessToken767vv", config);
59-
* Asset assetObject = stack.asset("assetUid");<br>
58+
* Stack stack = Contentstack.stack("apiKey", "deliveryToken", "environment");
59+
* Asset assetObject = stack.asset("assetUid");
6060
* assetObject.configure(entryObject.getJSONObject(attached_image_field_uid));</pre>
6161
*
6262
* <br>2. Multiple Attachment :-<br>
6363
* <pre class="prettyprint linenums:1">
6464
* JSONArray array = entryObject.getJSONArray(Attach_Image_Field_Uid);
65-
* <br>{@code for (int i = 0; i < array.length(); i++)} {<br>
66-
* Asset assetObject = stack.asset("assetUid");<br>
67-
* assetObject.configure(entryObject.getJSONObject(attached_image_field_uid));<br>
68-
* }<br>
65+
* {@code for (int i = 0; i < array.length(); i++)} {
66+
* Asset assetObject = stack.asset("assetUid");
67+
* assetObject.configure(entryObject.getJSONObject(attached_image_field_uid));
68+
* }
6969
* </pre>
7070
* @return {@link Asset} instance.
7171
*/
72-
7372
public Asset configure(JSONObject jsonObject){
7473
AssetModel model = null;
7574
model = new AssetModel(jsonObject, true, false);
@@ -98,7 +97,6 @@ protected Asset setTags(String[] tags){
9897
* @param value header value against given header name.
9998
* <br><br><b>Example :</b><br>
10099
* <pre class="prettyprint">
101-
* //'blt5d4sample2633b' is a dummy Application API key
102100
* Asset assetObject = Contentstack.stack( "blt5d4sample2633b", "bltdtsample_accessToken767vv", config).asset("assetUid");
103101
* assetObject.setHeader("custom_header_key", "custom_header_value");
104102
* </pre>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ Assets refer to all the media files (images, videos, PDFs, audio files, and so o
1212
These files can be used in multiple entries.
1313
Read more about [Assets](https://www.contentstack.com/docs/guide/content-management#working-with-assets)
1414
*/
15-
1615
public class AssetLibrary implements INotifyClass{
1716

18-
private final static String TAG = "AssetLibrary";
1917
private com.contentstack.sdk.Stack stackInstance;
2018
private LinkedHashMap<String, Object> stackHeader;
2119
private LinkedHashMap<String, Object> localHeader;
@@ -28,7 +26,6 @@ public class AssetLibrary implements INotifyClass{
2826
* Sorting order enum for {@link AssetLibrary}.
2927
* @author Contentstack.com, Inc
3028
*/
31-
3229
public enum ORDERBY
3330
{
3431
ASCENDING,
@@ -61,7 +58,6 @@ protected void setStackInstance(Stack stack){
6158
* assetLibObject.setHeader("custom_header_key", "custom_header_value");
6259
* </pre>
6360
*/
64-
6561
public void setHeader(String key, String value) {
6662
if (!key.isEmpty() && !value.isEmpty()) {
6763
localHeader.put(key, value);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.json.JSONArray;
44
import org.json.JSONObject;
5-
65
import java.util.ArrayList;
76
import java.util.List;
87

@@ -14,7 +13,6 @@ public AssetsModel(JSONObject jsonObject, boolean isFromCache){
1413
JSONArray jsonArray = jsonObject != null && jsonObject.has("assets") ? jsonObject.optJSONArray("assets") : null;
1514
if(jsonArray != null){
1615
for (int i = 0; i < jsonArray.length(); i++) {
17-
1816
AssetModel model = new AssetModel(jsonArray.optJSONObject(i), true, false);
1917
objects.add(model);
2018
model = null;
Lines changed: 92 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,92 @@
1-
package com.contentstack.sdk;import com.contentstack.sdk.utility.CSAppConstants;import org.json.JSONObject;import java.util.HashMap;import java.util.LinkedHashMap;class CSBackgroundTask { public CSBackgroundTask(Query queryInstance, Stack stackInstance, String controller, String url, LinkedHashMap<String, Object> headers, LinkedHashMap<String, Object> urlQueries, JSONObject jsonMain, String requestInfo, CSAppConstants.RequestMethod method, ResultCallBack callback) { if (headers != null && headers.size() > 0) { String URL = stackInstance.URLSCHEMA + stackInstance.URL + url; CSConnectionRequest csConnectionRequest = new CSConnectionRequest(queryInstance); csConnectionRequest.setQueryInstance(queryInstance); csConnectionRequest.setURLQueries(urlQueries); csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback); } else { sendErrorForHeader(callback); } } public CSBackgroundTask(Entry entryInstance, Stack stackInstance, String controller, String url, LinkedHashMap<String, Object> headers, HashMap<String, Object> urlQueries, JSONObject jsonMain, String requestInfo, boolean isOffline, CSAppConstants.RequestMethod method, ResultCallBack callBack) { if (headers != null && headers.size() > 0) { String URL = stackInstance.URLSCHEMA + stackInstance.URL + url; CSConnectionRequest csConnectionRequest = new CSConnectionRequest(entryInstance); csConnectionRequest.setURLQueries(urlQueries); csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callBack); } else { sendErrorForHeader(callBack); } } public CSBackgroundTask(AssetLibrary assetLibrary, Stack stackInstance, String controller, String url, LinkedHashMap<String, Object> headers, HashMap<String, Object> urlQueries, JSONObject jsonMain, String requestInfo, boolean isOffline, CSAppConstants.RequestMethod method, ResultCallBack callback) { if (headers != null && headers.size() > 0) { String URL = stackInstance.URLSCHEMA + stackInstance.URL + url; CSConnectionRequest csConnectionRequest = new CSConnectionRequest(assetLibrary); csConnectionRequest.setURLQueries(urlQueries); csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback); } else { sendErrorForHeader(callback); } } public CSBackgroundTask(Asset asset, Stack stackInstance, String controller, String url, LinkedHashMap<String, Object> headers, HashMap<String, Object> urlQueries, JSONObject jsonMain, String requestInfo, boolean isOffline, CSAppConstants.RequestMethod method, ResultCallBack callback) { if (headers != null && headers.size() > 0) { String URL = stackInstance.URLSCHEMA + stackInstance.URL + url; CSConnectionRequest csConnectionRequest = new CSConnectionRequest(asset); csConnectionRequest.setURLQueries(urlQueries); csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback); } else { sendErrorForHeader(callback); } } public CSBackgroundTask(Stack stackInstance, String controller, String url, HashMap<String, Object> headers, HashMap<String, Object> urlParams, JSONObject jsonMain, String requestInfo, boolean b, CSAppConstants.RequestMethod method, ResultCallBack callback) { if (headers != null && headers.size() > 0) { String URL = stackInstance.URLSCHEMA + stackInstance.URL + url; CSConnectionRequest csConnectionRequest = new CSConnectionRequest(stackInstance); csConnectionRequest.setStackInstance(stackInstance); csConnectionRequest.setURLQueries(urlParams); csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback); } else { sendErrorForHeader(callback); } } public CSBackgroundTask(ContentType contentTypeInstance, Stack stackInstance, String controller, String url, HashMap<String, Object> headers, HashMap<String, Object> urlParams, JSONObject jsonMain, String requestInfo, boolean b, CSAppConstants.RequestMethod method, ResultCallBack callback) { if (headers != null && headers.size() > 0) { String URL = stackInstance.URLSCHEMA + stackInstance.URL + url; CSConnectionRequest csConnectionRequest = new CSConnectionRequest(contentTypeInstance); csConnectionRequest.setURLQueries(urlParams); csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback); } else { sendErrorForHeader(callback); } } private void sendErrorForHeader(ResultCallBack callbackObject) { Error error = new Error(); error.setErrorMessage(CSAppConstants.ErrorMessage_CalledDefaultMethod); if (callbackObject != null) { callbackObject.onRequestFail(ResponseType.UNKNOWN, error); } }}
1+
package com.contentstack.sdk;
2+
import com.contentstack.sdk.utility.CSAppConstants;
3+
import org.json.JSONObject;
4+
import java.util.HashMap;
5+
import java.util.LinkedHashMap;
6+
7+
8+
class CSBackgroundTask {
9+
10+
public CSBackgroundTask(Query queryInstance, Stack stackInstance, String controller, String url, LinkedHashMap<String, Object> headers, LinkedHashMap<String, Object> urlQueries, JSONObject jsonMain, String requestInfo, CSAppConstants.RequestMethod method, ResultCallBack callback) {
11+
if (headers != null && headers.size() > 0) {
12+
String URL = stackInstance.URLSCHEMA + stackInstance.URL + url;
13+
CSConnectionRequest csConnectionRequest = new CSConnectionRequest(queryInstance);
14+
csConnectionRequest.setQueryInstance(queryInstance);
15+
csConnectionRequest.setURLQueries(urlQueries);
16+
csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback);
17+
} else {
18+
sendErrorForHeader(callback);
19+
}
20+
}
21+
22+
23+
public CSBackgroundTask(Entry entryInstance, Stack stackInstance, String controller, String url, LinkedHashMap<String, Object> headers, HashMap<String, Object> urlQueries, JSONObject jsonMain, String requestInfo, boolean isOffline, CSAppConstants.RequestMethod method, ResultCallBack callBack) {
24+
if (headers != null && headers.size() > 0) {
25+
String URL = stackInstance.URLSCHEMA + stackInstance.URL + url;
26+
CSConnectionRequest csConnectionRequest = new CSConnectionRequest(entryInstance);
27+
csConnectionRequest.setURLQueries(urlQueries);
28+
csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callBack);
29+
} else {
30+
sendErrorForHeader(callBack);
31+
}
32+
}
33+
34+
35+
36+
public CSBackgroundTask(AssetLibrary assetLibrary, Stack stackInstance, String controller, String url, LinkedHashMap<String, Object> headers, HashMap<String, Object> urlQueries, JSONObject jsonMain, String requestInfo, boolean isOffline, CSAppConstants.RequestMethod method, ResultCallBack callback) {
37+
if (headers != null && headers.size() > 0) {
38+
String URL = stackInstance.URLSCHEMA + stackInstance.URL + url;
39+
CSConnectionRequest csConnectionRequest = new CSConnectionRequest(assetLibrary);
40+
csConnectionRequest.setURLQueries(urlQueries);
41+
csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback);
42+
} else {
43+
sendErrorForHeader(callback);
44+
}
45+
}
46+
47+
48+
public CSBackgroundTask(Asset asset, Stack stackInstance, String controller, String url, LinkedHashMap<String, Object> headers, HashMap<String, Object> urlQueries, JSONObject jsonMain, String requestInfo, boolean isOffline, CSAppConstants.RequestMethod method, ResultCallBack callback) {
49+
if (headers != null && headers.size() > 0) {
50+
String URL = stackInstance.URLSCHEMA + stackInstance.URL + url;
51+
CSConnectionRequest csConnectionRequest = new CSConnectionRequest(asset);
52+
csConnectionRequest.setURLQueries(urlQueries);
53+
csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback);
54+
} else {
55+
sendErrorForHeader(callback);
56+
}
57+
58+
}
59+
60+
61+
public CSBackgroundTask(Stack stackInstance, String controller, String url, HashMap<String, Object> headers, HashMap<String, Object> urlParams, JSONObject jsonMain, String requestInfo, boolean b, CSAppConstants.RequestMethod method, ResultCallBack callback) {
62+
if (headers != null && headers.size() > 0) {
63+
String URL = stackInstance.URLSCHEMA + stackInstance.URL + url;
64+
CSConnectionRequest csConnectionRequest = new CSConnectionRequest(stackInstance);
65+
csConnectionRequest.setStackInstance(stackInstance);
66+
csConnectionRequest.setURLQueries(urlParams);
67+
csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback);
68+
} else {
69+
sendErrorForHeader(callback);
70+
}
71+
}
72+
73+
74+
public CSBackgroundTask(ContentType contentTypeInstance, Stack stackInstance, String controller, String url, HashMap<String, Object> headers, HashMap<String, Object> urlParams, JSONObject jsonMain, String requestInfo, boolean b, CSAppConstants.RequestMethod method, ResultCallBack callback) {
75+
if (headers != null && headers.size() > 0) {
76+
String URL = stackInstance.URLSCHEMA + stackInstance.URL + url;
77+
CSConnectionRequest csConnectionRequest = new CSConnectionRequest(contentTypeInstance);
78+
csConnectionRequest.setURLQueries(urlParams);
79+
csConnectionRequest.setParams(URL, method, controller, jsonMain, headers, requestInfo, callback);
80+
} else {
81+
sendErrorForHeader(callback);
82+
}
83+
}
84+
85+
private void sendErrorForHeader(ResultCallBack callbackObject) {
86+
Error error = new Error();
87+
error.setErrorMessage(CSAppConstants.ErrorMessage_CalledDefaultMethod);
88+
if (callbackObject != null) {
89+
callbackObject.onRequestFail(ResponseType.UNKNOWN, error);
90+
}
91+
}
92+
}

0 commit comments

Comments
 (0)