atlas git commit: ATLAS-2267: Update basic search to support classification attributes
Repository: atlas
Updated Branches:
refs/heads/master 6dea2e4f6 -> 0765d5796
ATLAS-2267: Update basic search to support classification attributes
(cherry picked from commit 47ce0aa7415fad9954e3ab892b398cbcdfa8753b)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/0765d579
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/0765d579
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/0765d579
Branch: refs/heads/master
Commit: 0765d57966ddc5a9f5876b1dae039a8584e7c2fa
Parents: 6dea2e4
Author: Sarath Subramanian
Authored: Fri Nov 17 18:18:01 2017 -0800
Committer: Sarath Subramanian
Committed: Fri Nov 17 18:18:42 2017 -0800
--
.../atlas/model/discovery/SearchParameters.java | 21 ++-
.../atlas/model/instance/AtlasEntityHeader.java | 28 ++--
.../ClassificationSearchProcessor.java | 15 +--
.../atlas/discovery/EntityDiscoveryService.java | 4 +++
.../apache/atlas/discovery/SearchContext.java | 27 +++
.../store/graph/v1/EntityGraphRetriever.java| 4 +++
6 files changed, 83 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/atlas/blob/0765d579/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
--
diff --git
a/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
b/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
index bb72f46..557256e 100644
--- a/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
+++ b/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
@@ -44,6 +44,7 @@ public class SearchParameters implements Serializable {
private String typeName;
private String classification;
private boolean excludeDeletedEntities;
+private boolean includeClassificationAttributes;
private int limit;
private int offset;
@@ -113,6 +114,21 @@ public class SearchParameters implements Serializable {
}
/**
+ * @return True if classification attributes are included in search result.
+ */
+public boolean getIncludeClassificationAttributes() {
+return includeClassificationAttributes;
+}
+
+/**
+ * Include classificatio attributes in search result.
+ * @param includeClassificationAttributes boolean flag
+ */
+public void setIncludeClassificationAttributes(boolean
includeClassificationAttributes) {
+this.includeClassificationAttributes = includeClassificationAttributes;
+}
+
+/**
* @return Max number of results to be returned
*/
public int getLimit() {
@@ -195,6 +211,7 @@ public class SearchParameters implements Serializable {
if (o == null || getClass() != o.getClass()) return false;
SearchParameters that = (SearchParameters) o;
return excludeDeletedEntities == that.excludeDeletedEntities &&
+includeClassificationAttributes ==
that.includeClassificationAttributes &&
limit == that.limit &&
offset == that.offset &&
Objects.equals(query, that.query) &&
@@ -207,7 +224,8 @@ public class SearchParameters implements Serializable {
@Override
public int hashCode() {
-return Objects.hash(query, typeName, classification,
excludeDeletedEntities, limit, offset, entityFilters, tagFilters, attributes);
+return Objects.hash(query, typeName, classification,
excludeDeletedEntities, includeClassificationAttributes,
+limit, offset, entityFilters, tagFilters,
attributes);
}
public StringBuilder toString(StringBuilder sb) {
@@ -220,6 +238,7 @@ public class SearchParameters implements Serializable {
sb.append(", typeName='").append(typeName).append('\'');
sb.append(", classification='").append(classification).append('\'');
sb.append(", excludeDeletedEntities=").append(excludeDeletedEntities);
+sb.append(",
includeClassificationAttributes=").append(includeClassificationAttributes);
sb.append(", limit=").append(limit);
sb.append(", offset=").append(offset);
sb.append(", entityFilters=").append(entityFilters);
http://git-wip-us.apache.org/repos/asf/atlas/blob/0765d579/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
--
diff --git
a/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
b/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
index 5acdc59..340cd05 100644
--- a/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
+++ b/intg/src/main/java/org/apa
atlas git commit: ATLAS-2267: Update basic search to support classification attributes
Repository: atlas
Updated Branches:
refs/heads/branch-0.8 58aa2dc3b -> 47ce0aa74
ATLAS-2267: Update basic search to support classification attributes
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/47ce0aa7
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/47ce0aa7
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/47ce0aa7
Branch: refs/heads/branch-0.8
Commit: 47ce0aa7415fad9954e3ab892b398cbcdfa8753b
Parents: 58aa2dc
Author: Sarath Subramanian
Authored: Fri Nov 17 18:18:01 2017 -0800
Committer: Sarath Subramanian
Committed: Fri Nov 17 18:18:01 2017 -0800
--
.../atlas/model/discovery/SearchParameters.java | 21 ++-
.../atlas/model/instance/AtlasEntityHeader.java | 28 ++--
.../ClassificationSearchProcessor.java | 15 +--
.../atlas/discovery/EntityDiscoveryService.java | 4 +++
.../apache/atlas/discovery/SearchContext.java | 27 +++
.../store/graph/v1/EntityGraphRetriever.java| 4 +++
6 files changed, 83 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/atlas/blob/47ce0aa7/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
--
diff --git
a/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
b/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
index f5a4813..ede841e 100644
--- a/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
+++ b/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
@@ -44,6 +44,7 @@ public class SearchParameters implements Serializable {
private String typeName;
private String classification;
private boolean excludeDeletedEntities;
+private boolean includeClassificationAttributes;
private int limit;
private int offset;
@@ -113,6 +114,21 @@ public class SearchParameters implements Serializable {
}
/**
+ * @return True if classification attributes are included in search result.
+ */
+public boolean getIncludeClassificationAttributes() {
+return includeClassificationAttributes;
+}
+
+/**
+ * Include classificatio attributes in search result.
+ * @param includeClassificationAttributes boolean flag
+ */
+public void setIncludeClassificationAttributes(boolean
includeClassificationAttributes) {
+this.includeClassificationAttributes = includeClassificationAttributes;
+}
+
+/**
* @return Max number of results to be returned
*/
public int getLimit() {
@@ -195,6 +211,7 @@ public class SearchParameters implements Serializable {
if (o == null || getClass() != o.getClass()) return false;
SearchParameters that = (SearchParameters) o;
return excludeDeletedEntities == that.excludeDeletedEntities &&
+includeClassificationAttributes ==
that.includeClassificationAttributes &&
limit == that.limit &&
offset == that.offset &&
Objects.equals(query, that.query) &&
@@ -207,7 +224,8 @@ public class SearchParameters implements Serializable {
@Override
public int hashCode() {
-return Objects.hash(query, typeName, classification,
excludeDeletedEntities, limit, offset, entityFilters, tagFilters, attributes);
+return Objects.hash(query, typeName, classification,
excludeDeletedEntities, includeClassificationAttributes,
+limit, offset, entityFilters, tagFilters,
attributes);
}
public StringBuilder toString(StringBuilder sb) {
@@ -220,6 +238,7 @@ public class SearchParameters implements Serializable {
sb.append(", typeName='").append(typeName).append('\'');
sb.append(", classification='").append(classification).append('\'');
sb.append(", excludeDeletedEntities=").append(excludeDeletedEntities);
+sb.append(",
includeClassificationAttributes=").append(includeClassificationAttributes);
sb.append(", limit=").append(limit);
sb.append(", offset=").append(offset);
sb.append(", entityFilters=").append(entityFilters);
http://git-wip-us.apache.org/repos/asf/atlas/blob/47ce0aa7/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
--
diff --git
a/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
b/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
index 324946a..2b7aa6a 100644
--- a/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
+++ b/intg/src/main/java/org/apache/atlas/model/instance/AtlasEntityHeader.java
@@ -29,6 +29,7
