Skip to content

Next: Utils Update #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2023
Merged

Next: Utils Update #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06b1ccd
cs-39681-Utils and dependencies update
ishaileshmishra Jun 19, 2023
007719e
Merge pull request #82 from contentstack/fix/CS-39681/utils-enhancement
ishaileshmishra Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.contentstack.sdk</groupId>
<artifactId>java</artifactId>
<version>1.12.0-SNAPSHOT</version>
<version>1.12.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>contentstack-java</name>
<description>Java SDK for Contentstack Content Delivery API</description>
Expand All @@ -19,13 +19,13 @@
<surefire-report-plugin.version>2.22.0</surefire-report-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
<dotenv-source.version>2.3.2</dotenv-source.version>
<dotenv-source.version>3.0.0</dotenv-source.version>
<rxjava-source.version>3.1.6</rxjava-source.version>
<retrofit-source.version>2.9.0</retrofit-source.version>
<converter-gson-source.version>2.9.0</converter-gson-source.version>
<loggin.version>4.10.0</loggin.version>
<loggin.version>4.11.0</loggin.version>
<jococo-plugin.version>0.8.5</jococo-plugin.version>
<lombok-source.version>1.18.26</lombok-source.version>
<lombok-source.version>1.18.28</lombok-source.version>
<junit-jupiter.version>5.9.2</junit-jupiter.version>
<junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
<gson.version>2.8.8</gson.version>
Expand All @@ -37,7 +37,7 @@
<json-version>20230227</json-version>
<jacoco-maven-plugin-version>0.8.7</jacoco-maven-plugin-version>
<maven-release-plugin-version>2.5.3</maven-release-plugin-version>
<contentstack-utils-version>1.2.0</contentstack-utils-version>
<contentstack-utils-version>1.2.2</contentstack-utils-version>
</properties>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/contentstack/sdk/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public Proxy getProxy() {
* @param keepAliveDuration
* the keepAliveDuration default value is 5
* @param timeUnit
* the timeUnit default value is TimeUnit.MINUTES
* the timeUnit default value is TimeUnit. MINUTES
* @return ConnectionPool
*/
public ConnectionPool connectionPool(int maxIdleConnections, long keepAliveDuration, TimeUnit timeUnit) {
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/contentstack/sdk/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
public class Constants {

private static final Logger logger = Logger.getLogger(Constants.class.getSimpleName());
protected static final String SDK_VERSION = "1.11.0";
protected static final String SDK_VERSION = "1.12.1";
protected static final String ENVIRONMENT = "environment";
protected static final String CONTENT_TYPE_UID = "content_type_uid";
protected static final String ENTRY_UID = "entry_uid";
Expand Down Expand Up @@ -71,9 +71,9 @@ public enum REQUEST_CONTROLLER {

/**
* @param dateString
* the date in string format
* the date in string format
* @param zoneId
* the string zoneId
* the string zoneId
* @return Calendar
*/
public static Calendar parseDateToTimeZone(@NotNull String dateString, @NotNull String zoneId) {
Expand All @@ -99,10 +99,9 @@ private static Calendar toCalendar(@NotNull String date) {

/**
* @param date
* The date in string format like (String dateString =
* "2016-12-16T12:36:33.961Z";)
* The date in string format like (String dateString = "2016-12-16T12:36:33.961Z";)
* @param timeZone
* the time zone as string
* the time zone as string
* @return calendar @{@link Calendar}
*/
public static Calendar parseDate(@NotNull String date, TimeZone timeZone) {
Expand Down
Loading