tool
/
atlas
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ATLAS-4461: DSL Search : DSL Search with only typename throws NPE 

Signed-off-by: Sidharth Mishra <sidmishra@apache.org>
This commit is contained in:
Radhika Kundam 2021-10-22 17:59:54 -07:00 committed by Sidharth Mishra
parent f08003d136
commit a5ffaae5cb
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
View File

@ -110,16 +110,16 @@ public class DiscoveryREST {
Servlets.validateQueryParamLength("typeName", typeName);
Servlets.validateQueryParamLength("classification", classification);
if (StringUtils.isNotEmpty(query) && query.length() > maxDslQueryLength) {
throw new AtlasBaseException(AtlasErrorCode.INVALID_QUERY_LENGTH, Constants.MAX_DSL_QUERY_STR_LENGTH);
if (StringUtils.isNotEmpty(query)) {
if (query.length() > maxDslQueryLength) {
throw new AtlasBaseException(AtlasErrorCode.INVALID_QUERY_LENGTH, Constants.MAX_DSL_QUERY_STR_LENGTH);
}
query = Servlets.decodeQueryString(query);
}
AtlasPerfTracer perf = null;
try {
query = Servlets.decodeQueryString(query);
if (AtlasPerfTracer.isPerfTraceEnabled(PERF_LOG)) {
perf = AtlasPerfTracer.getPerfTracer(PERF_LOG, "DiscoveryREST.searchUsingDSL(" + query + "," + typeName
+ "," + classification + "," + limit + "," + offset + ")");

10
webapp/src/main/java/org/apache/atlas/web/util/Servlets.java
View File

@ -214,8 +214,12 @@ public final class Servlets {
}
}
public static String decodeQueryString(String query) {
return UriUtils.decode(query,"UTF-8");
public static String decodeQueryString(String query) throws AtlasBaseException {
try {
return UriUtils.decode(query,"UTF-8");
} catch (Exception e) {
LOG.error("Error occurred while decoding query:" + query, e.getMessage());
throw new AtlasBaseException(e.getMessage());
}
}
}