Merge remote-tracking branch 'origin/CS-42935/feat-taxonomy-and-eaf' …

…into CS-42935/feat-taxonomy-and-eaf
contentstack · Dec 15, 2023 · a79b551 · a79b551
2 parents 77618f6 + bb32156
commit a79b551
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Updated dependencies
 - Added support for early access feature
 
+
 ## v1.12.3
 
 ### Date: 28-SEP-2023

diff --git a/src/main/java/com/contentstack/sdk/Config.java b/src/main/java/com/contentstack/sdk/Config.java
@@ -19,7 +19,6 @@ public class Config {
     protected String livePreviewHash = null;
     protected String livePreviewContentType = null;
     protected String livePreviewEntryUid = null;
-    @Getter
     protected String host = "cdn.contentstack.io";
     protected String version = "v3";
     protected String scheme = "https://";
@@ -39,9 +38,31 @@ public class Config {
     protected List<ContentstackPlugin> plugins = null;
 
     /**
-     * -- GETTER --
      * The configuration for the contentstack that contains support for
      */
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
+    /**
+     * Proxy can be set like below.
+     *
+     * @param proxy
+     *         Proxy setting, typically a type (http, socks) and a socket address. A Proxy is an immutable object
+     *         <br>
+     *         <br>
+     *         <b>Example:</b><br>
+     *         <br>
+     *         <code>
+     *         java.net.Proxy proxy = new Proxy(Proxy.Type.HTTP,  new InetSocketAddress("proxyHost", "proxyPort"));
+     *         java.net.Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("sl.theproxyvpn.io", 80)); Config
+     *         config = new Config(); config.setProxy(proxy);
+     *         </code>
+     */
     @Getter
     protected String[] earlyAccess;
 
@@ -101,6 +122,10 @@ public void setPlugins(List<ContentstackPlugin> plugins) {
         this.plugins = plugins;
     }
 
+    public void setPlugins(List<ContentstackPlugin> plugins) {
+        this.plugins = plugins;
+    }
+
     /**
      * Sets host.
      *

diff --git a/src/main/java/com/contentstack/sdk/Stack.java b/src/main/java/com/contentstack/sdk/Stack.java
@@ -353,10 +353,7 @@ public void syncPaginationToken(@NotNull String paginationToken, SyncResultCallB
      *                     <br>
      *                     <b>Example :</b><br>
      *                     <pre class="prettyprint">
-     *                                                                                                                                                                                                                                                                                                                                                         Stack stack = contentstack.Stack("apiKey", "deliveryToken", "environment");
-     *                                                                                                                                                                                                                                                                                                                                                         stack.syncToken("syncToken")
-     *                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 stack.syncToken(sync_token, new SyncResultCallBack()                                                                                                                                                                                                               ){ }
-     *                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 </pre>
+     *   Stack stack = contentstack.Stack("apiKey", "deliveryToken", "environment");                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   </pre>
      */
     public void syncToken(String syncToken, SyncResultCallBack syncCallBack) {
         syncParams = new JSONObject();
@@ -537,8 +534,10 @@ public Taxonomy taxonomy() {
 
     /**
      * The enum Publish type.
+     * @since : v3.11.0
      */
     public enum PublishType {
+        //asset_deleted, asset_published, asset_unpublished, content_type_deleted, entry_deleted, entry_published,
         // Breaking change in v3.11.0
         ASSET_DELETED,
         ASSET_PUBLISHED,