falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject [2/2] incubator-falcon git commit: FALCON-684 Fix problems found by checkstyle in non-test files in falcon-regression. Contributed by Ruslan Ostafiychuk
Date Thu, 27 Nov 2014 15:23:58 GMT
FALCON-684 Fix problems found by checkstyle in non-test files in falcon-regression. Contributed by Ruslan Ostafiychuk


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

Branch: refs/heads/master
Commit: cc9909ae551a6841d3d417e453a7c8520d36bdad
Parents: abf1764
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Thu Nov 27 16:04:45 2014 +0200
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Thu Nov 27 17:22:59 2014 +0200

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                   |   3 +
 .../regression/Entities/TestEntityUtil.java     |  10 +-
 .../falcon/regression/core/bundle/Bundle.java   |  37 +++--
 .../regression/core/helpers/LineageHelper.java  |   4 +-
 .../core/interfaces/FalconClientBuilder.java    |  65 ++++----
 .../core/interfaces/IEntityManagerHelper.java   |  80 +++++-----
 .../regression/core/response/lineage/Edge.java  |  38 +++--
 .../core/response/lineage/EdgesResult.java      |   2 +-
 .../core/response/lineage/GraphEntity.java      |   9 +-
 .../core/response/lineage/GraphResult.java      |   2 +-
 .../core/response/lineage/Vertex.java           |  16 +-
 .../core/supportClasses/ExecResult.java         |  15 +-
 .../falcon/regression/core/util/AssertUtil.java |   2 +-
 .../falcon/regression/core/util/BundleUtil.java |   2 +-
 .../regression/core/util/CleanupUtil.java       |  20 +--
 .../falcon/regression/core/util/FileUtil.java   |  23 +--
 .../regression/core/util/GraphAssert.java       |  16 +-
 .../regression/core/util/InstanceUtil.java      |  29 ++--
 .../regression/core/util/KerberosHelper.java    |   5 +-
 .../falcon/regression/core/util/LogUtil.java    | 159 ++++++++++---------
 .../falcon/regression/core/util/MathUtil.java   |   9 +-
 .../falcon/regression/core/util/OozieUtil.java  |  18 +--
 .../falcon/regression/core/util/Util.java       |  16 +-
 .../org/apache/falcon/request/BaseRequest.java  |   4 +-
 .../security/FalconAuthorizationToken.java      |  10 +-
 .../regression/testHelper/BaseTestClass.java    |  35 ++--
 .../regression/testHelper/BaseUITestClass.java  |  27 ++--
 .../regression/ui/pages/EntitiesPage.java       |  37 +++--
 .../falcon/regression/ui/pages/EntityPage.java  |  12 +-
 .../apache/falcon/regression/ui/pages/Page.java |  27 ++--
 .../falcon/regression/ui/pages/ProcessPage.java |  87 +++++-----
 .../falcon/regression/TestngListener.java       |   6 +-
 .../lineage/LineageApiProcessInstanceTest.java  |   8 +-
 .../regression/lineage/LineageApiTest.java      |  32 ++--
 .../falcon/regression/ui/LineageGraphTest.java  |  32 ++--
 .../falcon/regression/ui/ProcessUITest.java     |   4 +-
 36 files changed, 480 insertions(+), 421 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 1038fa0..69da668 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -33,6 +33,9 @@ Trunk (Unreleased)
    via Samarth Gupta)
 
   IMPROVEMENTS
+   FALCON-684 Fix problems found by checkstyle in non-test files in falcon-regression (Ruslan
+   Ostafiychuk)
+
    FALCON-923 Remove unused xsd's (Paul Isaychuk via Ruslan Ostafiychuk)
 
    FALCON-699 Use APIResult and other support classes from falcon-client in falcon-regression

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/TestEntityUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/TestEntityUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/TestEntityUtil.java
index b3f4b3c..0d3e0ae 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/TestEntityUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/TestEntityUtil.java
@@ -24,7 +24,15 @@ import org.apache.falcon.entity.v0.EntityType;
 import javax.xml.bind.Unmarshaller;
 import java.io.StringReader;
 
-class TestEntityUtil {
+/**
+ * Util class for merlin entities.
+ */
+final class TestEntityUtil {
+
+    private TestEntityUtil() {
+        throw new AssertionError("Instantiating utility class...");
+    }
+
     public static Entity fromString(EntityType type, String str) {
         try {
             Unmarshaller unmarshaller = type.getUnmarshaller();

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
index 5535e00..4c913f5 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
@@ -77,8 +77,8 @@ public class Bundle {
     private String processData;
 
     public void submitFeed()
-            throws URISyntaxException, IOException, AuthenticationException, JAXBException,
-            InterruptedException {
+        throws URISyntaxException, IOException, AuthenticationException, JAXBException,
+        InterruptedException {
         submitClusters(prismHelper);
 
         AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitEntity(dataSets.get(0)));
@@ -97,8 +97,8 @@ public class Bundle {
     }
 
     public void submitAndScheduleAllFeeds()
-            throws JAXBException, IOException, URISyntaxException, AuthenticationException,
-            InterruptedException {
+        throws JAXBException, IOException, URISyntaxException, AuthenticationException,
+        InterruptedException {
         submitClusters(prismHelper);
 
         for (String feed : dataSets) {
@@ -107,14 +107,13 @@ public class Bundle {
     }
 
     public ServiceResponse submitProcess(boolean shouldSucceed) throws JAXBException,
-            IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        IOException, URISyntaxException, AuthenticationException, InterruptedException {
         submitClusters(prismHelper);
         submitFeeds(prismHelper);
         ServiceResponse r = prismHelper.getProcessHelper().submitEntity(processData);
         if (shouldSucceed) {
             AssertUtil.assertSucceeded(r);
-        }
-        else {
+        } else {
             AssertUtil.assertFailed(r);
         }
         return r;
@@ -258,8 +257,8 @@ public class Bundle {
     }
 
     public ServiceResponse submitBundle(ColoHelper helper)
-            throws JAXBException, IOException, URISyntaxException, AuthenticationException,
-            InterruptedException {
+        throws JAXBException, IOException, URISyntaxException, AuthenticationException,
+        InterruptedException {
 
         submitClusters(helper);
 
@@ -280,8 +279,8 @@ public class Bundle {
      * @throws AuthenticationException
      */
     public String submitFeedsScheduleProcess(ColoHelper helper)
-            throws IOException, JAXBException, URISyntaxException,
-            AuthenticationException, InterruptedException {
+        throws IOException, JAXBException, URISyntaxException,
+        AuthenticationException, InterruptedException {
         ServiceResponse submitResponse = submitBundle(helper);
         if (submitResponse.getCode() == 400) {
             return submitResponse.getMessage();
@@ -683,22 +682,22 @@ public class Bundle {
 
 
     public void submitClusters(ColoHelper helper)
-            throws JAXBException, IOException, URISyntaxException, AuthenticationException,
-            InterruptedException {
+        throws JAXBException, IOException, URISyntaxException, AuthenticationException,
+        InterruptedException {
         submitClusters(helper, null);
     }
 
     public void submitClusters(ColoHelper helper, String user)
-            throws JAXBException, IOException, URISyntaxException, AuthenticationException,
-            InterruptedException {
+        throws JAXBException, IOException, URISyntaxException, AuthenticationException,
+        InterruptedException {
         for (String cluster : this.clusters) {
             AssertUtil.assertSucceeded(helper.getClusterHelper().submitEntity(cluster, user));
         }
     }
 
     public void submitFeeds(ColoHelper helper)
-            throws JAXBException, IOException, URISyntaxException, AuthenticationException,
-            InterruptedException {
+        throws JAXBException, IOException, URISyntaxException, AuthenticationException,
+        InterruptedException {
         for (String feed : this.dataSets) {
             AssertUtil.assertSucceeded(helper.getFeedHelper().submitEntity(feed));
         }
@@ -798,7 +797,7 @@ public class Bundle {
     }
 
     public static void submitCluster(Bundle... bundles)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
 
         for (Bundle bundle : bundles) {
             ServiceResponse r =
@@ -862,7 +861,7 @@ public class Bundle {
     }
 
     public void submitAndScheduleBundle(ColoHelper helper, boolean checkSuccess)
-            throws IOException, JAXBException, URISyntaxException, AuthenticationException,
+        throws IOException, JAXBException, URISyntaxException, AuthenticationException,
             InterruptedException {
 
         for (int i = 0; i < getClusters().size(); i++) {

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java
index 88ea42e..3e4fc26 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java
@@ -115,7 +115,7 @@ public class LineageHelper {
      * @throws AuthenticationException
      */
     public HttpResponse runGetRequest(String url)
-            throws URISyntaxException, IOException, AuthenticationException, InterruptedException {
+        throws URISyntaxException, IOException, AuthenticationException, InterruptedException {
         final BaseRequest request = new BaseRequest(url, "get", null);
         return request.run();
     }
@@ -129,7 +129,7 @@ public class LineageHelper {
      * @throws AuthenticationException
      */
     public String runGetRequestSuccessfully(String url)
-            throws URISyntaxException, IOException, AuthenticationException, InterruptedException {
+        throws URISyntaxException, IOException, AuthenticationException, InterruptedException {
         HttpResponse response = runGetRequest(url);
         String responseString = getResponseString(response);
         LOGGER.info(Util.prettyPrintXmlOrJson(responseString));

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/FalconClientBuilder.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/FalconClientBuilder.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/FalconClientBuilder.java
index 02b7529..393541c 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/FalconClientBuilder.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/FalconClientBuilder.java
@@ -7,14 +7,13 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.apache.falcon.regression.core.interfaces;
@@ -32,7 +31,7 @@ import java.util.List;
 /**
  * FalconClientBuilder is to be used for launching falcon client command.
  */
-public class FalconClientBuilder implements Builder<CommandLine> {
+public final class FalconClientBuilder implements Builder<CommandLine> {
     private final String user;
     private final CommandLine commandLine;
     private final List<String> args;
@@ -44,14 +43,14 @@ public class FalconClientBuilder implements Builder<CommandLine> {
          */
         LIN_SUDO {
             @Override
-            public CommandLine getCommandLine(String user) {
+            public CommandLine getCommandLine(String forUser) {
                 return CommandLine.parse("sudo").addArgument("-u")
-                        .addArgument(user).addArgument(falconClientBinary);
+                    .addArgument(forUser).addArgument(FALCON_CLIENT_BINARY);
             }
             @Override
-            public void addArgsToCommandLine(CommandLine commandLine, List<String> args) {
-                for (String arg : args) {
-                    commandLine.addArgument(arg);
+            public void addArgsToCommandLine(CommandLine cmdLine, List<String> arguments) {
+                for (String arg : arguments) {
+                    cmdLine.addArgument(arg);
                 }
             }
         },
@@ -60,16 +59,16 @@ public class FalconClientBuilder implements Builder<CommandLine> {
          */
         WIN_SU {
             @Override
-            public CommandLine getCommandLine(String user) {
+            public CommandLine getCommandLine(String forUser) {
                 return CommandLine.parse(OSUtil.WIN_SU_BINARY)
-                        .addArgument("-u").addArgument(user)
-                        .addArgument("-p").addArgument(MerlinConstants.getPasswordForUser(user))
-                        .addArgument(falconClientBinary);
+                    .addArgument("-u").addArgument(forUser)
+                    .addArgument("-p").addArgument(MerlinConstants.getPasswordForUser(forUser))
+                    .addArgument(FALCON_CLIENT_BINARY);
             }
             @Override
-            public void addArgsToCommandLine(CommandLine commandLine, List<String> args) {
-                String lastArg = StringUtils.join(args, " ");
-                commandLine.addArgument(lastArg, true);
+            public void addArgsToCommandLine(CommandLine cmdLine, List<String> arguments) {
+                String lastArg = StringUtils.join(arguments, " ");
+                cmdLine.addArgument(lastArg, true);
             }
         },
         /**
@@ -77,21 +76,21 @@ public class FalconClientBuilder implements Builder<CommandLine> {
          */
         NONE {
             @Override
-            public CommandLine getCommandLine(String user) {
-                return CommandLine.parse(falconClientBinary);
+            public CommandLine getCommandLine(String forUser) {
+                return CommandLine.parse(FALCON_CLIENT_BINARY);
             }
             @Override
-            public void addArgsToCommandLine(CommandLine commandLine, List<String> args) {
-                for (String arg : args) {
-                    commandLine.addArgument(arg);
+            public void addArgsToCommandLine(CommandLine cmdLine, List<String> arguments) {
+                for (String arg : arguments) {
+                    cmdLine.addArgument(arg);
                 }
             }
         };
 
-        private static final String falconClientBinary =
+        private static final String FALCON_CLIENT_BINARY =
                 Config.getProperty("falcon.client.binary", "falcon");
-        public abstract void addArgsToCommandLine(CommandLine commandLine, List<String> args);
-        public abstract CommandLine getCommandLine(String user);
+        public abstract void addArgsToCommandLine(CommandLine cmdLine, List<String> arguments);
+        public abstract CommandLine getCommandLine(String forUser);
     }
 
     private FalconClientBuilder(String user) {
@@ -113,7 +112,7 @@ public class FalconClientBuilder implements Builder<CommandLine> {
     }
 
     /**
-     * Get an instance of FalconClientBuilder
+     * Get an instance of FalconClientBuilder.
      * @return instance of FalconClientBuilder
      */
     public static FalconClientBuilder getBuilder() {
@@ -130,7 +129,7 @@ public class FalconClientBuilder implements Builder<CommandLine> {
     }
 
     /**
-     * Add the given argument
+     * Add the given argument.
      * @param arg argument to be added to builder
      * @return this
      */
@@ -140,7 +139,7 @@ public class FalconClientBuilder implements Builder<CommandLine> {
     }
 
     /**
-     * Create submit command
+     * Create submit command.
      * @param entityType type of the entity
      * @param fileName file containing the entity to be submitted
      * @return this
@@ -153,7 +152,7 @@ public class FalconClientBuilder implements Builder<CommandLine> {
     }
 
     /**
-     * Create delete command
+     * Create delete command.
      * @param entityType type of the entity
      * @param entityName name of the entity to be deleted
      * @return this
@@ -167,7 +166,7 @@ public class FalconClientBuilder implements Builder<CommandLine> {
 
 
     /**
-     * Build the CommandLine object for this FalconClientBuilder
+     * Build the CommandLine object for this FalconClientBuilder.
      * @return instance of CommandLine object
      */
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
index 10465b5..e4ab0ee 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
@@ -257,12 +257,12 @@ public abstract class IEntityManagerHelper {
     }
 
     public ServiceResponse listEntities()
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return listEntities(null, null);
     }
 
     public ServiceResponse listEntities(String params, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         LOGGER.info("fetching " + getEntityType() + " list");
         String url = createUrl(this.hostname + URLS.LIST_URL.getValue(),
             getEntityType() + colo);
@@ -273,133 +273,133 @@ public abstract class IEntityManagerHelper {
     }
 
     public ServiceResponse listAllEntities(String params, String user)
-            throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
+        throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
         return listEntities((params == null ? "" : params + '&')
             + "numResults=" + Integer.MAX_VALUE, user);
     }
 
     public ServiceResponse submitEntity(String data)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return submitEntity(data, null);
     }
 
     public ServiceResponse submitEntity(String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         LOGGER.info("Submitting " + getEntityType() + ": \n" + Util.prettyPrintXml(data));
         return Util.sendRequest(createUrl(this.hostname + URLS.SUBMIT_URL.getValue(),
             getEntityType() + colo), "post", data, user);
     }
 
     public ServiceResponse schedule(String processData)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return schedule(processData, null);
     }
 
     public ServiceResponse schedule(String processData, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return Util.sendRequest(createUrl(this.hostname + URLS.SCHEDULE_URL.getValue(),
             getEntityType(), getEntityName(processData) + colo), "post", user);
     }
 
     public ServiceResponse submitAndSchedule(String data)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return submitAndSchedule(data, null);
     }
 
     public ServiceResponse submitAndSchedule(String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         LOGGER.info("Submitting " + getEntityType() + ": \n" + Util.prettyPrintXml(data));
         return Util.sendRequest(createUrl(this.hostname + URLS.SUBMIT_AND_SCHEDULE_URL.getValue(),
             getEntityType()), "post", data, user);
     }
 
     public ServiceResponse deleteByName(String entityName, String user)
-            throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
+        throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
         return Util.sendRequest(createUrl(this.hostname + URLS.DELETE_URL.getValue(),
             getEntityType(), entityName + colo), "delete", user);
     }
 
     public ServiceResponse delete(String data)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return delete(data, null);
     }
 
     public ServiceResponse delete(String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return Util.sendRequest(createUrl(this.hostname + URLS.DELETE_URL.getValue(),
             getEntityType(), getEntityName(data) + colo), "delete", user);
     }
 
     public ServiceResponse suspend(String data)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return suspend(data, null);
     }
 
     public ServiceResponse suspend(String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return Util.sendRequest(createUrl(this.hostname + URLS.SUSPEND_URL.getValue(),
             getEntityType(), getEntityName(data) + colo), "post", user);
     }
 
     public ServiceResponse resume(String data)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return resume(data, null);
     }
 
     public ServiceResponse resume(String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return Util.sendRequest(createUrl(this.hostname + URLS.RESUME_URL.getValue(),
             getEntityType(), getEntityName(data) + colo), "post", user);
     }
 
     public ServiceResponse getStatus(String data)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return getStatus(data, null);
     }
 
     public ServiceResponse getStatus(String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return Util.sendRequest(createUrl(this.hostname + URLS.STATUS_URL.getValue(),
             getEntityType(), getEntityName(data) + colo), "get", user);
     }
 
     public ServiceResponse getEntityDefinition(String data)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return getEntityDefinition(data, null);
     }
 
     public ServiceResponse getEntityDefinition(String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return Util.sendRequest(createUrl(this.hostname + URLS.GET_ENTITY_DEFINITION.getValue(),
             getEntityType(), getEntityName(data) + colo), "get", user);
     }
 
     public ServiceResponse getEntityDependencies(String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return Util.sendRequest(createUrl(this.hostname + URLS.DEPENDENCIES.getValue(),
             getEntityType(), getEntityName(data) + colo), "get", user);
     }
 
     public InstancesResult getRunningInstance(String name)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return getRunningInstance(name, null);
     }
 
     public InstancesResult getRunningInstance(String name, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         String url = createUrl(this.hostname + URLS.INSTANCE_RUNNING.getValue(), getEntityType(),
             name + allColo);
         return (InstancesResult) InstanceUtil.sendRequestProcessInstance(url, user);
     }
 
     public InstancesResult getProcessInstanceStatus(String entityName, String params)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return getProcessInstanceStatus(entityName, params, null);
     }
 
     public InstancesResult getProcessInstanceStatus(
         String entityName, String params, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         String url = createUrl(this.hostname + URLS.INSTANCE_STATUS.getValue(), getEntityType(),
             entityName, "");
         return (InstancesResult) InstanceUtil
@@ -408,13 +408,13 @@ public abstract class IEntityManagerHelper {
 
     public InstancesResult getProcessInstanceSuspend(
         String readEntityName, String params)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return getProcessInstanceSuspend(readEntityName, params, null);
     }
 
     public InstancesResult getProcessInstanceSuspend(
         String entityName, String params, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         String url = createUrl(this.hostname + URLS.INSTANCE_SUSPEND.getValue(), getEntityType(),
             entityName, "");
         return (InstancesResult) InstanceUtil
@@ -422,12 +422,12 @@ public abstract class IEntityManagerHelper {
     }
 
     public ServiceResponse update(String oldEntity, String newEntity)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return update(oldEntity, newEntity, null);
     }
 
     public ServiceResponse update(String oldEntity, String newEntity, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         LOGGER.info("Updating " + getEntityType() + ": \n" + Util.prettyPrintXml(oldEntity));
         LOGGER.info("To " + getEntityType() + ": \n" + Util.prettyPrintXml(newEntity));
         String url = createUrl(this.hostname + URLS.UPDATE.getValue(), getEntityType(),
@@ -437,7 +437,7 @@ public abstract class IEntityManagerHelper {
 
     public ServiceResponse update(String oldEntity, String newEntity, String updateTime,
                                   String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         LOGGER.info("Updating " + getEntityType() + ": \n" + Util.prettyPrintXml(oldEntity));
         LOGGER.info("To " + getEntityType() + ": \n" + Util.prettyPrintXml(newEntity));
         String url = this.hostname + URLS.UPDATE.getValue() + "/" + getEntityType() + "/"
@@ -448,13 +448,13 @@ public abstract class IEntityManagerHelper {
     }
 
     public InstancesResult getProcessInstanceKill(String readEntityName, String params)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return getProcessInstanceKill(readEntityName, params, null);
     }
 
     public InstancesResult getProcessInstanceKill(String entityName, String params,
                                                          String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         String url = createUrl(this.hostname + URLS.INSTANCE_KILL.getValue(), getEntityType(),
             entityName, "");
         return (InstancesResult) InstanceUtil
@@ -462,13 +462,13 @@ public abstract class IEntityManagerHelper {
     }
 
     public InstancesResult getProcessInstanceRerun(String entityName, String params)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return getProcessInstanceRerun(entityName, params, null);
     }
 
     public InstancesResult getProcessInstanceRerun(String entityName, String params,
                                                           String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         String url = createUrl(this.hostname + URLS.INSTANCE_RERUN.getValue(), getEntityType(),
             entityName, "");
         return (InstancesResult) InstanceUtil
@@ -476,13 +476,13 @@ public abstract class IEntityManagerHelper {
     }
 
     public InstancesResult getProcessInstanceResume(String entityName, String params)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return getProcessInstanceResume(entityName, params, null);
     }
 
     public InstancesResult getProcessInstanceResume(String entityName, String params,
                                                            String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         String url = createUrl(this.hostname + URLS.INSTANCE_RESUME.getValue(), getEntityType(),
             entityName, "");
         return (InstancesResult) InstanceUtil
@@ -518,7 +518,7 @@ public abstract class IEntityManagerHelper {
     }
 
     public InstancesResult getInstanceParams(String entityName, String params)
-            throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
+        throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
         String url = createUrl(this.hostname + URLS.INSTANCE_PARAMS.getValue(), getEntityType(),
             entityName, "");
         return (InstancesResult) InstanceUtil
@@ -534,7 +534,7 @@ public abstract class IEntityManagerHelper {
      * @throws URISyntaxException
      */
     public ServiceResponse getListByPipeline(String pipeline)
-            throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
+        throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
         String url = createUrl(this.hostname + URLS.LIST_URL.getValue() + "/" + getEntityType());
         url += "?filterBy=PIPELINES:" + pipeline;
         return Util.sendRequest(url, "get", null, null);
@@ -577,7 +577,7 @@ public abstract class IEntityManagerHelper {
      * @return entity summary along with its instances.
      */
     public ServiceResponse getEntitySummary(String clusterName, String params)
-            throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
+        throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
         String url = createUrl(this.hostname + URLS.ENTITY_SUMMARY.getValue(),
             getEntityType()) +"?cluster=" + clusterName;
         if (StringUtils.isNotEmpty(params)) {
@@ -594,7 +594,7 @@ public abstract class IEntityManagerHelper {
      * @return response
      */
     public InstancesResult listInstances(String entityName, String params, String user)
-            throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
+        throws AuthenticationException, IOException, URISyntaxException, InterruptedException {
         String url = createUrl(this.hostname + URLS.INSTANCE_LIST.getValue(), getEntityType(),
             entityName + colo);
         if (StringUtils.isNotEmpty(params)) {

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
index ee98e51..a42416a 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Edge.java
@@ -52,35 +52,41 @@ public class Edge extends GraphEntity {
         @SerializedName("third")THIRD,
         @SerializedName("value")VALUE,
     }
+    @SerializedName("_id")
+    private String id;
 
-    private String _id;
-    private int _outV;
-    private int _inV;
-    private LEBEL_TYPE _label;
+    @SerializedName("_outV")
+    private int outV;
 
-    public String get_id() {
-        return _id;
+    @SerializedName("_inV")
+    private int inV;
+
+    @SerializedName("_label")
+    private LEBEL_TYPE label;
+
+    public String getId() {
+        return id;
     }
 
-    public int get_outV() {
-        return _outV;
+    public int getOutV() {
+        return outV;
     }
 
-    public int get_inV() {
-        return _inV;
+    public int getInV() {
+        return inV;
     }
 
-    public LEBEL_TYPE get_label() {
-        return _label;
+    public LEBEL_TYPE getLabel() {
+        return label;
     }
 
     @Override
     public String toString() {
         return "Edge{"
-                + "_id='" + _id + '\''
-                + ", _outV=" + _outV
-                + ", _inV=" + _inV
-                + ", _label=" + _label
+                + "_id='" + id + '\''
+                + ", _outV=" + outV
+                + ", _inV=" + inV
+                + ", _label=" + label
                 + '}';
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java
index 21d897c..357e340 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java
@@ -41,7 +41,7 @@ public class EdgesResult extends GraphResult {
     public List<Edge> filterEdgesByType(List<Edge> edges, Edge.LEBEL_TYPE edgeLabel) {
         final List<Edge> result = new ArrayList<Edge>();
         for (Edge edge : edges) {
-            if (edge.get_label() == edgeLabel) {
+            if (edge.getLabel() == edgeLabel) {
                 result.add(edge);
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphEntity.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphEntity.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphEntity.java
index d35ced6..87ca65b 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphEntity.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphEntity.java
@@ -18,12 +18,15 @@
 
 package org.apache.falcon.regression.core.response.lineage;
 
+import com.google.gson.annotations.SerializedName;
+
 /** Abstract class for graph entities. */
 public abstract class GraphEntity {
-    NODE_TYPE _type;
+    @SerializedName("_type")
+    protected NODE_TYPE nodeType;
 
-    public NODE_TYPE get_type() {
-        return _type;
+    public NODE_TYPE getNodeType() {
+        return nodeType;
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphResult.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphResult.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphResult.java
index d4be61d..aba5c4c 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphResult.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/GraphResult.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /** Abstract class for representing a result of lineage api call.*/
 public abstract class GraphResult {
-    int totalSize;
+    protected int totalSize;
 
     public int getTotalSize() {
         return totalSize;

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
index acd7be8..5bbe72f 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/Vertex.java
@@ -55,8 +55,10 @@ public class Vertex extends GraphEntity {
         }
     }
 
-    private int _id;
+    @SerializedName("_id")
+    private int id;
     private String name;
+
     private VERTEX_TYPE type;
     private String timestamp;
     private String version;
@@ -71,8 +73,8 @@ public class Vertex extends GraphEntity {
     private String workflowEngineUrl;
     private String subflowId;
 
-    public int get_id() {
-        return _id;
+    public int getId() {
+        return id;
     }
 
     public String getTimestamp() {
@@ -94,8 +96,8 @@ public class Vertex extends GraphEntity {
     @Override
     public String toString() {
         return "Vertex{"
-                + "_id=" + _id
-                + ", _type=" + _type
+                + "_id=" + id
+                + ", _type=" + nodeType
                 + ", name='" + name + '\''
                 + ", type=" + type
                 + ", timestamp='" + timestamp + '\''
@@ -122,7 +124,7 @@ public class Vertex extends GraphEntity {
 
         Vertex vertex = (Vertex) o;
 
-        if (_id != vertex._id || !name.equals(vertex.name)
+        if (id != vertex.id || !name.equals(vertex.name)
                 || (runId != null ? !runId.equals(vertex.runId) : vertex.runId != null)
                 || (status != null ? !status.equals(vertex.status) : vertex.status != null)
                 || (subflowId != null ? !subflowId.equals(vertex.subflowId)
@@ -151,7 +153,7 @@ public class Vertex extends GraphEntity {
 
     @Override
     public int hashCode() {
-        int result = _id;
+        int result = id;
         result = 31 * result + name.hashCode();
         result = 31 * result + type.hashCode();
         result = 31 * result + timestamp.hashCode();

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/ExecResult.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/ExecResult.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/ExecResult.java
index c5172eb..8ce7342 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/ExecResult.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/ExecResult.java
@@ -20,6 +20,9 @@ package org.apache.falcon.regression.core.supportClasses;
 
 import org.apache.commons.exec.CommandLine;
 
+/**
+ * Class with result of command line execution.
+ */
 public final class ExecResult {
 
     private final int exitVal;
@@ -57,11 +60,11 @@ public final class ExecResult {
 
     @Override
     public String toString() {
-        return "ExecResult{" +
-                "exitVal=" + exitVal +
-                ", output='" + output + '\'' +
-                ", error='" + error + '\'' +
-                ", commandLine=" + commandLine +
-                '}';
+        return "ExecResult{"
+                + "exitVal=" + exitVal
+                + ", output='" + output + '\''
+                + ", error='" + error + '\''
+                + ", commandLine=" + commandLine
+                + '}';
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java
index 11758ff..80f2b0f 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/AssertUtil.java
@@ -208,7 +208,7 @@ public final class AssertUtil {
     }
 
     /**
-     * Assert that command executed unsuccessfully
+     * Assert that command executed unsuccessfully.
      *
      * @param execResult ExecResult of the command execution
      */

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
index ee0c072..7ead733 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
@@ -152,7 +152,7 @@ public final class BundleUtil {
     }
 
     public static void submitAllClusters(ColoHelper prismHelper, Bundle... b)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         for (Bundle aB : b) {
             ServiceResponse r = prismHelper.getClusterHelper().submitEntity(aB.getClusters().get(0));
             Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
index 6e99f4d..8cc6121 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
@@ -45,27 +45,27 @@ public final class CleanupUtil {
     private static final Logger LOGGER = Logger.getLogger(CleanupUtil.class);
 
     public static List<String> getAllProcesses(ColoHelper prism)
-            throws IOException, URISyntaxException, AuthenticationException, JAXBException,
-            InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, JAXBException,
+        InterruptedException {
         return getAllEntitiesOfOneType(prism.getProcessHelper(), null);
     }
 
     public static List<String> getAllFeeds(ColoHelper prism)
-            throws IOException, URISyntaxException, AuthenticationException, JAXBException,
-            InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, JAXBException,
+        InterruptedException {
         return getAllEntitiesOfOneType(prism.getFeedHelper(), null);
     }
 
     public static List<String> getAllClusters(ColoHelper prism)
-            throws IOException, URISyntaxException, AuthenticationException, JAXBException,
-            InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, JAXBException,
+        InterruptedException {
         return getAllEntitiesOfOneType(prism.getClusterHelper(), null);
     }
 
     public static List<String> getAllEntitiesOfOneType(IEntityManagerHelper iEntityManagerHelper,
                                                        String user)
-            throws IOException, URISyntaxException, AuthenticationException, JAXBException,
-            InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, JAXBException,
+        InterruptedException {
         final EntityList entityList = getEntitiesResultOfOneType(iEntityManagerHelper, user);
         List<String> clusters = new ArrayList<String>();
         for (EntityList.EntityElement entity : entityList.getElements()) {
@@ -76,8 +76,8 @@ public final class CleanupUtil {
 
     private static EntityList getEntitiesResultOfOneType(
         IEntityManagerHelper iEntityManagerHelper, String user)
-            throws IOException, URISyntaxException, AuthenticationException, JAXBException,
-            InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, JAXBException,
+        InterruptedException {
         final ServiceResponse clusterResponse = iEntityManagerHelper.listAllEntities(null, user);
         JAXBContext jc = JAXBContext.newInstance(EntityList.class);
         Unmarshaller u = jc.createUnmarshaller();

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/FileUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/FileUtil.java
index 1a97e1d..a969f1f 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/FileUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/FileUtil.java
@@ -7,14 +7,13 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.apache.falcon.regression.core.util;
@@ -24,9 +23,11 @@ import org.apache.log4j.Logger;
 
 import java.io.File;
 import java.io.IOException;
-
-public class FileUtil {
-    private static final Logger logger = Logger.getLogger(FileUtil.class);
+/**
+ * Util class for local files.
+ */
+public final class FileUtil {
+    private static final Logger LOGGER = Logger.getLogger(FileUtil.class);
     private FileUtil() {
     }
 
@@ -39,7 +40,7 @@ public class FileUtil {
     public static String writeEntityToFile(String entity) throws IOException {
         final String entityName = Util.readEntityName(entity);
         final File entityFile = new File(entityName + ".xml");
-        logger.info("attempting to write: " + entityName + " at location "
+        LOGGER.info("attempting to write: " + entityName + " at location "
             + entityFile.getAbsolutePath());
         FileUtils.write(entityFile, entity);
         return entityFile.getAbsolutePath();

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
index 9d75591..b87dd4e 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/GraphAssert.java
@@ -56,9 +56,9 @@ public final class GraphAssert {
         Assert.assertEquals(verticesResult.getResults().size(), verticesResult.getTotalSize(),
             "Size of vertices don't match");
         for (Vertex vertex : verticesResult.getResults()) {
-            Assert.assertNotNull(vertex.get_id(),
+            Assert.assertNotNull(vertex.getId(),
                 "id of the vertex should be non-null: " + vertex);
-            Assert.assertEquals(vertex.get_type(), NODE_TYPE.VERTEX,
+            Assert.assertEquals(vertex.getNodeType(), NODE_TYPE.VERTEX,
                 "_type of the vertex should be non-null: " + vertex);
             Assert.assertNotNull(vertex.getName(),
                 "name of the vertex should be non-null: " + vertex);
@@ -86,12 +86,12 @@ public final class GraphAssert {
      * @param edge edge to be checked
      */
     public static void assertEdgeSanity(Edge edge) {
-        Assert.assertNotNull(edge.get_id(), "id of an edge can't be null: " + edge);
-        Assert.assertEquals(edge.get_type(), NODE_TYPE.EDGE,
+        Assert.assertNotNull(edge.getId(), "id of an edge can't be null: " + edge);
+        Assert.assertEquals(edge.getNodeType(), NODE_TYPE.EDGE,
             "_type of an edge can't be null: " + edge);
-        Assert.assertNotNull(edge.get_label(), "_label of an edge can't be null: " + edge);
-        Assert.assertTrue(edge.get_inV() > 0, "_inV of an edge can't be null: " + edge);
-        Assert.assertTrue(edge.get_outV() > 0, "_outV of an edge can't be null: " + edge);
+        Assert.assertNotNull(edge.getLabel(), "_label of an edge can't be null: " + edge);
+        Assert.assertTrue(edge.getInV() > 0, "_inV of an edge can't be null: " + edge);
+        Assert.assertTrue(edge.getOutV() > 0, "_outV of an edge can't be null: " + edge);
     }
 
     /**
@@ -159,7 +159,7 @@ public final class GraphAssert {
                                                   final int minOccurrence) {
         int occurrence = 0;
         for(Edge edge : edgesResult.getResults()) {
-            if (edge.get_label() == edgeLabel) {
+            if (edge.getLabel() == edgeLabel) {
                 LOGGER.info("Found edge: " + edge);
                 occurrence++;
                 if (occurrence >= minOccurrence) {

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
index ba9c419..1b70faa 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
@@ -93,7 +93,7 @@ public final class InstanceUtil {
 
     public static APIResult sendRequestProcessInstance(String
             url, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return hitUrl(url, Util.getMethodType(url), user);
     }
 
@@ -617,20 +617,25 @@ public final class InstanceUtil {
             String clusterName,
             ClusterType clusterType, String partition,
             String... locations) {
-        return setFeedClusterWithTable(feed, feedValidity, feedRetention, clusterName, clusterType,
-                partition, null, locations);
+        Cluster feedCluster = createFeedCluster(feedValidity, feedRetention, clusterName,
+                clusterType, partition, null, locations);
+        return setFeedCluster(feed, clusterName, feedCluster);
     }
 
     public static String setFeedClusterWithTable(String feed, Validity feedValidity,
-            Retention feedRetention, String clusterName,
-            ClusterType clusterType, String partition,
-            String tableUri, String... locations) {
+                                                 Retention feedRetention, String clusterName,
+                                                 ClusterType clusterType, String partition,
+                                                 String tableUri) {
+        Cluster feedCluster = createFeedCluster(feedValidity, feedRetention, clusterName,
+                    clusterType, partition, tableUri, null);
+        return setFeedCluster(feed, clusterName, feedCluster);
+    }
+
+    private static String setFeedCluster(String feed, String clusterName, Cluster feedCluster) {
         FeedMerlin f = new FeedMerlin(feed);
         if (clusterName == null) {
             f.getClusters().getClusters().clear();
         } else {
-            Cluster feedCluster = createFeedCluster(feedValidity, feedRetention, clusterName,
-                    clusterType, partition, tableUri, locations);
             f.getClusters().getClusters().add(feedCluster);
         }
         return f.toString();
@@ -645,7 +650,9 @@ public final class InstanceUtil {
     private static Cluster createFeedCluster(
             Validity feedValidity, Retention feedRetention, String clusterName, ClusterType clusterType,
             String partition, String tableUri, String[] locations) {
-
+        if (clusterName == null) {
+            return null;
+        }
         Cluster cluster = new Cluster();
         cluster.setName(clusterName);
         cluster.setRetention(feedRetention);
@@ -710,7 +717,7 @@ public final class InstanceUtil {
      */
     public static APIResult createAndSendRequestProcessInstance(
             String url, String params, String colo, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         if (params != null && !colo.equals("")) {
             url = url + params + "&" + colo.substring(1);
         } else if (params != null) {
@@ -1037,7 +1044,7 @@ public final class InstanceUtil {
             LOGGER.info(String.format("Try %d of %d", (i + 1), maxTries));
             CoordinatorJob coordinatorJob = client.getCoordJobInfo(coordId);
             final Status coordinatorStatus = coordinatorJob.getStatus();
-            if(expectedStatus != CoordinatorAction.Status.TIMEDOUT){
+            if (expectedStatus != CoordinatorAction.Status.TIMEDOUT){
                 Assert.assertTrue(RUNNING_PREP_SUCCEEDED.contains(coordinatorStatus),
                         String.format("Coordinator %s should be running/prep but is %s.", coordId, coordinatorStatus));
             }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java
index dd9fe5c..dc3dfae 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/KerberosHelper.java
@@ -20,7 +20,6 @@ package org.apache.falcon.regression.core.util;
 
 import org.apache.falcon.regression.core.enumsAndConstants.MerlinConstants;
 import org.apache.hadoop.security.UserGroupInformation;
-import org.testng.Assert;
 import org.apache.log4j.Logger;
 
 import java.io.IOException;
@@ -41,8 +40,8 @@ public final class KerberosHelper {
             return UserGroupInformation.createRemoteUser(user);
         }
         // if secure create a ugi object from keytab
-        return UserGroupInformation.loginUserFromKeytabAndReturnUGI(getPrincipal(user), getKeyTab
-                (user));
+        return UserGroupInformation.loginUserFromKeytabAndReturnUGI(getPrincipal(user),
+            getKeyTab(user));
     }
 
     private static String getKeyTab(String user) {

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/LogUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/LogUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/LogUtil.java
index ae157ad..5ab64ec 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/LogUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/LogUtil.java
@@ -37,12 +37,15 @@ import java.io.PrintStream;
 import java.util.Collection;
 import java.util.List;
 
-public class LogUtil {
-    private static final Logger logger = Logger.getLogger(LogUtil.class);
-    private static final char nl = '\n';
-    private static final String hr = StringUtils.repeat("-", 80);
-    private static final String hr2 = StringUtils.repeat("-", 120);
-    private static final String hr3 = StringUtils.repeat("-", 160);
+/**
+ * Util class for managing logs.
+ */
+public final class LogUtil {
+    private static final Logger LOGGER = Logger.getLogger(LogUtil.class);
+    private static final char NL = '\n';
+    private static final String HR = StringUtils.repeat("-", 80);
+    private static final String HR_2 = StringUtils.repeat("-", 120);
+    private static final String HR_3 = StringUtils.repeat("-", 160);
 
     private LogUtil() {
         throw new AssertionError("Instantiating utility class...");
@@ -56,15 +59,15 @@ public class LogUtil {
                 try {
                     bundleJobsInfo = oozieClient.getBundleJobsInfo("", 0, 1000000);
                 } catch (OozieClientException e) {
-                    logger.error("Couldn't fetch list of bundles. Exception: " + e);
+                    LOGGER.error("Couldn't fetch list of bundles. Exception: " + e);
                     return;
                 }
                 for (BundleJob oneJobInfo : bundleJobsInfo) {
                     final String bundleJobId = oneJobInfo.getId();
-                    if(!skipInfo()) {
+                    if (!skipInfo()) {
                         writeOneJobInfo(oozieClient, bundleJobId, location, filter);
                     }
-                    if(!skipLog()) {
+                    if (!skipLog()) {
                         writeOneJobLog(oozieClient, bundleJobId, location, filter);
                     }
                 }
@@ -88,37 +91,37 @@ public class LogUtil {
                 try {
                     info = oozieClient.getBundleJobInfo(bundleJobId);
                 } catch (OozieClientException e) {
-                    logger.error("Couldn't fetch bundle info for " + bundleJobId + ". " +
-                        "Exception: " + e);
+                    LOGGER.error("Couldn't fetch bundle info for " + bundleJobId + ". "
+                        + "Exception: " + e);
                     return;
                 }
                 StringBuilder sb = new StringBuilder();
-                sb.append("Bundle ID : ").append(info.getId()).append(nl);
-                sb.append(hr).append(nl);
-                sb.append("Bundle Name : ").append(info.getAppName()).append(nl);
-                sb.append("App Path : ").append(info.getAppPath()).append(nl);
-                sb.append("Status : ").append(info.getStatus()).append(nl);
-                sb.append("User : ").append(info.getUser()).append(nl);
-                sb.append("Created : ").append(info.getCreatedTime()).append(nl);
-                sb.append("Started : ").append(info.getStartTime()).append(nl);
-                sb.append("EndTime : ").append(info.getEndTime()).append(nl);
-                sb.append("Kickoff time : ").append(info.getKickoffTime()).append(nl);
-                sb.append(hr2).append(nl);
+                sb.append("Bundle ID : ").append(info.getId()).append(NL);
+                sb.append(HR).append(NL);
+                sb.append("Bundle Name : ").append(info.getAppName()).append(NL);
+                sb.append("App Path : ").append(info.getAppPath()).append(NL);
+                sb.append("Status : ").append(info.getStatus()).append(NL);
+                sb.append("User : ").append(info.getUser()).append(NL);
+                sb.append("Created : ").append(info.getCreatedTime()).append(NL);
+                sb.append("Started : ").append(info.getStartTime()).append(NL);
+                sb.append("EndTime : ").append(info.getEndTime()).append(NL);
+                sb.append("Kickoff time : ").append(info.getKickoffTime()).append(NL);
+                sb.append(HR_2).append(NL);
                 final String format = "%-40s %-10s %-5s %-10s %-30s %-20s";
                 sb.append(String.format(format,
-                    "Job ID", "Status", "Freq", "Unit", "Started", "Next Materialized")).append(nl);
-                sb.append(hr2).append(nl);
+                    "Job ID", "Status", "Freq", "Unit", "Started", "Next Materialized")).append(NL);
+                sb.append(HR_2).append(NL);
                 for (CoordinatorJob cj : info.getCoordinators()) {
                     sb.append(String.format(format,
                         cj.getId(), cj.getStatus(),  cj.getFrequency(), cj.getTimeUnit(), cj.getStartTime(),
-                        cj.getNextMaterializedTime())).append(nl);
+                        cj.getNextMaterializedTime())).append(NL);
                 }
-                sb.append(hr2).append(nl);
+                sb.append(HR_2).append(NL);
                 try {
                     FileUtils.writeStringToFile(file, sb.toString());
                 } catch (IOException e) {
-                    logger.error("Couldn't write bundle info for " + bundleJobId + ". " +
-                        "Exception: " + e);
+                    LOGGER.error("Couldn't write bundle info for " + bundleJobId + ". "
+                        + "Exception: " + e);
                 }
             }
         },
@@ -130,15 +133,15 @@ public class LogUtil {
                 try {
                     coordJobsInfo = oozieClient.getCoordJobsInfo("", 0, 1000000);
                 } catch (OozieClientException e) {
-                    logger.error("Couldn't fetch list of bundles. Exception: " + e);
+                    LOGGER.error("Couldn't fetch list of bundles. Exception: " + e);
                     return;
                 }
                 for (CoordinatorJob oneJobInfo : coordJobsInfo) {
                     final String coordJobId = oneJobInfo.getId();
-                    if(!skipInfo()) {
+                    if (!skipInfo()) {
                         writeOneJobInfo(oozieClient, coordJobId, location, filter);
                     }
-                    if(!skipLog()) {
+                    if (!skipLog()) {
                         writeOneJobLog(oozieClient, coordJobId, location, filter);
                     }
                 }
@@ -162,35 +165,36 @@ public class LogUtil {
                 try {
                     info = oozieClient.getCoordJobInfo(coordJobId);
                 } catch (OozieClientException e) {
-                    logger.error("Couldn't fetch bundle info for " + coordJobId + ". " +
-                        "Exception: " + e);
+                    LOGGER.error("Couldn't fetch bundle info for " + coordJobId + ". "
+                        + "Exception: " + e);
                     return;
                 }
                 StringBuilder sb = new StringBuilder();
-                sb.append("Coordinator Job ID : ").append(info.getId()).append(nl);
-                sb.append(hr).append(nl);
-                sb.append("Job Name : ").append(info.getAppName()).append(nl);
-                sb.append("App Path : ").append(info.getAppPath()).append(nl);
-                sb.append("Status : ").append(info.getStatus()).append(nl);
-                sb.append("User : ").append(info.getUser()).append(nl);
-                sb.append("Started : ").append(info.getStartTime()).append(nl);
-                sb.append("EndTime : ").append(info.getEndTime()).append(nl);
-                sb.append(hr3).append(nl);
+                sb.append("Coordinator Job ID : ").append(info.getId()).append(NL);
+                sb.append(HR).append(NL);
+                sb.append("Job Name : ").append(info.getAppName()).append(NL);
+                sb.append("App Path : ").append(info.getAppPath()).append(NL);
+                sb.append("Status : ").append(info.getStatus()).append(NL);
+                sb.append("User : ").append(info.getUser()).append(NL);
+                sb.append("Started : ").append(info.getStartTime()).append(NL);
+                sb.append("EndTime : ").append(info.getEndTime()).append(NL);
+                sb.append(HR_3).append(NL);
                 final String format = "%-40s %-10s %-40s %-10s %-30s %-30s";
                 sb.append(String.format(format,
-                    "Job ID", "Status", "Ext ID", "Err Code", "Created","Nominal Time")).append(nl);
-                sb.append(hr3).append(nl);
+                    "Job ID", "Status", "Ext ID", "Err Code", "Created",
+                    "Nominal Time")).append(NL);
+                sb.append(HR_3).append(NL);
                 for (CoordinatorAction cj : info.getActions()) {
                     sb.append(String.format(format,
                         cj.getId(), cj.getStatus(),  cj.getExternalId(), cj.getErrorCode(),
-                        cj.getCreatedTime(), cj.getNominalTime())).append(nl);
+                        cj.getCreatedTime(), cj.getNominalTime())).append(NL);
                 }
-                sb.append(hr3).append(nl);
+                sb.append(HR_3).append(NL);
                 try {
                     FileUtils.writeStringToFile(file, sb.toString());
                 } catch (IOException e) {
-                    logger.error("Couldn't write coord job info for " + coordJobId + ". " +
-                        "Exception: " + e);
+                    LOGGER.error("Couldn't write coord job info for " + coordJobId + ". "
+                        + "Exception: " + e);
                 }
             }
         },
@@ -202,15 +206,15 @@ public class LogUtil {
                 try {
                     wfJobsInfo = oozieClient.getJobsInfo("", 0, 1000000);
                 } catch (OozieClientException e) {
-                    logger.error("Couldn't fetch list of bundles. Exception: " + e);
+                    LOGGER.error("Couldn't fetch list of bundles. Exception: " + e);
                     return;
                 }
                 for (WorkflowJob oneJobInfo : wfJobsInfo) {
                     final String wfJobId = oneJobInfo.getId();
-                    if(!skipInfo()) {
+                    if (!skipInfo()) {
                         writeOneJobInfo(oozieClient, wfJobId, location, filter);
                     }
-                    if(!skipLog()) {
+                    if (!skipLog()) {
                         writeOneJobLog(oozieClient, wfJobId, location, filter);
                     }
                 }
@@ -234,43 +238,42 @@ public class LogUtil {
                 try {
                     info = oozieClient.getJobInfo(wfJobId);
                 } catch (OozieClientException e) {
-                    logger.error("Couldn't fetch bundle info for " + wfJobId + ". Exception: " + e);
+                    LOGGER.error("Couldn't fetch bundle info for " + wfJobId + ". Exception: " + e);
                     return;
                 }
                 StringBuilder sb = new StringBuilder();
-                sb.append("Workflow Job ID : ").append(info.getId()).append(nl);
-                sb.append(hr).append(nl);
-                sb.append("Wf Name : ").append(info.getAppName()).append(nl);
-                sb.append("App Path : ").append(info.getAppPath()).append(nl);
-                sb.append("Status : ").append(info.getStatus()).append(nl);
-                sb.append("Run : ").append(info.getRun()).append(nl);
-                sb.append("User : ").append(info.getUser()).append(nl);
-                sb.append("Group : ").append(info.getGroup()).append(nl);
-                sb.append("Created : ").append(info.getCreatedTime()).append(nl);
-                sb.append("Started : ").append(info.getStartTime()).append(nl);
-                sb.append("Last Modified : ").append(info.getLastModifiedTime()).append(nl);
-                sb.append("EndTime : ").append(info.getEndTime()).append(nl);
-                sb.append("External ID : ").append(info.getExternalId()).append(nl);
-                sb.append(nl).append("Actions").append(nl);
-                sb.append(hr3).append(nl);
+                sb.append("Workflow Job ID : ").append(info.getId()).append(NL);
+                sb.append(HR).append(NL);
+                sb.append("Wf Name : ").append(info.getAppName()).append(NL);
+                sb.append("App Path : ").append(info.getAppPath()).append(NL);
+                sb.append("Status : ").append(info.getStatus()).append(NL);
+                sb.append("Run : ").append(info.getRun()).append(NL);
+                sb.append("User : ").append(info.getUser()).append(NL);
+                sb.append("Group : ").append(info.getGroup()).append(NL);
+                sb.append("Created : ").append(info.getCreatedTime()).append(NL);
+                sb.append("Started : ").append(info.getStartTime()).append(NL);
+                sb.append("Last Modified : ").append(info.getLastModifiedTime()).append(NL);
+                sb.append("EndTime : ").append(info.getEndTime()).append(NL);
+                sb.append("External ID : ").append(info.getExternalId()).append(NL);
+                sb.append(NL).append("Actions").append(NL);
+                sb.append(HR_3).append(NL);
                 final String format = "%-80s %-10s %-40s %-15s %-10s";
                 sb.append(String.format(format,
-                    "Job ID", "Status", "Ext ID", "Ext Status", "Err Code")).append(nl);
-                sb.append(hr3).append(nl);
+                    "Job ID", "Status", "Ext ID", "Ext Status", "Err Code")).append(NL);
+                sb.append(HR_3).append(NL);
                 for (WorkflowAction cj : info.getActions()) {
                     sb.append(String.format(format,
                         cj.getId(), cj.getStatus(),  cj.getExternalId(), cj.getExternalStatus(),
-                        cj.getErrorCode())).append(nl);
+                        cj.getErrorCode())).append(NL);
                 }
-                sb.append(hr3).append(nl);
+                sb.append(HR_3).append(NL);
                 try {
                     FileUtils.writeStringToFile(file, sb.toString());
                 } catch (IOException e) {
-                    logger.error("Couldn't write wf job info for " + wfJobId + ". Exception: " + e);
+                    LOGGER.error("Couldn't write wf job info for " + wfJobId + ". Exception: " + e);
                 }
             }
-        },
-        ;
+        };
 
         private static boolean skipInfo() {
             return Config.getBoolean("log.capture.oozie.skip_info", false);
@@ -281,7 +284,7 @@ public class LogUtil {
         }
 
         /**
-         * Pull and dump info and log of all jobs of a type
+         * Pull and dump info and log of all jobs of a type.
          * @param oozieClient oozie client that will be used for pulling log
          * @param location local location where logs will be dumped
          * @param filter list of files that have already been dumped
@@ -306,9 +309,9 @@ public class LogUtil {
             try {
                 oozieClient.getJobLog(jobId, "", "", new PrintStream(file));
             } catch (OozieClientException e) {
-                logger.error("Couldn't fetch log for " + jobId + ". Exception: " + e);
+                LOGGER.error("Couldn't fetch log for " + jobId + ". Exception: " + e);
             } catch (FileNotFoundException e) {
-                logger.error("Couldn't write log for " + jobId + ". Exception: " + e);
+                LOGGER.error("Couldn't write log for " + jobId + ". Exception: " + e);
             }
         }
     }
@@ -328,7 +331,7 @@ public class LogUtil {
             try {
                 FileUtils.forceMkdir(directory);
             } catch (IOException e) {
-                logger.error("Directory creation failed for: " + directory + ". Exception: " + e);
+                LOGGER.error("Directory creation failed for: " + directory + ". Exception: " + e);
                 return;
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/MathUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/MathUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/MathUtil.java
index 7c6c73d..f090356 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/MathUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/MathUtil.java
@@ -23,19 +23,22 @@ import org.testng.Assert;
 
 import java.util.Arrays;
 
-public class MathUtil {
+/**
+ * Util class for math operations.
+ */
+public final class MathUtil {
     private MathUtil() {
         throw new AssertionError("Instantiating utility class...");
     }
 
     /**
-     * Cross product many arrays
+     * Cross product many arrays.
      * @param firstArray first array that you want to cross product
      * @param otherArrays other arrays that you want to cross product
      * @return cross product
      */
     public static Object[][] crossProduct(Object[] firstArray, Object[]... otherArrays) {
-        if(otherArrays == null || otherArrays.length == 0) {
+        if (otherArrays == null || otherArrays.length == 0) {
             Object[][] result = new Object[firstArray.length][1];
             for (int i = 0; i < firstArray.length; ++i) {
                 result[i][0] = firstArray[i];

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java
index c6217c1..b061700 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java
@@ -246,7 +246,7 @@ public final class OozieUtil {
 
 
     public static List<String> getMissingDependencies(ColoHelper helper, String bundleID)
-            throws OozieClientException {
+        throws OozieClientException {
         CoordinatorJob jobInfo;
         jobInfo = null;
         OozieClient oozieClient = helper.getClusterHelper().getOozieClient();
@@ -257,16 +257,15 @@ public final class OozieUtil {
             for (CoordinatorJob coord : bundleJob.getCoordinators()) {
                 LOGGER.info("Appname is : " + coord.getAppName());
                 if ((coord.getAppName().contains("DEFAULT") && coord.getAppName().contains("PROCESS"))
-                        ||
-                        (coord.getAppName().contains("REPLICATION") && coord.getAppName().contains("FEED")))
+                        || (coord.getAppName().contains("REPLICATION") && coord.getAppName()
+                            .contains("FEED"))) {
                     jobInfo = oozieClient.getCoordJobInfo(coord.getId());
-                else {
+                } else {
                     LOGGER.info("Desired coord does not exists on " + oozieClient.getOozieUrl());
                 }
             }
 
-        }
-        else {
+        } else {
             jobInfo = oozieClient.getCoordJobInfo(bundleJob.getCoordinators().get(0).getId());
         }
 
@@ -491,7 +490,7 @@ public final class OozieUtil {
     }
 
     public static void createMissingDependenciesForBundle(ColoHelper helper, String bundleId)
-            throws OozieClientException, IOException {
+        throws OozieClientException, IOException {
         OozieClient oozieClient = helper.getClusterHelper().getOozieClient();
         List<CoordinatorJob> coords = oozieClient.getBundleJobInfo(bundleId).getCoordinators();
         for (CoordinatorJob coord : coords) {
@@ -506,9 +505,10 @@ public final class OozieUtil {
         }
     }
 
-    public static void validateRetryAttempts(ColoHelper helper, String bundleId,EntityType type, int attempts) throws OozieClientException {
+    public static void validateRetryAttempts(ColoHelper helper, String bundleId, EntityType type,
+                                             int attempts) throws OozieClientException {
         OozieClient oozieClient = helper.getClusterHelper().getOozieClient();
-        CoordinatorJob coord = getDefaultOozieCoord(helper, bundleId,type);
+        CoordinatorJob coord = getDefaultOozieCoord(helper, bundleId, type);
         int actualRun = oozieClient.getJobInfo(coord.getActions().get(0).getExternalId()).getRun();
         LOGGER.info("Actual run count: " + actualRun); // wrt 0
         Assert.assertEquals(actualRun, attempts, "Rerun attempts did not match");

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
index 97c6c75..be28344 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
@@ -94,7 +94,7 @@ public final class Util {
      * Sends request without data and user.
      */
     public static ServiceResponse sendRequest(String url, String method)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return sendRequest(url, method, null, null);
     }
 
@@ -102,7 +102,7 @@ public final class Util {
      * Sends api request without data.
      */
     public static ServiceResponse sendRequest(String url, String method, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         return sendRequest(url, method, null, user);
     }
 
@@ -118,7 +118,7 @@ public final class Util {
      * @throws AuthenticationException
      */
     public static ServiceResponse sendRequest(String url, String method, String data, String user)
-            throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
+        throws IOException, URISyntaxException, AuthenticationException, InterruptedException {
         BaseRequest request = new BaseRequest(url, method, user, data);
         request.addHeader(RequestKeys.CONTENT_TYPE_HEADER, RequestKeys.XML_CONTENT_TYPE);
         HttpResponse response = request.run();
@@ -407,7 +407,7 @@ public final class Util {
      * @throws URISyntaxException
      */
     public static void startService(IEntityManagerHelper helper)
-            throws IOException, JSchException, AuthenticationException, URISyntaxException,
+        throws IOException, JSchException, AuthenticationException, URISyntaxException,
             InterruptedException {
         ExecUtil.runRemoteScriptAsSudo(helper.getQaHost(), helper.getUsername(),
             helper.getPassword(), helper.getServiceStartCmd(), helper.getServiceUser(),
@@ -436,8 +436,8 @@ public final class Util {
      * @throws URISyntaxException
      */
     public static void restartService(IEntityManagerHelper helper)
-            throws IOException, JSchException, AuthenticationException, URISyntaxException,
-            InterruptedException {
+        throws IOException, JSchException, AuthenticationException, URISyntaxException,
+        InterruptedException {
         LOGGER.info("restarting service for: " + helper.getQaHost());
         shutDownService(helper);
         startService(helper);
@@ -573,8 +573,8 @@ public final class Util {
      */
     public static boolean isDefinitionSame(ColoHelper server1, ColoHelper server2,
                                            String entity)
-            throws URISyntaxException, IOException, AuthenticationException, JAXBException,
-            SAXException, InterruptedException {
+        throws URISyntaxException, IOException, AuthenticationException, JAXBException,
+        SAXException, InterruptedException {
         return XmlUtil.isIdentical(getEntityDefinition(server1, entity, true),
             getEntityDefinition(server2, entity, true));
     }


Mime
View raw message