You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ni...@apache.org on 2021/01/15 14:31:10 UTC
[atlas] branch branch-2.0 updated (8a27eff -> 2559aa5)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 8a27eff ATLAS-4099: Removed trailing path separator from adls_gen2_directory qualifiedName
new 5d90c1b Atlas-4102: UI - Atlas UI hangs When Executing Certain Queries fixed in DSL Search.
new 2559aa5 ATLAS-4101 : Fix http error code for JsonParseException by overriding readFrom method of JacksonJsonProvider.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../js/views/search/SearchResultLayoutView.js | 8 ++++++++
.../js/views/search/SearchResultLayoutView.js | 8 ++++++++
.../apache/atlas/web/util/AtlasJsonProvider.java | 24 +++++++++++++++++++++-
3 files changed, 39 insertions(+), 1 deletion(-)
[atlas] 02/02: ATLAS-4101 : Fix http error code for
JsonParseException by overriding readFrom method of JacksonJsonProvider.
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 2559aa510883a0194a971d9b884835d419f8282c
Author: nixonrodrigues <ni...@apache.org>
AuthorDate: Wed Jan 13 16:09:43 2021 +0530
ATLAS-4101 : Fix http error code for JsonParseException by overriding readFrom method of JacksonJsonProvider.
(cherry picked from commit 6edd4bc110a3fdde42659f797c588fa75432cc79)
---
.../apache/atlas/web/util/AtlasJsonProvider.java | 24 +++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/webapp/src/main/java/org/apache/atlas/web/util/AtlasJsonProvider.java b/webapp/src/main/java/org/apache/atlas/web/util/AtlasJsonProvider.java
index efe0486..8a7dcf1 100644
--- a/webapp/src/main/java/org/apache/atlas/web/util/AtlasJsonProvider.java
+++ b/webapp/src/main/java/org/apache/atlas/web/util/AtlasJsonProvider.java
@@ -18,16 +18,24 @@
package org.apache.atlas.web.util;
+import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-
import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
@Provider
@@ -44,4 +52,18 @@ public class AtlasJsonProvider extends JacksonJaxbJsonProvider {
LOG.info("AtlasJsonProvider() instantiated");
}
+
+ @Override
+ public Object readFrom(Class<Object> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException {
+ try {
+ return super.readFrom(type, genericType, annotations, mediaType, httpHeaders, entityStream);
+ } catch (JsonParseException jpe) {
+ LOG.error("Malformed json passed to server", jpe);
+ throw new WebApplicationException(Servlets.getErrorResponse(jpe.getMessage(), Response.Status.BAD_REQUEST));
+ } catch (JsonMappingException jme) {
+ LOG.error("Malformed json passed to server, incorrect data type used", jme);
+ throw new WebApplicationException(Servlets.getErrorResponse(jme.getMessage(), Response.Status.BAD_REQUEST));
+ }
+ }
}
[atlas] 01/02: Atlas-4102: UI - Atlas UI hangs When Executing
Certain Queries fixed in DSL Search.
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 5d90c1b3ca7859604035a3be9a77d8b8a421c519
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Wed Jan 13 23:23:54 2021 +0530
Atlas-4102: UI - Atlas UI hangs When Executing Certain Queries fixed in DSL Search.
Signed-off-by: nixonrodrigues <ni...@apache.org>
(cherry picked from commit f47334a7475cd80960c070b4b2204ea2ab3e42ca)
---
dashboardv2/public/js/views/search/SearchResultLayoutView.js | 8 ++++++++
dashboardv3/public/js/views/search/SearchResultLayoutView.js | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 08d8781..0e8fd94 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -564,6 +564,14 @@ define(['require',
});
var columns = new columnCollection((that.searchCollection.dynamicTable ? that.getDaynamicColumns(that.searchCollection.toJSON()) : that.getFixedDslColumn()));
columns.setPositions().sort();
+ if (this.searchType == "Advanced Search" && columns.length) {
+ //for dsl search with Select clause, default column to be use as sorting
+ var tableColumnNames = Object.keys(that.searchCollection.toJSON()[0]);
+ that.commonTableOptions['sortOpts'] = {
+ sortColumn: tableColumnNames[0],
+ sortDirection: "ascending"
+ };
+ }
var table = new TableLayout(_.extend({}, that.commonTableOptions, {
columns: columns
}));
diff --git a/dashboardv3/public/js/views/search/SearchResultLayoutView.js b/dashboardv3/public/js/views/search/SearchResultLayoutView.js
index 02d63aa..17f2e3b 100644
--- a/dashboardv3/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv3/public/js/views/search/SearchResultLayoutView.js
@@ -575,6 +575,14 @@ define(['require',
});
var columns = new columnCollection((that.searchCollection.dynamicTable ? that.getDaynamicColumns(that.searchCollection.toJSON()) : that.getFixedDslColumn()));
columns.setPositions().sort();
+ if (this.searchType == "Advanced Search" && columns.length) {
+ //for dsl search with Select clause, default column to be use as sorting
+ var tableColumnNames = Object.keys(that.searchCollection.toJSON()[0]);
+ that.commonTableOptions['sortOpts'] = {
+ sortColumn: tableColumnNames[0],
+ sortDirection: "ascending"
+ };
+ }
var table = new TableLayout(_.extend({}, that.commonTableOptions, {
columns: columns
}));