Merge branch 'master' into stag-helper

atlanhq · Jun 26, 2024 · fd6cdf5 · fd6cdf5
2 parents 0fd676d + cb04399
commit fd6cdf5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/intg/src/main/java/org/apache/atlas/model/discovery/ElasticsearchMetadata.java b/intg/src/main/java/org/apache/atlas/model/discovery/ElasticsearchMetadata.java
@@ -31,11 +31,9 @@ public void addHighlights(Map<String, List<String>> highlights) {
     public Object getSort() { return sort; }
 
     public void addSort(ArrayList<Object> sort) {
-
-        if(!sort.isEmpty()) {
-            if (MapUtils.isEmpty(this.highlights)) {
-                this.sort = new ArrayList<>();
-            }
+        if (sort.isEmpty()) {
+            this.sort = null;
+        } else {
             this.sort = sort;
         }
     }

diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java
@@ -97,6 +97,8 @@ public class EntityREST {
     private static final int TWO_MILLION = HUNDRED_THOUSAND * 10 * 2;
     private static final Set<String> ATTRS_WITH_TWO_MILLION_LIMIT = new HashSet<String>() {{
         add("rawQueryText");
+        add("variablesSchemaBase64");
+        add("visualBuilderSchemaBase64");
     }};