Repository: falcon Updated Branches: refs/heads/master df7f37e23 -> dddf6c511
FALCON-1883 Falcon regression build fails with minor checkstyle issues Fixing the checkstyle issue observed during building the regression trunk Author: Murali Ramasami <[email protected]> Reviewers: "Pragya <[email protected]>, Praveen Adlakha <[email protected]>" Closes #85 from muraliramasami/FALCON-1883 Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/dddf6c51 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/dddf6c51 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/dddf6c51 Branch: refs/heads/master Commit: dddf6c5119dbb68df67adc3b42c8272a0fdc6696 Parents: df7f37e Author: Murali Ramasami <[email protected]> Authored: Wed Apr 6 14:05:18 2016 +0530 Committer: Pragya Mittal <[email protected]> Committed: Wed Apr 6 14:05:18 2016 +0530 ---------------------------------------------------------------------- .../core/util/NativeInstanceUtil.java | 2 +- .../nativeScheduler/NativeSchedulerAPITest.java | 3 +- .../falcon/regression/prism/RetentionTest.java | 32 ++++++++++---------- 3 files changed, 19 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/dddf6c51/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/NativeInstanceUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/NativeInstanceUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/NativeInstanceUtil.java index 3add7a0..3c2d854 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/NativeInstanceUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/NativeInstanceUtil.java @@ -139,7 +139,7 @@ public final class NativeInstanceUtil { for (int i = 0; i < totalSleepTime; i = i+sleepTime) { InstancesResult statusResult = cluster.getProcessHelper().getProcessInstanceStatus(entityName, params); if (statusResult.getInstances() != null) { - if (statusResult.getInstances()[0].getStatus().name() == expectedStatus.name()) { + if ((statusResult.getInstances()[0].getStatus().name()).equals(expectedStatus.name())) { return; } } http://git-wip-us.apache.org/repos/asf/falcon/blob/dddf6c51/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/nativeScheduler/NativeSchedulerAPITest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/nativeScheduler/NativeSchedulerAPITest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/nativeScheduler/NativeSchedulerAPITest.java index 55ea2fb..50082b7 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/nativeScheduler/NativeSchedulerAPITest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/nativeScheduler/NativeSchedulerAPITest.java @@ -146,7 +146,8 @@ public class NativeSchedulerAPITest extends BaseTestClass { Assert.assertTrue(XmlUtil.isIdentical(processMerlin.toString(), processDef), "Definitions are not equal."); // Entity List - EntityList.EntityElement[] entityList = prism.getProcessHelper().listAllEntities().getEntityList().getElements(); + EntityList.EntityElement[] entityList = prism.getProcessHelper().listAllEntities().getEntityList(). + getElements(); Assert.assertTrue(entityList.length==1); Assert.assertTrue(entityList[0].type.equals("PROCESS")); Assert.assertTrue(entityList[0].name.equals(processMerlin.getName())); http://git-wip-us.apache.org/repos/asf/falcon/blob/dddf6c51/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java index 0ea9514..c3e9518 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java @@ -298,8 +298,8 @@ public class RetentionTest extends BaseTestClass { // a negative value like -4 should be covered in validation scenarios. Integer[] retentionPeriods = new Integer[]{0, 10080, 60, 8, 24}; RetentionUnit[] retentionUnits = new RetentionUnit[]{ - RetentionUnit.HOURS, - RetentionUnit.DAYS, + RetentionUnit.HOURS, + RetentionUnit.DAYS, }; // "minutes","hours", "days", Boolean[] gaps = new Boolean[]{false, true}; FreqType[] freqTypes = new FreqType[]{FreqType.DAILY, FreqType.YEARLY, FreqType.MONTHLY}; @@ -376,9 +376,9 @@ public class RetentionTest extends BaseTestClass { @DataProvider(name = "lifecycleDPFail") public Object[][] getLifecycleFail() { return new Object[][]{ - {true, true}, // cluster/global : No retention stage. Should fail. - {true, false}, // global : no retention stage. Should fail. - {false, true}, // cluster : no retention stage.Should fail. + {true, true}, // cluster/global : No retention stage. Should fail. + {true, false}, // global : no retention stage. Should fail. + {false, true}, // cluster : no retention stage.Should fail. }; } @@ -435,8 +435,8 @@ public class RetentionTest extends BaseTestClass { @DataProvider(name = "getLifecycleWithGlobalStage") public Object[][] getLifecycleWithGlobalStage() { return new Object[][]{ - {true, false}, // Global level lifecycle. Should pass. - {true, true}, // Cluster level : no retention stage - (pick from global). Should pass. + {true, false}, // Global level lifecycle. Should pass. + {true, true}, // Cluster level : no retention stage - (pick from global). Should pass. }; } @@ -498,9 +498,9 @@ public class RetentionTest extends BaseTestClass { public Object[][] getLifecycleWithClusterStage() { return new Object[][]{ - {true, true}, // Cluster level lifecylce. Should pass. - {false, false}, // Cluster level with no global level lifecylce. Should pass. - {true, false}, // Cluster level with empty global level lifecycle.Should pass. + {true, true}, // Cluster level lifecylce. Should pass. + {false, false}, // Cluster level with no global level lifecylce. Should pass. + {true, false}, // Cluster level with empty global level lifecycle.Should pass. }; } @@ -516,16 +516,16 @@ public class RetentionTest extends BaseTestClass { String priority, String queue, boolean stage) { Lifecycle lifecycle = new Lifecycle(); if (stage) { - String LIMIT_PROPERTY_NAME = "retention.policy.agebaseddelete.limit"; + String limitPropertyName = "retention.policy.agebaseddelete.limit"; Property property = new Property(); - property.setName(LIMIT_PROPERTY_NAME); + property.setName(limitPropertyName); property.setValue(retentionPeriod.getTimeUnit() + "(" + retentionPeriod.getFrequencyAsInt() + ")"); Properties properties = new Properties(); properties.getProperties().add(property); RetentionStage retentionStage = new RetentionStage(); - retentionStage.setFrequency(new Frequency(retentionFrequency.getTimeUnit() + - "(" + retentionFrequency.getFrequencyAsInt() + ")")); + retentionStage.setFrequency(new Frequency(retentionFrequency.getTimeUnit() + + "(" + retentionFrequency.getFrequencyAsInt() + ")")); if (!priority.isEmpty()) { retentionStage.setPriority(priority); @@ -545,7 +545,7 @@ public class RetentionTest extends BaseTestClass { * @param frequency : expected frequency. */ private void validateFrequency(String feedName, int frequency) - throws OozieClientException, JMSException, JSONException { + throws OozieClientException, JMSException, JSONException { List<CoordinatorJob> coordJobs = OozieUtil.getBundleCoordinators(clusterOC, OozieUtil.getBundles(clusterOC, feedName, EntityType.FEED).get(0)); CoordinatorJob coordJobInfo = clusterOC.getCoordJobInfo(coordJobs.get(0).getId()); @@ -560,7 +560,7 @@ public class RetentionTest extends BaseTestClass { * @param expectedQueue : expected queue. */ private void validatePriorityAndQueue(String feedName, String expectedPriority, String expectedQueue) - throws OozieClientException, JMSException, JSONException { + throws OozieClientException, JMSException, JSONException { Configuration configuration = OozieUtil.getRetentionConfiguration(clusterOC, OozieUtil.getBundles(clusterOC, feedName, EntityType.FEED).get(0));
