Repository: atlas Updated Branches: refs/heads/branch-0.8 0de5783ab -> 574e3b786
ATLAS-2272 :- Save the state of dragged columns using save search API. Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/20efd214 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/20efd214 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/20efd214 Branch: refs/heads/branch-0.8 Commit: 20efd2142af9a2aa346ab4c23c851a9478d08cec Parents: 0de5783 Author: nixonrodrigues <ni...@apache.org> Authored: Thu Dec 28 00:42:39 2017 +0530 Committer: nixonrodrigues <ni...@apache.org> Committed: Wed Jan 3 18:58:21 2018 +0530 ---------------------------------------------------------------------- addons/models/0010-base_model.json | 8 ++++++++ .../atlas/model/profile/AtlasUserSavedSearch.java | 16 ++++++++++++++++ .../atlas/repository/ogm/AtlasSavedSearchDTO.java | 5 +++++ 3 files changed, 29 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/20efd214/addons/models/0010-base_model.json ---------------------------------------------------------------------- diff --git a/addons/models/0010-base_model.json b/addons/models/0010-base_model.json index 0a0244c..da37f7e 100644 --- a/addons/models/0010-base_model.json +++ b/addons/models/0010-base_model.json @@ -199,6 +199,14 @@ "isIndexable": false, "isOptional": false, "isUnique": false + }, + { + "name": "searchParameters", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": false, + "isOptional": true, + "isUnique": false } ] } http://git-wip-us.apache.org/repos/asf/atlas/blob/20efd214/intg/src/main/java/org/apache/atlas/model/profile/AtlasUserSavedSearch.java ---------------------------------------------------------------------- diff --git a/intg/src/main/java/org/apache/atlas/model/profile/AtlasUserSavedSearch.java b/intg/src/main/java/org/apache/atlas/model/profile/AtlasUserSavedSearch.java index 0625a13..c180170 100644 --- a/intg/src/main/java/org/apache/atlas/model/profile/AtlasUserSavedSearch.java +++ b/intg/src/main/java/org/apache/atlas/model/profile/AtlasUserSavedSearch.java @@ -47,6 +47,7 @@ public class AtlasUserSavedSearch extends AtlasBaseModelObject implements Serial private String name; private SavedSearchType searchType; private SearchParameters searchParameters; + private String uiParameters; public AtlasUserSavedSearch() { @@ -68,6 +69,11 @@ public class AtlasUserSavedSearch extends AtlasBaseModelObject implements Serial setSearchParameters(searchParameters); } + public AtlasUserSavedSearch(String ownerName, String name, SavedSearchType searchType, SearchParameters searchParameters, String uiParameters) { + this(ownerName, name, searchType, searchParameters); + setUiParameters(uiParameters); + } + public String getOwnerName() { return this.ownerName; @@ -101,6 +107,14 @@ public class AtlasUserSavedSearch extends AtlasBaseModelObject implements Serial this.searchParameters = searchParameters; } + public String getUiParameters() { + return uiParameters; + } + + public void setUiParameters(String uiParameters) { + this.uiParameters = uiParameters; + } + @Override public StringBuilder toString(StringBuilder sb) { sb.append(", ownerName=").append(ownerName); @@ -113,6 +127,8 @@ public class AtlasUserSavedSearch extends AtlasBaseModelObject implements Serial searchParameters.toString(sb); } + sb.append(", uiParameters=").append(uiParameters); + return sb; } } http://git-wip-us.apache.org/repos/asf/atlas/blob/20efd214/repository/src/main/java/org/apache/atlas/repository/ogm/AtlasSavedSearchDTO.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/AtlasSavedSearchDTO.java b/repository/src/main/java/org/apache/atlas/repository/ogm/AtlasSavedSearchDTO.java index 27575ce..a1a8f59 100644 --- a/repository/src/main/java/org/apache/atlas/repository/ogm/AtlasSavedSearchDTO.java +++ b/repository/src/main/java/org/apache/atlas/repository/ogm/AtlasSavedSearchDTO.java @@ -36,6 +36,7 @@ public class AtlasSavedSearchDTO extends AbstractDataTransferObject<AtlasUserSav private static final String PROPERTY_SEARCH_PARAMETERS = "searchParameters"; private static final String PROPERTY_UNIQUE_NAME = "uniqueName"; private static final String PROPERTY_SEARCH_TYPE = "searchType"; + private static final String PROPERTY_UI_PARAMETERS = "uiParameters"; public AtlasSavedSearchDTO(AtlasTypeRegistry typeRegistry) { super(typeRegistry, AtlasUserSavedSearch.class); @@ -56,6 +57,8 @@ public class AtlasSavedSearchDTO extends AbstractDataTransferObject<AtlasUserSav savedSearch.setSearchParameters(AtlasType.fromJson(jsonSearchParams, SearchParameters.class)); } + savedSearch.setUiParameters((String) entity.getAttribute(PROPERTY_UI_PARAMETERS)); + return savedSearch; } @@ -77,6 +80,8 @@ public class AtlasSavedSearchDTO extends AbstractDataTransferObject<AtlasUserSav entity.setAttribute(PROPERTY_SEARCH_PARAMETERS, AtlasType.toJson(obj.getSearchParameters())); } + entity.setAttribute(PROPERTY_UI_PARAMETERS, obj.getUiParameters()); + return entity; }
