From 644c50c70bcceed98db3734067821cd62083c94a Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Mon, 20 May 2024 13:42:55 +0530
Subject: [PATCH 1/2] chore: Remove explicit JSON props

---
 .../java/com/appsmith/server/domains/CustomJSLib.java | 11 +----------
 .../com/appsmith/server/domains/ce/CustomJSLibCE.java | 11 +----------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CustomJSLib.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CustomJSLib.java
index 2e1d61b4d89e..0ac119b7b3c7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CustomJSLib.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/CustomJSLib.java
@@ -1,8 +1,6 @@
 package com.appsmith.server.domains;
 
 import com.appsmith.server.domains.ce.CustomJSLibCE;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -18,14 +16,7 @@
 @Document
 public class CustomJSLib extends CustomJSLibCE {
 
-    @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-    public CustomJSLib(
-            @JsonProperty("name") String name,
-            @JsonProperty("accessor") Set<String> accessor,
-            @JsonProperty("url") String url,
-            @JsonProperty("docsUrl") String docsUrl,
-            @JsonProperty("version") String version,
-            @JsonProperty("defs") String defs) {
+    public CustomJSLib(String name, Set<String> accessor, String url, String docsUrl, String version, String defs) {
         super(name, accessor, url, docsUrl, version, defs);
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/CustomJSLibCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/CustomJSLibCE.java
index 4e3c5bca54e5..57d0050090aa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/CustomJSLibCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/CustomJSLibCE.java
@@ -3,8 +3,6 @@
 import com.appsmith.external.models.BranchAwareDomain;
 import com.appsmith.external.views.Git;
 import com.appsmith.external.views.Views;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -58,14 +56,7 @@ public class CustomJSLibCE extends BranchAwareDomain {
     @JsonView({Views.Public.class, Git.class})
     String defs;
 
-    @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-    public CustomJSLibCE(
-            @JsonProperty("name") String name,
-            @JsonProperty("accessor") Set<String> accessor,
-            @JsonProperty("url") String url,
-            @JsonProperty("docsUrl") String docsUrl,
-            @JsonProperty("version") String version,
-            @JsonProperty("defs") String defs) {
+    public CustomJSLibCE(String name, Set<String> accessor, String url, String docsUrl, String version, String defs) {
         this.name = name;
         this.accessor = accessor;
         this.url = url;

From 6bccf7bc18f18ddc1e2f5a3588d9e69e35351ea5 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Wed, 22 May 2024 12:58:03 +0530
Subject: [PATCH 2/2] Fix uidString computation

---
 .../server/domains/ce/CustomJSLibCE.java      | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/CustomJSLibCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/CustomJSLibCE.java
index 57d0050090aa..bb45cb3c9e03 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/CustomJSLibCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/CustomJSLibCE.java
@@ -3,6 +3,7 @@
 import com.appsmith.external.models.BranchAwareDomain;
 import com.appsmith.external.views.Git;
 import com.appsmith.external.views.Views;
+import com.appsmith.server.helpers.CollectionUtils;
 import com.fasterxml.jackson.annotation.JsonView;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -57,19 +58,37 @@ public class CustomJSLibCE extends BranchAwareDomain {
     String defs;
 
     public CustomJSLibCE(String name, Set<String> accessor, String url, String docsUrl, String version, String defs) {
-        this.name = name;
-        this.accessor = accessor;
-        this.url = url;
-        this.docsUrl = docsUrl;
-        this.defs = defs;
-        this.version = version;
-        setUidString();
+        setName(name);
+        setAccessor(accessor);
+        setUrl(url);
+        setDocsUrl(docsUrl);
+        setDefs(defs);
+        setVersion(version);
     }
 
-    public void setUidString() {
-        List<String> accessorList = new ArrayList(this.accessor);
-        Collections.sort(accessorList);
-        this.uidString = String.join("_", accessorList) + "_" + this.url;
+    public void setAccessor(Set<String> value) {
+        accessor = value;
+        recomputeUid();
+    }
+
+    public void setUrl(String value) {
+        url = value;
+        recomputeUid();
+    }
+
+    private void recomputeUid() {
+        final List<String> items = new ArrayList<>();
+
+        // Add all accessor items, sorted.
+        if (!CollectionUtils.isNullOrEmpty(accessor)) {
+            items.addAll(accessor);
+            Collections.sort(items);
+        }
+
+        // Add URL to the end of sorted accessors list.
+        items.add(url);
+
+        setUidString(String.join("_", items));
     }
 
     /**