Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
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.appsmith.server.helpers.CollectionUtils;
import com.fasterxml.jackson.annotation.JsonView;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down Expand Up @@ -58,27 +57,38 @@ 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) {
this.name = name;
this.accessor = accessor;
this.url = url;
this.docsUrl = docsUrl;
this.defs = defs;
this.version = version;
setUidString();
public CustomJSLibCE(String name, Set<String> accessor, String url, String docsUrl, String version, String defs) {
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));
Comment thread
sharat87 marked this conversation as resolved.
}

/**
Expand Down