Skip to content

Commit 894872d

Browse files
Merge remote-tracking branch 'origin/CS-42935/feat-taxonomy-and-eaf' into CS-42935/feat-taxonomy-and-eaf
2 parents effa899 + 0b6b240 commit 894872d

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- Updated dependencies
1111
- Added support for early access feature
1212

13+
1314
## v1.12.3
1415

1516
### Date: 28-SEP-2023

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class Config {
1919
protected String livePreviewHash = null;
2020
protected String livePreviewContentType = null;
2121
protected String livePreviewEntryUid = null;
22-
@Getter
2322
protected String host = "cdn.contentstack.io";
2423
protected String version = "v3";
2524
protected String scheme = "https://";
@@ -39,9 +38,31 @@ public class Config {
3938
protected List<ContentstackPlugin> plugins = null;
4039

4140
/**
42-
* -- GETTER --
4341
* The configuration for the contentstack that contains support for
4442
*/
43+
public String getBranch() {
44+
return branch;
45+
}
46+
47+
public void setBranch(String branch) {
48+
this.branch = branch;
49+
}
50+
51+
/**
52+
* Proxy can be set like below.
53+
*
54+
* @param proxy
55+
* Proxy setting, typically a type (http, socks) and a socket address. A Proxy is an immutable object
56+
* <br>
57+
* <br>
58+
* <b>Example:</b><br>
59+
* <br>
60+
* <code>
61+
* java.net.Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("proxyHost", "proxyPort"));
62+
* java.net.Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("sl.theproxyvpn.io", 80)); Config
63+
* config = new Config(); config.setProxy(proxy);
64+
* </code>
65+
*/
4566
@Getter
4667
protected String[] earlyAccess;
4768

@@ -101,6 +122,10 @@ public void setPlugins(List<ContentstackPlugin> plugins) {
101122
this.plugins = plugins;
102123
}
103124

125+
public void setPlugins(List<ContentstackPlugin> plugins) {
126+
this.plugins = plugins;
127+
}
128+
104129
/**
105130
* Sets host.
106131
*

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,7 @@ public void syncPaginationToken(@NotNull String paginationToken, SyncResultCallB
353353
* <br>
354354
* <b>Example :</b><br>
355355
* <pre class="prettyprint">
356-
* Stack stack = contentstack.Stack("apiKey", "deliveryToken", "environment");
357-
* stack.syncToken("syncToken")
358-
* stack.syncToken(sync_token, new SyncResultCallBack() ){ }
359-
* </pre>
356+
* Stack stack = contentstack.Stack("apiKey", "deliveryToken", "environment"); </pre>
360357
*/
361358
public void syncToken(String syncToken, SyncResultCallBack syncCallBack) {
362359
syncParams = new JSONObject();
@@ -537,8 +534,10 @@ public Taxonomy taxonomy() {
537534

538535
/**
539536
* The enum Publish type.
537+
* @since : v3.11.0
540538
*/
541539
public enum PublishType {
540+
//asset_deleted, asset_published, asset_unpublished, content_type_deleted, entry_deleted, entry_published,
542541
// Breaking change in v3.11.0
543542
ASSET_DELETED,
544543
ASSET_PUBLISHED,

0 commit comments

Comments
 (0)