Skip to content

Commit a4a5cd1

Browse files
ishaileshmishraishaileshmishra
authored
Merge pull request #14 from contentstack/development
Development
2 parents a8574d6 + 5ef5347 commit a4a5cd1

20 files changed

+128
-113
lines changed

‎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.0</version>
23+
<version>1.5.1</version>
2424
</dependency>
2525
```
2626

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

3232
### Key Concepts for using Contentstack

‎pom.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Written manually.
2-
version=1.5.0
2+
version=1.5.1
33
groupId=com.contentstack.sdk
44
artifactId=java

‎pom.xml‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
65

6+
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.contentstack.sdk</groupId>
88
<artifactId>java</artifactId>
9-
<version>1.5.0-SNAPSHOT</version>
9+
<version>1.5.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>contentstack-java</name>
@@ -75,6 +75,8 @@
7575

7676
<properties>
7777
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
78+
<maven.compiler.source>1.8</maven.compiler.source>
79+
<maven.compiler.target>1.8</maven.compiler.target>
7880
</properties>
7981

8082

@@ -83,20 +85,33 @@
8385
<dependency>
8486
<groupId>junit</groupId>
8587
<artifactId>junit</artifactId>
86-
<version>4.12</version>
88+
<version>4.13</version>
8789
<scope>test</scope>
8890
</dependency>
8991

92+
<!-- <dependency>-->
93+
<!-- <groupId>org.json</groupId>-->
94+
<!-- <artifactId>json</artifactId>-->
95+
<!-- <version>20090211</version>-->
96+
<!-- </dependency>-->
97+
98+
<!-- https://mvnrepository.com/artifact/org.json/json -->
9099
<dependency>
91100
<groupId>org.json</groupId>
92101
<artifactId>json</artifactId>
93-
<version>20090211</version>
102+
<version>20190722</version>
103+
</dependency>
104+
105+
<dependency>
106+
<groupId>org.apache.logging.log4j</groupId>
107+
<artifactId>log4j-api</artifactId>
108+
<version>2.5</version>
94109
</dependency>
95110

96111
<dependency>
97-
<groupId>log4j</groupId>
98-
<artifactId>log4j</artifactId>
99-
<version>1.2.17</version>
112+
<groupId>org.apache.logging.log4j</groupId>
113+
<artifactId>log4j-core</artifactId>
114+
<version>2.5</version>
100115
</dependency>
101116

102117
</dependencies>
@@ -178,8 +193,8 @@
178193
<artifactId>maven-compiler-plugin</artifactId>
179194
<version>3.8.0</version>
180195
<configuration>
181-
<source>8</source>
182-
<target>8</target>
196+
<source>1.8</source>
197+
<target>1.8</target>
183198
</configuration>
184199
</plugin>
185200

‎src/log4j.properties‎

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

‎src/main/java/com/contentstack/sdk/CSConnectionRequest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.contentstack.sdk;
22

33
import com.contentstack.sdk.utility.CSAppConstants;
4-
import com.contentstack.sdk.utility.CSAppUtils;
54
import com.contentstack.sdk.utility.CSController;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
67
import org.json.JSONObject;
7-
88
import java.util.*;
99

1010
/**
@@ -36,7 +36,7 @@
3636

3737
class CSConnectionRequest implements IRequestModelHTTP{
3838

39-
private static final String TAG = "CSConnectionRequest";
39+
private final Logger logger = LogManager.getLogger(CSConnectionRequest.class.getName());
4040
private String urlToCall;
4141
private CSAppConstants.RequestMethod method;
4242
private String controller;
@@ -175,7 +175,7 @@ public void onRequestFailed(JSONObject error, int statusCode, ResultCallBack cal
175175
}
176176

177177
} catch (Exception e) {
178-
Stack.log(TAG, "------------------catch 210 urlReq---|" + e);
178+
logger.debug("------------------catch 210 urlReq---|" + e);
179179
errorMessage = e.getLocalizedMessage();
180180
}
181181
if(errorMessage == null || (! (errorMessage.length() > 0))){

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
package com.contentstack.sdk;
22

33
import com.contentstack.sdk.utility.CSAppConstants;
4+
import org.apache.logging.log4j.LogManager;
5+
import org.apache.logging.log4j.Logger;
46
import org.json.JSONArray;
57
import org.json.JSONException;
68
import org.json.JSONObject;
7-
import java.io.*;
8-
import java.net.*;
9-
import java.util.*;
9+
import java.io.BufferedReader;
10+
import java.io.IOException;
11+
import java.io.InputStreamReader;
12+
import java.net.HttpURLConnection;
13+
import java.net.URL;
14+
import java.net.URLEncoder;
15+
import java.util.HashMap;
16+
import java.util.Iterator;
17+
import java.util.LinkedHashMap;
18+
import java.util.Map;
1019

1120
/**
1221
* @Author Contentstack
@@ -36,7 +45,7 @@
3645

3746
public class CSHttpConnection implements IURLRequestHTTP{
3847

39-
private static final String TAG = "CSHttpConnection";
48+
private final Logger logger = LogManager.getLogger(CSHttpConnection.class.getName());
4049
private String urlPath;
4150
private String controller;
4251
private LinkedHashMap<String, Object> headers;
@@ -293,7 +302,7 @@ private void sendGET(String GET_URL) throws IOException, JSONException {
293302
responseJSON = new JSONObject(response.toString());
294303
connectionRequest.onRequestFinished(CSHttpConnection.this);
295304
} else {
296-
Stack.log("CSHttpConnection", "GET request not worked");
305+
logger.debug("GET request not worked");
297306
generateBuiltError(con);
298307
}
299308

‎src/main/java/com/contentstack/sdk/ContentType.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.contentstack.sdk;
2-
32
import com.contentstack.sdk.utility.CSAppConstants;
43
import com.contentstack.sdk.utility.CSController;
5-
import org.apache.log4j.Logger;
4+
import org.apache.logging.log4j.LogManager;
5+
import org.apache.logging.log4j.Logger;
66
import org.json.JSONObject;
77
import java.util.HashMap;
88
import java.util.Iterator;
@@ -40,7 +40,7 @@ public class ContentType {
4040
protected Stack stackInstance = null;
4141
private LinkedHashMap<String, Object> localHeader = null;
4242
private LinkedHashMap<String, Object> stackHeader = null;
43-
private final String TAG = ContentType.class.getSimpleName();
43+
private final Logger logger = LogManager.getLogger(ContentType.class.getName());
4444

4545
private ContentType(){}
4646

@@ -287,7 +287,7 @@ private HashMap<String, Object> getUrlParams(JSONObject urlQueriesJSON) {
287287
Object value = urlQueriesJSON.opt(key);
288288
hashMap.put(key, value);
289289
} catch (Exception e) {
290-
Stack.log(TAG,"setQueryJson"+e.toString());
290+
logger.debug(e.getLocalizedMessage());
291291
}
292292
}
293293

‎src/main/java/com/contentstack/sdk/Contentstack.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.contentstack.sdk;
2-
32
import com.contentstack.sdk.utility.CSAppConstants;
4-
import org.apache.log4j.BasicConfigurator;
53

64
/**
75
* MIT License
@@ -62,7 +60,7 @@ public static Stack stack( String stackApiKey, String accessToken, String enviro
6260
if(!environment.isEmpty()) {
6361
Config config = new Config();
6462
config.setEnvironment(environment);
65-
BasicConfigurator.configure();
63+
//Configurator.initialize(new DefaultConfiguration());
6664
return initializeStack( stackApiKey, accessToken, config);
6765
}else{
6866
throw new Exception(CSAppConstants.ErrorMessage_Stack_Environment_IsNull);
@@ -114,7 +112,7 @@ public static Stack stack(String stackApiKey, String accessToken, String environ
114112
config = new Config();
115113
config.setEnvironment(environment);
116114
}
117-
BasicConfigurator.configure();
115+
//Configurator.initialize(new DefaultConfiguration());
118116
return initializeStack(stackApiKey, accessToken, config);
119117
}else{
120118
throw new Exception(CSAppConstants.ErrorMessage_Stack_Environment_IsNull);

‎src/main/java/com/contentstack/sdk/EntriesModel.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.contentstack.sdk;
2-
3-
4-
import com.contentstack.sdk.utility.CSAppUtils;
2+
import org.apache.logging.log4j.LogManager;
3+
import org.apache.logging.log4j.Logger;
54
import org.json.JSONArray;
65
import org.json.JSONObject;
7-
86
import java.util.ArrayList;
97
import java.util.List;
108

@@ -40,6 +38,7 @@ class EntriesModel {
4038
protected JSONObject jsonObject;
4139
protected String formName;
4240
protected List<Object> objectList;
41+
private Logger logger = LogManager.getLogger(EntriesModel.class.getName());
4342
protected EntriesModel(JSONObject responseJSON, String formName, boolean isFromCache) {
4443

4544
try {
@@ -63,7 +62,7 @@ protected EntriesModel(JSONObject responseJSON, String formName, boolean isFromC
6362
}
6463
}
6564
}catch (Exception localException){
66-
Stack.log("EntriesModel", localException.getLocalizedMessage());
65+
logger.debug(localException.getLocalizedMessage());
6766
}
6867

6968
}

0 commit comments

Comments
 (0)