Skip to content

Commit f94b2b7

Browse files
Merge pull request #36 from contentstack/security
- branching and live preview support added - Security update and General code improvements - log4j removed from the dependency
2 parents 6cad546 + 1feb22c commit f94b2b7

File tree

5 files changed

+300
-134
lines changed

5 files changed

+300
-134
lines changed

.gitignore

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@
33
# src/test/java/com/contentstack/test/SyncTestCase.java
44
# Language Support for Java(TM) by Red Hat extension for Visual Studio Code - https://marketplace.visualstudio.com/items?itemName=redhat.java
55

6+
src/main/java/com/contentstack/sdk/models
67
.idea
78
.project
89
.classpath
910
factoryConfiguration.json
10-
11+
.vscode
1112
### Eclipse ###
1213
.metadata
1314
.env
1415
.env/
1516
bin/
1617
tmp/
1718
*.tmp
19+
.vscode
1820
*.bak
1921
*.swp
2022
*~.nib
@@ -89,7 +91,7 @@ local.properties
8991

9092
# Generated files
9193
.idea/**/contentModel.xml
92-
94+
cover
9395
# Sensitive or high-churn files
9496
.idea/**/dataSources/
9597
.idea/**/dataSources.ids
@@ -264,3 +266,6 @@ gradle-app.setting
264266
java.iml
265267
src/main/resources/
266268
/.idea/
269+
/src/main/java/com/contentstack/sdk/models/
270+
/.vscode/
271+
/.vscode/

.talismanrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
threshold: medium
1+
threshold: medium

AUTHORS.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Authors
2-
- [Contentstack](https://www.contentstack.com/)
3-
- [Shailesh-Mishra]([email protected])
2+
- [ishaileshmishra]([email protected])
3+
- [shaileshmishra]([email protected])
4+

CHANGELOG.md

+130-77
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,66 @@
11
# CHANGELOG
22

3+
## Version 2.0.0
4+
5+
### Date: 01-Nov-2021
6+
7+
- Added support for live preview
8+
- Added support for branching
9+
- Removed old version of jsoup dependency
10+
- Code improved as per sonar vulnerability guidelines
11+
- Removed deprecated code/Non-working code marked deprecated
12+
- Few breaking changes added.
13+
314
## Version 1.7.0
4-
###### Date: 12-JUL-2021
15+
16+
### Date: 12-JUL-2021
17+
518
- Added support for utils function gql.jsonToHtml()
619
- Bug #32 issue resolved removed e.printStackTrace()
720
- Instead stacktrace used logger.error()
821

922
------------------------------------------------
1023

1124
## Version 1.6.0
12-
###### Date: 05-APR-2021
25+
26+
### Date: 05-APR-2021
27+
1328
- **Query** : query.includeEmbeddedItems() method support added
1429
- **Entry** : entry.includeEmbeddedItems() method support added
1530

1631
------------------------------------------------
1732

1833
## Version 1.5.7
19-
###### Date: 20-Feb-2021
34+
35+
### Date: 20-Feb-2021
36+
2037
Document updated
2138

2239
------------------------------------------------
2340

2441
## Version 1.5.6
25-
###### Date: 27-Jan-2021
26-
Document updated
42+
43+
### Date: 27-Jan-2021
44+
45+
Document updated
2746

2847
New Features:
2948
• None
3049

3150
------------------------------------------------
3251

3352
## Version 1.5.5
34-
###### Date: 22-Jan-2021
35-
Bug fix: Error contains information like
53+
54+
### Date: 22-Jan-2021
55+
56+
Bug fix: Error contains information like
57+
3658
- Error message
3759
- Error code
3860
- Error Details
3961

4062
Language Enum:
63+
4164
- GERMEN changed to GERMAN
4265
- Deprecated Language Enum
4366
- Deprecated LanguageCode Enum
@@ -48,7 +71,9 @@ New Features:
4871
------------------------------------------------
4972

5073
## Version 1.5.4
51-
###### Date: 08-DEC-2020
74+
75+
### Date: 08-DEC-2020
76+
5277
Publish content fallback
5378
New Features:
5479
[Entry] - Publish fallback method added
@@ -59,132 +84,160 @@ New Features:
5984
------------------------------------------------
6085

6186
## Version 1.5.3
62-
###### Date: 28-July-2020
63-
- **Build Issue** Build update issue fixed
87+
88+
### Date: 28-July-2020
89+
90+
- **Build Issue** Build update issue fixed
6491

6592
------------------------------------------------
6693

6794
## Version 1.5.2
68-
###### Date: 23-July-2020
69-
- **Bump Issue** : Bump Issue: log4j-core from 2.5 to 2.13.2
70-
- **Query** : Query.locale() documentation
71-
- **CSHttpConnection** : StandardCharsets.UTF_8 Support Added
7295

96+
### Date: 23-July-2020
97+
98+
- **Bump Issue** : Bump Issue: log4j-core from 2.5 to 2.13.2
99+
- **Query** : Query.locale() documentation
100+
- **CSHttpConnection** : StandardCharsets.UTF_8 Support Added
73101

74102
------------------------------------------------
75103

76104
## Version 1.5.1
77-
###### Date: 13-Jan-2020
78-
- **Dependency Vulnerability** Java Github reported vulnerable issue on dependency logj
79-
105+
106+
### Date: 13-Jan-2020
107+
108+
- **Dependency Vulnerability** Java Github reported vulnerable issue on dependency logj
109+
80110
------------------------------------------------
81111

82112
## Version 1.5.0
83-
###### Date: 15-Nov-2019
84-
- **Stack**: Added support for function getContentType()
85-
- **ContentType**: updated function fetch()
86-
- **Query**: Updated support of whereIn(String KEY, Query queryObject)
87-
- **Query**: Updated support of whereNotIn(String KEY, Query queryObject)
113+
114+
### Date: 15-Nov-2019
115+
116+
- **Stack**: Added support for function getContentType()
117+
- **ContentType**: updated function fetch()
118+
- **Query**: Updated support of whereIn(String KEY, Query queryObject)
119+
- **Query**: Updated support of whereNotIn(String KEY, Query queryObject)
88120

89121
------------------------------------------------
90122

91123
## Version 1.4.2
92-
###### Date: 03-Sept-2019
93-
- **Config** - Added support for Region in Config.
124+
125+
### Date: 03-Sept-2019
126+
127+
- **Config** - Added support for Region in Config.
94128

95129
------------------------------------------------
96130

97131
## Version 1.4.1
98-
###### Date: 21-August-2019
99-
- **Query** - Added support for whereIn(String key) and whereNotIn(String key) methods
100-
- **CSAppConstants** - Removed google internet connection check from CSAppConstants
101-
102-
------------------------------------------------
103132

133+
### Date: 21-August-2019
134+
135+
- **Query** - Added support for whereIn(String key) and whereNotIn(String key) methods
136+
- **CSAppConstants** - Removed google internet connection check from CSAppConstants
104137

105-
## Version 1.4.0
106-
###### Date: 26-July-2019
107-
- **Entry** - Added support for includeReferenceContentTypeUid support in Entry.
108-
- **Query** - Added support for includeReferenceContentTypeUid support in Query.
109-
- **Entry** - setLanguage and getLanguage Deprecated in Entry.
110-
- **Query** - language deprecated in Query
111-
- **Entry** - Added method for getLocale and setLocale(String locale) in Entry
112-
- **Query** - Added method for locale in Query.
113-
- **Query** - Removed deprecated method for includeSchema in Query
114-
115138
------------------------------------------------
116139

140+
## Version 1.4.0
141+
142+
### Date: 26-July-2019
143+
144+
- **Entry** - Added support for includeReferenceContentTypeUid support in Entry.
145+
- **Query** - Added support for includeReferenceContentTypeUid support in Query.
146+
- **Entry** - setLanguage and getLanguage Deprecated in Entry.
147+
- **Query** - language deprecated in Query
148+
- **Entry** - Added method for getLocale and setLocale(String locale) in Entry
149+
- **Query** - Added method for locale in Query.
150+
- **Query** - Removed deprecated method for includeSchema in Query
151+
152+
------------------------------------------------
117153

118154
## Version 1.3.3
119-
###### Date: 21-June-2019
120-
- **HOTFIX**: Override response hot-fix
155+
156+
### Date: 21-June-2019
157+
158+
- **HOTFIX**: Override response hot-fix
121159

122160
------------------------------------------------
123161

124162
## Version 1.3.2
125-
### Date: 13-May-2019
126-
- **Code Improvement** Removed println
127-
- **Code Improvement** Added support for Logger
163+
164+
### Date: 13-May-2019
165+
166+
- **Code Improvement** Removed println
167+
- **Code Improvement** Added support for Logger
128168

129169
------------------------------------------------
130170

131171
## Version 1.3.1
132-
###### Date: May-02-2019
133-
- **Change**: include reference bug fixed
134-
- **Added testcase** report for v1.3.1
135172

173+
### Date: May-02-2019
136174

137-
------------------------------------------------
175+
- **Change**: include reference bug fixed
176+
- **Added testcase** report for v1.3.1
138177

178+
------------------------------------------------
139179

140180
## Version 1.3.0
141-
###### Date: Apr-12-2019
142-
Change: Added support of below methods in SDK
181+
182+
### Date: Apr-12-2019
183+
184+
Change: Added support of below methods in SDK
143185

144-
```
145-
getContentTypes() in Stack class
146-
fetch in ContentType class
147-
```
186+
```
187+
getContentTypes() in Stack class
188+
fetch in ContentType class
189+
```
148190

149-
Below two support from the Config class has been removed permanently
191+
Below two support from the Config class has been removed permanently
192+
150193
- public void setSSL(boolean isSSL)setSSL()
151194
- public boolean isSSL()
152195

153196
------------------------------------------------
154197

155-
## Version 1.2.1
156-
###### Date: 14-Mar-2019
157-
- Note: Bug Fixes and code clean up:
158-
159-
--------------------------------
198+
## Version 1.2.1
199+
200+
### Date: 14-Mar-2019
201+
202+
- Note: Bug Fixes and code clean up:
160203

161-
Date: 20-Feb-2019
204+
Date: 20-Feb-2019
162205
Maven integration
163206
Folder structure modified.
164207

165208
------------------------------------------------
166-
## Version 1.2.0
167-
###### Date: 15-Dec-2017
209+
210+
## Version 1.2.0
211+
212+
### Date: 15-Dec-2017
213+
168214
- New Features:
169-
```
170-
Entry- added method ‘addParam’
171-
Query- added method 'addParam'
172-
Asset- added method 'addParam'
173-
```
215+
216+
```
217+
Entry- added method ‘addParam’
218+
Query- added method 'addParam'
219+
Asset- added method 'addParam'
220+
```
221+
174222
------------------------------------------------
175223

176-
## Version 1.1.0
177-
###### Date: 10-Nov-2017
224+
## Version 1.1.0
225+
226+
### Date: 10-Nov-2017
227+
178228
- New Features:
179229

180-
```
181-
Stack- added method 'ImageTransform'
182-
Query- added method 'includeContentType'
183-
QueryResult- added method 'contentType'
184-
```
230+
```
231+
Stack- added method 'ImageTransform'
232+
Query- added method 'includeContentType'
233+
QueryResult- added method 'contentType'
234+
```
235+
185236
------------------------------------------------
186237

187-
#### API deprecation:
238+
### API deprecation
239+
188240
- Query
189241
- Deprecated method 'includeSchema'
190-
------------------------------------------------
242+
243+
------------------------------------------------

0 commit comments

Comments
 (0)