falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pisayc...@apache.org
Subject falcon git commit: FALCON-1287 Use listAllEntities() instead of listEntities(). Contributed by Ruslan Ostafiychuk
Date Mon, 22 Jun 2015 12:56:43 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 8db18628a -> 3189d52e4


FALCON-1287 Use listAllEntities() instead of listEntities(). Contributed by Ruslan Ostafiychuk


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

Branch: refs/heads/master
Commit: 3189d52e4fc3ba290ce05208b9a1a3a18bb6473d
Parents: 8db1862
Author: Paul Isaychuk <pisaychuk@apache.org>
Authored: Mon Jun 22 15:55:50 2015 +0300
Committer: Paul Isaychuk <pisaychuk@apache.org>
Committed: Mon Jun 22 15:55:50 2015 +0300

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                             |  2 ++
 .../core/helpers/entity/AbstractEntityHelper.java         | 10 +++++-----
 .../regression/entity/EntitiesPatternSearchTest.java      |  2 +-
 .../apache/falcon/regression/entity/ListEntitiesTest.java |  4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/3189d52e/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 6c6ee4f..654565c 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -355,6 +355,8 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-1287 Use listAllEntities() instead of listEntities() (Ruslan Ostafiychuk via Paul
Isaychuk)
+
    FALCON-1288 Fortify expressionLanguageTest (Ruslan Ostafiychuk via Paul Isaychuk)
 
    FALCON-1285 Don't reduce process name in ProcessSetupTest (Ruslan Ostafiychuk)

http://git-wip-us.apache.org/repos/asf/falcon/blob/3189d52e/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java
index 98ac2f8..50d7439 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java
@@ -251,11 +251,6 @@ public abstract class AbstractEntityHelper {
         return StringUtils.join(parts, "/");
     }
 
-    public ServiceResponse listEntities()
-        throws IOException, URISyntaxException, AuthenticationException, InterruptedException
{
-        return listEntities(null, null, null);
-    }
-
     public ServiceResponse listEntities(String entityType, String params, String user)
         throws IOException, URISyntaxException, AuthenticationException, InterruptedException
{
         if (StringUtils.isEmpty(entityType)) {
@@ -269,6 +264,11 @@ public abstract class AbstractEntityHelper {
         return Util.sendRequest(createUrl(url), "get", null, user);
     }
 
+    public ServiceResponse listAllEntities()
+        throws AuthenticationException, IOException, URISyntaxException, InterruptedException
{
+        return listAllEntities(null, null);
+    }
+
     public ServiceResponse listAllEntities(String params, String user)
         throws AuthenticationException, IOException, URISyntaxException, InterruptedException
{
         return listEntities(null, (params == null ? "" : params + '&')

http://git-wip-us.apache.org/repos/asf/falcon/blob/3189d52e/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
index 2fdfc6e..c9ed3a6 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
@@ -102,7 +102,7 @@ public class EntitiesPatternSearchTest extends BaseTestClass {
         EntityElement[] entities =
                 helper.listAllEntities("nameseq=" + patternParam, null).getEntityList().getElements();
         LOGGER.info(helper.getEntityType() + " entities: " + Arrays.toString(entities));
-        validateOutputPatternList(helper.listEntities().getEntityList().getElements(), entities,
patternParam);
+        validateOutputPatternList(helper.listAllEntities().getEntityList().getElements(),
entities, patternParam);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/falcon/blob/3189d52e/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
index 1c33821..011d02d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
@@ -172,7 +172,7 @@ public class ListEntitiesTest extends BaseTestClass {
         throws AuthenticationException, IOException, URISyntaxException, InterruptedException
{
 
         EntityElement[] allEntities =
-            helper.listAllEntities(null, null).getEntityList().getElements();
+            helper.listAllEntities().getEntityList().getElements();
         LOGGER.info(helper.getEntityType() + " entities: " + Arrays.toString(allEntities));
         int allEntitiesCount = allEntities.length;
         for (int i = 0; i <= allEntitiesCount; i++) {
@@ -201,7 +201,7 @@ public class ListEntitiesTest extends BaseTestClass {
         throws AuthenticationException, IOException, URISyntaxException, InterruptedException
{
 
         EntityElement[] allEntities =
-            helper.listAllEntities(null, null).getEntityList().getElements();
+            helper.listAllEntities().getEntityList().getElements();
         int allEntitiesCount = allEntities.length;
 
         for (int i = 1; i <= allEntitiesCount; i++) {


Mime
View raw message