atlas git commit: ATLAS-1920 : UI : Search using entity and trait attributes - Operators for enum and boolean data type filters.

2017-08-03 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/0.8-incubating 09f677c03 -> 54f4a7ffd


ATLAS-1920 : UI : Search using entity and trait attributes - Operators for enum 
and boolean data type filters.

(cherry picked from commit daf6c0267a41670a5191fef1bd7741f492678970)


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/54f4a7ff
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/54f4a7ff
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/54f4a7ff

Branch: refs/heads/0.8-incubating
Commit: 54f4a7ffd0f4970f62502b576ad3fe651c069fcf
Parents: 09f677c
Author: kevalbhatt 
Authored: Thu Aug 3 15:07:17 2017 +0530
Committer: Madhan Neethiraj 
Committed: Thu Aug 3 08:05:20 2017 -0700

--
 dashboardv2/public/js/views/search/QueryBuilderView.js | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/54f4a7ff/dashboardv2/public/js/views/search/QueryBuilderView.js
--
diff --git a/dashboardv2/public/js/views/search/QueryBuilderView.js 
b/dashboardv2/public/js/views/search/QueryBuilderView.js
index e8acf18..6cdbeb3 100644
--- a/dashboardv2/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv2/public/js/views/search/QueryBuilderView.js
@@ -64,9 +64,12 @@ define(['require',
 if (type === "string") {
 obj.operators = ['=', '!=', 'contains', 'begins_with', 
'ends_with'];
 }
-if (type === "enum" || type === "date" || type === "int" || 
type === "byte" || type === "short" || type === "long" || type === "float" || 
type === "double") {
+if (type === "date" || type === "int" || type === "byte" || 
type === "short" || type === "long" || type === "float" || type === "double") {
 obj.operators = ['=', '!=', '>', '<', '>=', '<='];
 }
+if (type === "enum" || type === "boolean") {
+obj.operators = ['=', '!='];
+}
 return obj;
 },
 isPrimitive: function(type) {

atlas git commit: ATLAS-1920 : UI : Search using entity and trait attributes - Operators for enum and boolean data type filters.

2017-08-03 Thread kbhatt 
Repository: atlas
Updated Branches:
  refs/heads/master ecd053685 -> daf6c0267


ATLAS-1920 : UI : Search using entity and trait attributes - Operators for enum 
and boolean data type filters.


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/daf6c026
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/daf6c026
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/daf6c026

Branch: refs/heads/master
Commit: daf6c0267a41670a5191fef1bd7741f492678970
Parents: ecd0536
Author: kevalbhatt 
Authored: Thu Aug 3 15:07:17 2017 +0530
Committer: kevalbhatt 
Committed: Thu Aug 3 15:53:58 2017 +0530

--
 dashboardv2/public/js/views/search/QueryBuilderView.js | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/daf6c026/dashboardv2/public/js/views/search/QueryBuilderView.js
--
diff --git a/dashboardv2/public/js/views/search/QueryBuilderView.js 
b/dashboardv2/public/js/views/search/QueryBuilderView.js
index e8acf18..6cdbeb3 100644
--- a/dashboardv2/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv2/public/js/views/search/QueryBuilderView.js
@@ -64,9 +64,12 @@ define(['require',
 if (type === "string") {
 obj.operators = ['=', '!=', 'contains', 'begins_with', 
'ends_with'];
 }
-if (type === "enum" || type === "date" || type === "int" || 
type === "byte" || type === "short" || type === "long" || type === "float" || 
type === "double") {
+if (type === "date" || type === "int" || type === "byte" || 
type === "short" || type === "long" || type === "float" || type === "double") {
 obj.operators = ['=', '!=', '>', '<', '>=', '<='];
 }
+if (type === "enum" || type === "boolean") {
+obj.operators = ['=', '!='];
+}
 return obj;
 },
 isPrimitive: function(type) {

atlas git commit: ATLAS-1981: fix for unit test failures (#2)

2017-08-03 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/0.8-incubating 122b55672 -> 09f677c03


ATLAS-1981: fix for unit test failures (#2)


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/09f677c0
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/09f677c0
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/09f677c0

Branch: refs/heads/0.8-incubating
Commit: 09f677c03a3f23035723d4eda6634649a04dc118
Parents: 122b556
Author: Madhan Neethiraj 
Authored: Thu Aug 3 00:32:17 2017 -0700
Committer: Madhan Neethiraj 
Committed: Thu Aug 3 00:32:17 2017 -0700

--
 .../apache/atlas/services/EntityDiscoveryServiceTest.java   | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/09f677c0/repository/src/test/java/org/apache/atlas/services/EntityDiscoveryServiceTest.java
--
diff --git 
a/repository/src/test/java/org/apache/atlas/services/EntityDiscoveryServiceTest.java
 
b/repository/src/test/java/org/apache/atlas/services/EntityDiscoveryServiceTest.java
index 5706d26..5a0739c 100644
--- 
a/repository/src/test/java/org/apache/atlas/services/EntityDiscoveryServiceTest.java
+++ 
b/repository/src/test/java/org/apache/atlas/services/EntityDiscoveryServiceTest.java
@@ -105,10 +105,11 @@ public class EntityDiscoveryServiceTest {
 public void getSubTypeForTypeWithSubTypes_ReturnsOrClause() throws 
Exception {
 String s = invokeGetSubTypesForType(TEST_TYPE_WITH_SUB_TYPES, 
maxTypesStrLengthInIdxQuery);
 
-assertTrue(s.startsWith("(" + TEST_TYPE_WITH_SUB_TYPES));
-assertTrue(s.contains(" " + TEST_TYPE1));
-assertTrue(s.contains(" " + TEST_TYPE2));
-assertTrue(s.contains(" " + TEST_TYPE3));
+assertTrue(s.startsWith("("));
+assertTrue(s.contains(TEST_TYPE_WITH_SUB_TYPES));
+assertTrue(s.contains(TEST_TYPE1));
+assertTrue(s.contains(TEST_TYPE2));
+assertTrue(s.contains(TEST_TYPE3));
 assertTrue(s.endsWith(")"));
 }

atlas git commit: ATLAS-2017: updated import API to make request parameter optional (#2 - fix for unit test failure)

2017-08-03 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/master dd00c8596 -> ecd053685


ATLAS-2017: updated import API to make request parameter optional (#2 - fix for 
unit test failure)


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/ecd05368
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/ecd05368
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/ecd05368

Branch: refs/heads/master
Commit: ecd053685e547ac86dbfaed290cd3063955ce94a
Parents: dd00c85
Author: Madhan Neethiraj 
Authored: Wed Aug 2 23:50:51 2017 -0700
Committer: Madhan Neethiraj 
Committed: Thu Aug 3 00:02:59 2017 -0700

--
 .../org/apache/atlas/repository/impexp/ImportService.java| 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/ecd05368/repository/src/main/java/org/apache/atlas/repository/impexp/ImportService.java
--
diff --git 
a/repository/src/main/java/org/apache/atlas/repository/impexp/ImportService.java
 
b/repository/src/main/java/org/apache/atlas/repository/impexp/ImportService.java
index efe7687..bbe9ed0 100644
--- 
a/repository/src/main/java/org/apache/atlas/repository/impexp/ImportService.java
+++ 
b/repository/src/main/java/org/apache/atlas/repository/impexp/ImportService.java
@@ -60,15 +60,17 @@ public class ImportService {
 return run(source, null, userName, hostName, requestingIP);
 }
 
+
 public AtlasImportResult run(ZipSource source, AtlasImportRequest request, 
String userName,
  String hostName, String requestingIP) throws 
AtlasBaseException {
+if (request == null) {
+request = new AtlasImportRequest();
+}
+
 AtlasImportResult result = new AtlasImportResult(request, userName, 
requestingIP, hostName, System.currentTimeMillis());
 
 try {
 LOG.info("==> import(user={}, from={})", userName, requestingIP);
-if (request == null) {
-request = new AtlasImportRequest();
-}
 
 String transforms = MapUtils.isNotEmpty(request.getOptions()) ? 
request.getOptions().get(AtlasImportRequest.TRANSFORMS_KEY) : null;