Skip to content
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.

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

Support of initial sync and sequential sync #49

Draft
wants to merge 59 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
b0f50c7
v3.14.0: function support added
ishaileshmishra Feb 6, 2024
7b2e22f
v3.14.0: function support added
ishaileshmishra Feb 6, 2024
4d23131
v3.14.0: function support added
ishaileshmishra Feb 8, 2024
e46da3c
v3.14.0: function support added
ishaileshmishra Feb 8, 2024
71b2353
Merge pull request #47 from contentstack/CS-43851/sequential-sync
ishaileshmishra Feb 8, 2024
0cba851
Create publish-snapshot.yaml
aravindbuilt Feb 12, 2024
24eb284
Rename publish-snapshot.yaml to publish-snapshot.yml
aravindbuilt Feb 12, 2024
e25fcb0
Create publish-release.yml
aravindbuilt Feb 12, 2024
ee8dc6c
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
c04127a
Update publish-release.yml
aravindbuilt Feb 12, 2024
4d5254b
Merge branch 'master' into next
ishaileshmishra Feb 12, 2024
47d01e2
v3.14.0: function support added
ishaileshmishra Feb 12, 2024
56ecd5c
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
c10bb6f
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
6e5530c
Update sca-scan.yml
aravindbuilt Feb 12, 2024
96f6a74
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
8e1f473
v3.14.0: function support added
ishaileshmishra Feb 12, 2024
70f9d3d
v3.14.0: function support added
ishaileshmishra Feb 12, 2024
564686d
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
a8f0fe2
v3.14.0: function support added
ishaileshmishra Feb 12, 2024
1be9e8d
v3.14.0: function support added
ishaileshmishra Feb 12, 2024
8091fec
v3.14.0: function support added
ishaileshmishra Feb 12, 2024
0cc422b
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
cf38fb8
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
4a42eb3
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
271e381
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
fe682b9
Update publish-snapshot.yml
aravindbuilt Feb 12, 2024
b98ac49
v3.14.0: function support added
ishaileshmishra Feb 12, 2024
fb94d45
v3.14.0: function support added
ishaileshmishra Feb 12, 2024
6712723
Update sca-scan.yml
aravindbuilt Feb 13, 2024
b3ed1a9
Update publish-snapshot.yml
aravindbuilt Feb 13, 2024
304e187
v3.14.0: function support added
ishaileshmishra Feb 13, 2024
30ef03b
v3.14.0: function support added
ishaileshmishra Feb 13, 2024
ae9e920
Update codeql-analysis.yml
aravindbuilt Feb 13, 2024
1403b62
Update publish-release.yml
aravindbuilt Feb 13, 2024
ac31b48
v3.14.0: function support added
ishaileshmishra Feb 13, 2024
c14902a
v3.14.0: function support added
ishaileshmishra Feb 13, 2024
6b17ad9
v3.14.0: function support added
ishaileshmishra Feb 14, 2024
97ca436
feat: gcp support implementation
harshithad0703 May 6, 2024
4182f03
updated path for keystore
harshithad0703 May 6, 2024
3a3ac7c
chore: version bump to 3.14.0
harshithad0703 May 7, 2024
1ad2e77
changeLog updated
harshithad0703 May 7, 2024
42df38b
Merge branch 'master' into feat/DX-67-gcp-support
harshithad0703 May 7, 2024
6f0d6d8
feat: specified host name in stack.java
harshithad0703 May 7, 2024
7a09dd5
Merge pull request #51 from contentstack/feat/DX-67-gcp-support
harshithad0703 May 7, 2024
410d646
Merge branch 'master' of https://github.com/contentstack/contentstack…
reeshika-h May 27, 2024
67b5017
Merge branch 'master' into fix/dx-672
abhinav-from-contentstack Jun 6, 2024
8dd0839
Merge pull request #57 from contentstack/fix/dx-672
abhinav-from-contentstack Jun 7, 2024
1801089
Merge branch 'next' of https://github.com/contentstack/contentstack-a…
reeshika-h Jun 11, 2024
61cdc00
Merge pull request #59 from contentstack/master
reeshika-h Jul 16, 2024
5409f5a
Merge branch 'next' of https://github.com/contentstack/contentstack-a…
reeshika-h Jul 16, 2024
b59acb2
fix : publish-snapshot workflow has been added
reeshika-h Jul 16, 2024
c9a9a70
chore: publish SDK step changed
reeshika-h Jul 18, 2024
0cbb999
chore: snapshot testing
reeshika-h Jul 23, 2024
f0086bd
Merge pull request #60 from contentstack/fix/DX-653-publish-snapshot
reeshika-h Jul 23, 2024
4a61378
Revert "Fix/dx 653 publish snapshot"
reeshika-h Jul 23, 2024
f0c990d
Merge pull request #61 from contentstack/revert-60-fix/DX-653-publish…
reeshika-h Jul 23, 2024
58a18e9
Merge pull request #64 from contentstack/master
cs-raj Jul 31, 2024
e01b28e
Merge pull request #70 from contentstack/master
cs-raj Sep 12, 2024
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
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ buildscript {
}

dependencies {
//classpath "com.android.tools.build:gradle:8.2.1" //8.2.1
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'io.github.gradle-nexus:publish-plugin:2.0.0-rc-1'
classpath "org.jacoco:org.jacoco.core:$jacoco_version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class SDKConstant {
public static final boolean debug = false;
public static boolean IS_NETWORK_AVAILABLE = true;
public static String PROTOCOL = "https://";
public static String SDK_VERSION = "3.13.0";
public static String SDK_VERSION = "3.14.0";
public final static int NO_NETWORK_CONNECTION = 408;
public final static int TimeOutDuration = 30000; // timeout in millisecond
public final static int NumRetry = 0;
Expand Down
29 changes: 24 additions & 5 deletions contentstack/src/main/java/com/contentstack/sdk/SyncStack.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,24 @@ public class SyncStack {
private int count;
private String URL;
private String pagination_token;
private String sync_token;
private String syncToken;
private ArrayList<JSONObject> syncItems;
private String sequentialToken;


/**
* Gets sequential token based on sync response
*
* @return sequentialToken
*/
public String getSequentialToken() {
return sequentialToken;
}

public void setSequentialToken(String sequentialToken) {
this.sequentialToken = sequentialToken;
}

/**
* Gets url.
*
Expand Down Expand Up @@ -82,7 +96,7 @@ public String getPaginationToken() {
* @return the sync token
*/
public String getSyncToken() {
return this.sync_token;
return this.syncToken;
}

/**
Expand Down Expand Up @@ -130,12 +144,17 @@ protected void setJSON(JSONObject jsonobject) {
if (receiveJson.has("pagination_token")) {
this.pagination_token = receiveJson.optString("pagination_token");
} else {
this.sync_token = null;
this.syncToken = null;
}
if (receiveJson.has("sync_token")) {
this.sync_token = receiveJson.optString("sync_token");
this.syncToken = receiveJson.optString("sync_token");
} else {
this.syncToken = null;
}
if (receiveJson.has("last_seq_id")) {
this.sequentialToken = receiveJson.optString("last_seq_id");
} else {
this.sync_token = null;
this.sequentialToken = null;
}
}
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
android.useAndroidX=true
android.enableJetifier=true
android.enableR8.fullMode=false
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
2 changes: 0 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
#distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
Expand Down
Loading