helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hu...@apache.org
Subject [helix] branch master updated: Optimize imports for the whole project. (#577)
Date Tue, 19 Nov 2019 20:40:04 GMT
This is an automated email from the ASF dual-hosted git repository.

hulee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/master by this push:
     new 88296bc  Optimize imports for the whole project. (#577)
88296bc is described below

commit 88296bc41df1a31131659f7004146f14f94b7da3
Author: Huizhi L <ihuizhi.lu@gmail.com>
AuthorDate: Tue Nov 19 12:39:54 2019 -0800

    Optimize imports for the whole project. (#577)
    
    We have new helix style in Intellij. Most of the files are not following the style for imports. So this PR optimizes all imports for all files in helix project.
---
 .../org/apache/helix/webapp/HelixAdminWebApp.java  |   4 +-
 .../apache/helix/webapp/RestAdminApplication.java  |   2 +-
 .../helix/webapp/resources/ClusterResource.java    |   4 +-
 .../helix/webapp/resources/ClustersResource.java   |   4 +-
 .../helix/webapp/resources/ConfigResource.java     |   4 +-
 .../helix/webapp/resources/ConstraintResource.java |   4 +-
 .../helix/webapp/resources/ControllerResource.java |   4 +-
 .../resources/ControllerStatusUpdateResource.java  |   4 +-
 .../webapp/resources/CurrentStateResource.java     |   4 +-
 .../webapp/resources/CurrentStatesResource.java    |   4 +-
 .../helix/webapp/resources/ErrorResource.java      |   4 +-
 .../helix/webapp/resources/ErrorsResource.java     |   4 +-
 .../webapp/resources/ExternalViewResource.java     |   4 +-
 .../helix/webapp/resources/IdealStateResource.java |   4 +-
 .../helix/webapp/resources/InstanceResource.java   |   4 +-
 .../helix/webapp/resources/InstancesResource.java  |   7 +-
 .../helix/webapp/resources/JobQueueResource.java   |   8 +-
 .../helix/webapp/resources/JobQueuesResource.java  |  14 +-
 .../apache/helix/webapp/resources/JobResource.java |   4 +-
 .../webapp/resources/ResourceGroupResource.java    |   4 +-
 .../webapp/resources/ResourceGroupsResource.java   |   9 +-
 .../webapp/resources/SchedulerTasksResource.java   |   4 +-
 .../helix/webapp/resources/StateModelResource.java |   4 +-
 .../webapp/resources/StateModelsResource.java      |   4 +-
 .../webapp/resources/StatusUpdateResource.java     |   4 +-
 .../webapp/resources/StatusUpdatesResource.java    |   4 +-
 .../helix/webapp/resources/WorkflowsResource.java  |   7 +-
 .../helix/webapp/resources/ZkChildResource.java    |   4 +-
 .../helix/webapp/resources/ZkPathResource.java     |   4 +-
 .../org/apache/helix/webapp/AdminTestBase.java     |   4 +-
 .../webapp/resources/TestJobQueuesResource.java    |   2 -
 .../org/apache/helix/agent/AgentStateModel.java    |   2 +-
 .../src/main/java/org/apache/helix/HelixAdmin.java |   1 +
 .../main/java/org/apache/helix/HelixManager.java   |  20 +-
 .../main/java/org/apache/helix/InstanceType.java   |   2 +-
 .../main/java/org/apache/helix/PropertyKey.java    |  23 ++-
 .../java/org/apache/helix/PropertyPathBuilder.java |  15 +-
 .../helix/api/config/HelixConfigProperty.java      |   1 +
 .../apache/helix/api/config/RebalanceConfig.java   |   1 +
 .../api/config/StateTransitionThrottleConfig.java  |   1 +
 .../api/config/StateTransitionTimeoutConfig.java   |   1 +
 .../helix/api/listeners/ConfigChangeListener.java  |   1 +
 .../api/listeners/CurrentStateChangeListener.java  |   1 +
 .../api/listeners/ExternalViewChangeListener.java  |   1 +
 .../api/listeners/IdealStateChangeListener.java    |   1 +
 .../listeners/InstanceConfigChangeListener.java    |   1 +
 .../api/listeners/LiveInstanceChangeListener.java  |   1 +
 .../helix/api/listeners/MessageListener.java       |   1 +
 .../listeners/ResourceConfigChangeListener.java    |   1 +
 .../api/listeners/ScopedConfigChangeListener.java  |   1 +
 .../AbstractRebalanceHardConstraint.java           |   4 +-
 .../AbstractRebalanceSoftConstraint.java           |   4 +-
 .../helix/common/DedupEventBlockingQueue.java      |   5 +-
 .../helix/common/caches/AbstractDataCache.java     |   3 +-
 .../helix/common/caches/AbstractDataSnapshot.java  |   4 +-
 .../helix/common/caches/BasicClusterDataCache.java |   1 +
 .../helix/common/caches/CurrentStateCache.java     |   3 +-
 .../helix/common/caches/CurrentStateSnapshot.java  |   6 +-
 .../helix/common/caches/ExternalViewCache.java     |   4 +-
 .../helix/common/caches/IdealStateCache.java       |   4 +-
 .../helix/common/caches/InstanceMessagesCache.java |   8 +-
 .../apache/helix/common/caches/PropertyCache.java  |   5 +-
 .../apache/helix/common/caches/TaskDataCache.java  |   1 +
 .../helix/controller/ExternalViewGenerator.java    |   2 +-
 .../helix/controller/GenericHelixController.java   |   5 +-
 .../helix/controller/common/PartitionStateMap.java |   4 +-
 .../helix/controller/common/ResourcesStateMap.java |   4 +-
 .../dataproviders/BaseControllerDataProvider.java  |  26 +--
 .../WorkflowControllerDataProvider.java            |  10 +-
 .../controller/pipeline/PipelineRegistry.java      |   1 +
 .../controller/rebalancer/AbstractRebalancer.java  |   1 +
 .../controller/rebalancer/CustomRebalancer.java    |   1 +
 .../rebalancer/DelayedAutoRebalancer.java          |   1 +
 .../rebalancer/MaintenanceRebalancer.java          |   1 +
 .../PartitionWeightAwareEvennessConstraint.java    |   6 +-
 .../constraint/TotalCapacityConstraint.java        |   6 +-
 .../dataprovider/ZkBasedCapacityProvider.java      |  12 +-
 .../ZkBasedPartitionWeightProvider.java            |  12 +-
 .../strategy/ConstraintRebalanceStrategy.java      |   3 +-
 .../rebalancer/strategy/RebalanceStrategy.java     |   1 +
 .../crushMapping/CRUSHPlacementAlgorithm.java      |   4 +-
 .../rebalancer/util/RebalanceScheduler.java        |  17 +-
 .../rebalancer/util/ResourceUsageCalculator.java   |   6 +-
 .../controller/stages/BestPossibleStateOutput.java |   1 -
 .../helix/controller/stages/ClusterDataCache.java  |   1 +
 .../helix/controller/stages/ClusterEvent.java      |   2 +-
 .../controller/stages/CompatibilityCheckStage.java |   2 +-
 .../stages/CurrentStateComputationStage.java       |   9 +-
 .../controller/stages/CurrentStateOutput.java      |   4 +-
 .../stages/IntermediateStateCalcStage.java         |   4 +-
 .../stages/MaintenanceRecoveryStage.java           |   1 +
 .../controller/stages/MessageDispatchStage.java    |   2 +-
 .../controller/stages/MessageGenerationPhase.java  |   4 +-
 .../controller/stages/MessageThrottleStage.java    |   8 +-
 .../controller/stages/PersistAssignmentStage.java  |   2 +-
 .../controller/stages/ReadClusterDataStage.java    |   7 +-
 .../stages/ResourceComputationStage.java           |   3 +-
 .../controller/stages/ResourceValidationStage.java |   2 +-
 .../stages/TargetExteralViewCalcStage.java         |   6 +-
 .../stages/TaskGarbageCollectionStage.java         |   1 +
 .../resource/ResourceMessageGenerationPhase.java   |   2 +-
 .../stages/task/TaskMessageGenerationPhase.java    |   2 +-
 .../stages/task/TaskSchedulingStage.java           |   3 +-
 .../controller/strategy/AutoRebalanceStrategy.java |  10 +-
 .../apache/helix/examples/BootstrapProcess.java    |   4 +-
 .../examples/WeightAwareRebalanceUtilExample.java  |   8 +-
 .../ParticipantHealthReportCollectorImpl.java      |   2 +-
 .../apache/helix/manager/zk/CallbackHandler.java   |  13 +-
 .../zk/DefaultControllerMessageHandlerFactory.java |   3 +-
 ...faultParticipantErrorMessageHandlerFactory.java |   3 +-
 .../manager/zk/DistributedLeaderElection.java      |   6 +-
 .../apache/helix/manager/zk/HelixGroupCommit.java  |   3 +-
 .../apache/helix/manager/zk/WriteThroughCache.java |   2 +-
 .../org/apache/helix/manager/zk/ZKHelixAdmin.java  |   1 +
 .../helix/manager/zk/ZKHelixDataAccessor.java      |   2 +-
 .../apache/helix/manager/zk/ZKHelixManager.java    |   3 +-
 .../java/org/apache/helix/manager/zk/ZKUtil.java   |   4 +-
 .../helix/manager/zk/ZNRecordSerializer.java       |   4 +-
 .../manager/zk/ZNRecordStreamingSerializer.java    |   7 +-
 .../apache/helix/manager/zk/ZkAsyncCallbacks.java  |   4 +-
 .../apache/helix/manager/zk/ZkCallbackCache.java   |   4 +-
 .../zk/serializer/JacksonPayloadSerializer.java    |   4 +-
 .../helix/manager/zk/zookeeper/ZkClient.java       |   2 +-
 .../messaging/handling/AsyncCallbackService.java   |   3 +-
 .../handling/HelixStateTransitionHandler.java      |   2 +-
 .../messaging/handling/HelixTaskExecutor.java      |   1 +
 .../java/org/apache/helix/model/ClusterConfig.java |   3 +-
 .../org/apache/helix/model/InstanceConfig.java     |   3 +-
 .../java/org/apache/helix/model/LiveInstance.java  |   1 +
 .../main/java/org/apache/helix/model/Message.java  |   2 +-
 .../org/apache/helix/model/ParticipantHistory.java |   6 +-
 .../org/apache/helix/model/ResourceConfig.java     |   2 +-
 .../helix/model/builder/AutoModeISBuilder.java     |   4 +-
 .../model/builder/AutoRebalanceModeISBuilder.java  |   4 +-
 .../helix/model/builder/ConstraintItemBuilder.java |   2 +-
 .../helix/model/builder/CustomModeISBuilder.java   |   4 +-
 .../helix/model/builder/FullAutoModeISBuilder.java |   4 +-
 .../helix/model/builder/SemiAutoModeISBuilder.java |   4 +-
 .../model/util/StateModelDefinitionValidator.java  |   5 +-
 .../helix/monitoring/ZKPathDataDumpTask.java       |   5 +-
 .../monitoring/mbeans/ClusterEventMonitor.java     |  10 +-
 .../monitoring/mbeans/ClusterMBeanObserver.java    |   1 -
 .../monitoring/mbeans/ClusterStatusMonitor.java    |   8 +-
 .../monitoring/mbeans/HelixCallbackMonitor.java    |  10 +-
 .../apache/helix/monitoring/mbeans/JobMonitor.java |   5 +-
 .../helix/monitoring/mbeans/MBeanRegistrar.java    |  10 +-
 .../monitoring/mbeans/MessageLatencyMonitor.java   |  10 +-
 .../monitoring/mbeans/MessageQueueMonitor.java     |   1 -
 .../mbeans/ParticipantStatusMonitor.java           |  20 +-
 .../mbeans/PerInstanceResourceMonitor.java         |   7 +-
 .../helix/monitoring/mbeans/ResourceMonitor.java   |   5 +-
 .../mbeans/RoutingTableProviderMonitor.java        |  14 +-
 .../mbeans/StateTransitionStatMonitor.java         |   6 +-
 .../helix/monitoring/mbeans/ZkClientMonitor.java   |   8 +-
 .../monitoring/mbeans/ZkClientPathMonitor.java     |   4 +-
 .../mbeans/dynamicMBeans/DynamicMBeanProvider.java |  12 +-
 .../mbeans/dynamicMBeans/DynamicMetric.java        |   6 +-
 .../dynamicMBeans/HistogramDynamicMetric.java      |  12 +-
 .../DistClusterControllerStateModel.java           |   3 +-
 .../DistClusterControllerStateModelFactory.java    |   3 +-
 .../participant/GenericLeaderStandbyModel.java     |   2 +-
 .../helix/participant/HelixCustomCodeRunner.java   |   2 +-
 .../helix/participant/HelixStateMachineEngine.java |   3 +-
 .../org/apache/helix/spectator/RoutingTable.java   |   1 +
 .../helix/spectator/RoutingTableProvider.java      |  33 ++--
 .../helix/spectator/RoutingTableSnapshot.java      |   1 +
 .../apache/helix/store/PropertyJsonSerializer.java |   4 +-
 .../helix/store/zk/AutoFallbackPropertyStore.java  |   2 +-
 .../apache/helix/task/AbstractTaskDispatcher.java  |   5 +-
 .../helix/task/AssignableInstanceManager.java      |   1 +
 .../helix/task/DeprecatedTaskRebalancer.java       |  15 +-
 .../task/FixedTargetTaskAssignmentCalculator.java  |   5 +-
 .../task/GenericTaskAssignmentCalculator.java      |   5 +-
 .../main/java/org/apache/helix/task/JobConfig.java |   9 +-
 .../java/org/apache/helix/task/JobContext.java     |   5 +-
 .../main/java/org/apache/helix/task/JobDag.java    |   8 +-
 .../java/org/apache/helix/task/JobDispatcher.java  |   3 +-
 .../main/java/org/apache/helix/task/JobQueue.java  |   4 +-
 .../java/org/apache/helix/task/RuntimeJobDag.java  |   2 +-
 .../helix/task/TaskAssignmentCalculator.java       |   8 +-
 .../java/org/apache/helix/task/TaskConfig.java     |   3 +-
 .../java/org/apache/helix/task/TaskDriver.java     |   1 +
 .../org/apache/helix/task/TaskExecutionInfo.java   |   1 +
 .../apache/helix/task/TaskStateModelFactory.java   |   2 +-
 .../main/java/org/apache/helix/task/TaskUtil.java  |   6 +-
 .../ThreadCountBasedTaskAssignmentCalculator.java  |   2 +
 .../org/apache/helix/task/WorkflowDispatcher.java  |   3 +-
 .../org/apache/helix/task/WorkflowRebalancer.java  |   3 +-
 .../helix/task/assigner/AssignableInstance.java    |   1 +
 .../apache/helix/task/assigner/TaskAssigner.java   |   1 +
 .../assigner/ThreadCountBasedTaskAssigner.java     |   1 +
 .../helix/tools/ClusterExternalViewVerifier.java   |   1 +
 .../java/org/apache/helix/tools/ClusterSetup.java  |   1 +
 .../apache/helix/tools/ClusterStateVerifier.java   |   3 +-
 .../org/apache/helix/tools/ClusterVerifier.java    |   8 +-
 .../BestPossibleExternalViewVerifier.java          |  22 +--
 .../StrictMatchExternalViewVerifier.java           |   1 +
 .../ClusterVerifiers/ZkHelixClusterVerifier.java   |   8 +-
 .../java/org/apache/helix/tools/RUSHrHash.java     |   4 +-
 .../helix/tools/StateModelConfigGenerator.java     |   2 +-
 .../tools/commandtools/CurrentStateCleanUp.java    |   1 +
 .../tools/commandtools/ExampleParticipant.java     |   1 +
 .../apache/helix/tools/commandtools/JmxDumper.java |   1 -
 .../apache/helix/tools/commandtools/TaskAdmin.java |   3 +-
 .../apache/helix/tools/commandtools/ToolsUtil.java |   2 +-
 .../helix/tools/commandtools/ZKLogFormatter.java   |   5 +-
 .../main/java/org/apache/helix/util/HelixUtil.java |   4 +-
 .../apache/helix/util/InstanceValidationUtil.java  |   3 +-
 .../org/apache/helix/util/StatusUpdateUtil.java    |   1 +
 .../helix/util/WeightAwareRebalanceUtil.java       |  18 +-
 .../scripts/integration-test/script/cm_driver.py   |   2 +-
 .../scripts/integration-test/script/dds_driver.py  | 214 +++++++++++----------
 .../scripts/integration-test/script/utility.py     | 101 +++++-----
 .../test/java/org/apache/helix/MockAccessor.java   |   1 +
 .../java/org/apache/helix/ScriptTestHelper.java    |   1 +
 .../java/org/apache/helix/TestConfigAccessor.java  |   1 +
 .../TestEspressoStorageClusterIdealState.java      |   1 +
 .../java/org/apache/helix/TestGetProperty.java     |   1 +
 .../java/org/apache/helix/TestGroupCommit.java     |   1 +
 .../org/apache/helix/TestHelixConfigAccessor.java  |   1 +
 .../org/apache/helix/TestHelixTaskHandler.java     |   1 +
 .../org/apache/helix/TestListenerCallback.java     |   1 +
 .../helix/TestListenerCallbackBatchMode.java       |   1 +
 .../apache/helix/TestListenerCallbackPrefetch.java |   1 +
 .../helix/TestRelayIdealStateCalculator.java       |   1 +
 .../java/org/apache/helix/TestRoutingTable.java    |   1 +
 .../org/apache/helix/TestShuffledIdealState.java   |   1 +
 .../test/java/org/apache/helix/TestZKCallback.java |   1 +
 .../apache/helix/TestZKRoutingInfoProvider.java    |   1 +
 .../test/java/org/apache/helix/TestZNRecord.java   |   1 +
 .../test/java/org/apache/helix/TestZkBasis.java    |   1 +
 .../java/org/apache/helix/TestZnodeModify.java     |   1 +
 .../test/java/org/apache/helix/ZkTestHelper.java   |   1 +
 .../java/org/apache/helix/common/ZkTestBase.java   |   2 +-
 .../common/caches/TestCurrentStateSnapshot.java    |   1 +
 .../helix/common/caches/TestPropertyCache.java     |   9 +-
 .../rebalancer/TestAbstractRebalancer.java         |   1 +
 .../rebalancer/TestAutoRebalanceStrategy.java      |   9 +-
 ...stAutoRebalanceStrategyImbalanceAssignment.java |   1 +
 .../TestConstraintRebalanceStrategy.java           |   1 +
 .../rebalancer/TestZeroReplicaAvoidance.java       |   1 +
 .../dataprovider/MockCapacityProvider.java         |   1 +
 .../dataprovider/MockPartitionWeightProvider.java  |   1 +
 .../helix/controller/stages/BaseStageTest.java     |   1 +
 .../controller/stages/DummyClusterManager.java     |   1 +
 .../TestBestPossibleCalcStageCompatibility.java    |   1 +
 .../stages/TestBestPossibleStateCalcStage.java     |   1 +
 .../stages/TestClusterEventBlockingQueue.java      |   7 +-
 .../stages/TestCompatibilityCheckStage.java        |   1 +
 .../stages/TestCurrentStateComputationStage.java   |   1 +
 .../controller/stages/TestExternalViewStage.java   |   1 +
 .../stages/TestIntermediateStateCalcStage.java     |   2 -
 .../stages/TestMessageThrottleStage.java           |   1 +
 .../controller/stages/TestMsgSelectionStage.java   |   1 +
 .../TestQuotaConstraintSkipWorkflowAssignment.java |   1 +
 .../controller/stages/TestRebalancePipeline.java   |   1 +
 .../controller/stages/TestRecoveryLoadBalance.java |   1 +
 .../stages/TestResourceComputationStage.java       |   1 +
 .../stages/TestResourceValidationStage.java        |   3 +-
 .../stages/TestStateTransitionPriority.java        |   3 +-
 .../TestStateTransitionThrottleController.java     |  11 +-
 .../TestCardDealingAdjustmentAlgorithmV2.java      |   9 +-
 .../TestParticipantHealthReportCollectorImpl.java  |   1 +
 .../SinglePartitionLeaderStandByTest.java          |   1 +
 .../apache/helix/integration/TestAddClusterV2.java |   1 +
 .../TestAddNodeAfterControllerStart.java           |   1 +
 .../TestAddStateModelFactoryAfterConnect.java      |   1 +
 .../integration/TestAlertingRebalancerFailure.java |   6 +-
 .../helix/integration/TestBasicSpectator.java      |   1 +
 .../integration/TestBatchEnableInstances.java      |   1 +
 .../integration/TestBatchMessageHandling.java      |   1 +
 .../helix/integration/TestBucketizedResource.java  |   1 +
 .../integration/TestCMWithFailParticipant.java     |   1 +
 .../integration/TestCarryOverBadCurState.java      |   1 +
 .../helix/integration/TestCleanupExternalView.java |   1 +
 .../helix/integration/TestClusterStartsup.java     |   1 +
 .../TestCorrectnessOnConnectivityLoss.java         |   4 +-
 .../org/apache/helix/integration/TestDisable.java  |   1 +
 .../integration/TestDisableCustomCodeRunner.java   |   1 +
 .../helix/integration/TestDisableExternalView.java |   1 +
 .../helix/integration/TestDisablePartition.java    |   5 +-
 .../helix/integration/TestDisableResource.java     |   1 +
 .../helix/integration/TestDistributedCMMain.java   |   1 +
 .../TestDistributedClusterController.java          |   1 +
 .../org/apache/helix/integration/TestDrop.java     |   1 +
 .../TestEnablePartitionDuringDisable.java          |   1 +
 .../integration/TestEntropyFreeNodeBounce.java     |   1 +
 .../helix/integration/TestErrorPartition.java      |   1 +
 .../helix/integration/TestErrorReplicaPersist.java |   1 +
 .../helix/integration/TestExpandCluster.java       |   1 +
 .../apache/helix/integration/TestExternalCmd.java  |   1 +
 .../helix/integration/TestExternalViewUpdates.java |   1 +
 .../helix/integration/TestFailOverPerf1kp.java     |   1 +
 .../helix/integration/TestHelixInstanceTag.java    |   1 +
 .../integration/TestHelixUsingDifferentParams.java |   1 +
 .../integration/TestInvalidResourceRebalance.java  |   3 +-
 .../TestMessagePartitionStateMismatch.java         |   1 +
 .../TestNoThrottleDisabledPartitions.java          |   1 +
 .../apache/helix/integration/TestNullReplica.java  |   1 +
 .../TestPartitionLevelTransitionConstraint.java    |   1 +
 .../integration/TestPartitionMovementThrottle.java |   5 +-
 .../apache/helix/integration/TestPauseSignal.java  |   1 +
 .../integration/TestPersistAssignmentStage.java    |   1 +
 .../integration/TestPreferenceListAsQueue.java     |   3 +-
 .../TestRebalancerPersistAssignments.java          |   1 +
 .../TestReelectedPipelineCorrectness.java          |   1 +
 .../helix/integration/TestRenamePartition.java     |   1 +
 .../helix/integration/TestResetInstance.java       |   1 +
 .../helix/integration/TestResetPartitionState.java |   1 +
 .../helix/integration/TestResetResource.java       |   1 +
 .../integration/TestResourceGroupEndtoEnd.java     |   1 +
 .../TestResourceWithSamePartitionKey.java          |   1 +
 .../apache/helix/integration/TestSchemataSM.java   |   1 +
 .../integration/TestSessionExpiryInTransition.java |   1 +
 .../helix/integration/TestStandAloneCMMain.java    |   1 +
 .../integration/TestStandAloneCMSessionExpiry.java |   1 +
 .../TestStartMultipleControllersWithSameName.java  |   1 +
 .../TestStateTransitionCancellation.java           |   1 +
 .../integration/TestStateTransitionThrottle.java   |   1 +
 .../apache/helix/integration/TestStatusUpdate.java |   1 +
 .../integration/TestWeightBasedRebalanceUtil.java  |   1 +
 .../integration/TestZkCallbackHandlerLeak.java     |   1 +
 .../helix/integration/TestZkSessionExpiry.java     |   3 +-
 .../integration/common/ZkStandAloneCMTestBase.java |   1 +
 .../controller/TestClusterMaintenanceMode.java     |   3 +-
 .../controller/TestControllerHistory.java          |   1 +
 .../controller/TestControllerLeadershipChange.java |   1 +
 .../controller/TestControllerLiveLock.java         |   1 +
 .../TestGenericHelixControllerThreading.java       |   1 +
 .../controller/TestRedundantDroppedMessage.java    |   1 +
 .../controller/TestTargetExternalView.java         |   1 +
 .../manager/ClusterControllerManager.java          |   1 +
 .../manager/ClusterDistributedController.java      |   1 +
 .../manager/MockParticipantManager.java            |   1 +
 .../manager/TestConsecutiveZkSessionExpiry.java    |   1 +
 .../integration/manager/TestControllerManager.java |   1 +
 .../manager/TestDistributedControllerManager.java  |   1 +
 .../integration/manager/TestHelixDataAccessor.java |   1 +
 .../manager/TestParticipantManager.java            |   1 +
 .../integration/manager/TestStateModelLeak.java    |   1 +
 .../integration/manager/TestZkHelixAdmin.java      |   1 +
 .../helix/integration/manager/ZkTestManager.java   |   1 +
 .../integration/messaging/TestBatchMessage.java    |   1 +
 .../messaging/TestBatchMessageWrapper.java         |   1 +
 .../messaging/TestGroupCommitAddBackData.java      |   1 +
 .../integration/messaging/TestMessageThrottle.java |   1 +
 .../messaging/TestMessageThrottle2.java            |   1 +
 .../messaging/TestMessagingService.java            |   3 +-
 .../messaging/TestP2PMessageSemiAuto.java          |   1 +
 .../messaging/TestP2PNoDuplicatedMessage.java      |   1 +
 .../messaging/TestP2PSingleTopState.java           |   1 +
 .../messaging/TestSchedulerMessage.java            |   3 +-
 .../messaging/TestSchedulerMessage2.java           |   1 +
 .../messaging/TestSchedulerMsgContraints.java      |   1 +
 .../messaging/TestSchedulerMsgUsingQueue.java      |   1 +
 .../paticipant/TestInstanceHistory.java            |   1 +
 .../paticipant/TestNonOfflineInitState.java        |   1 +
 .../paticipant/TestParticipantErrorMessage.java    |   1 +
 .../paticipant/TestParticipantNameCollision.java   |   1 +
 .../paticipant/TestRestartParticipant.java         |   1 +
 .../paticipant/TestStateTransitionTimeout.java     |   1 +
 .../TestStateTransitionTimeoutWithResource.java    |   1 +
 .../CrushRebalancers/TestCrushAutoRebalance.java   |   1 +
 .../TestCrushAutoRebalanceNonRack.java             |   1 +
 ...stCrushAutoRebalanceTopoplogyAwareDisabled.java |   1 +
 .../TestDelayedAutoRebalance.java                  |   2 +-
 ...stDelayedAutoRebalanceWithDisabledInstance.java |   2 +-
 .../TestDelayedAutoRebalanceWithRackaware.java     |   1 +
 .../PartitionMigration/TestExpandCluster.java      |   1 +
 .../PartitionMigration/TestFullAutoMigration.java  |   1 +
 .../TestPartitionMigrationBase.java                |   1 +
 .../rebalancer/TestAutoIsWithEmptyMap.java         |   1 +
 .../integration/rebalancer/TestAutoRebalance.java  |   1 +
 .../TestAutoRebalancePartitionLimit.java           |   1 +
 .../TestAutoRebalanceWithDisabledInstance.java     |   1 +
 ...rInMaintenanceModeWhenReachingMaxPartition.java |   1 +
 ...nanceModeWhenReachingOfflineInstancesLimit.java |   4 +-
 .../rebalancer/TestCustomIdealState.java           |   1 +
 .../rebalancer/TestCustomRebalancer.java           |   3 +-
 .../TestCustomizedIdealStateRebalancer.java        |   3 +-
 .../rebalancer/TestFullAutoNodeTagging.java        |   6 +-
 .../rebalancer/TestMixedModeAutoRebalance.java     |   2 +-
 .../rebalancer/TestSemiAutoRebalance.java          |   1 +
 .../rebalancer/TestZeroReplicaAvoidance.java       |   1 +
 .../spectator/TestRoutingTableProvider.java        |   1 +
 .../TestRoutingTableProviderFromCurrentStates.java |   8 +-
 .../TestRoutingTableProviderPeriodicRefresh.java   |   1 +
 .../spectator/TestRoutingTableSnapshot.java        |   1 +
 .../apache/helix/integration/task/MockTask.java    |   1 +
 .../helix/integration/task/TaskTestUtil.java       |   1 +
 .../helix/integration/task/TestBatchAddJobs.java   |   1 +
 .../task/TestDisableJobExternalView.java           |   3 +-
 .../task/TestDropOnParticipantReset.java           |   1 +
 .../helix/integration/task/TestExecutionDelay.java |  11 --
 .../integration/task/TestForceDeleteWorkflow.java  |   5 +-
 .../helix/integration/task/TestGenericJobs.java    |   1 +
 .../task/TestIndependentTaskRebalancer.java        |   7 +-
 .../integration/task/TestJobAndWorkflowType.java   |   1 +
 .../helix/integration/task/TestJobFailure.java     |   5 +-
 .../integration/task/TestJobFailureDependence.java |   3 +-
 .../task/TestJobFailureTaskNotStarted.java         |   7 +-
 .../integration/task/TestJobQueueCleanUp.java      |   3 +-
 .../helix/integration/task/TestJobTimeout.java     |   3 +-
 .../task/TestJobTimeoutTaskNotStarted.java         |   3 +-
 .../helix/integration/task/TestNoDoubleAssign.java |   3 +-
 .../integration/task/TestQuotaBasedScheduling.java |   3 +-
 .../integration/task/TestRebalanceRunningTask.java |   5 +-
 .../integration/task/TestRecurringJobQueue.java    |   5 +-
 .../integration/task/TestRetrieveWorkflows.java    |   1 +
 .../task/TestRunJobsWithMissingTarget.java         |   3 +-
 .../helix/integration/task/TestRuntimeJobDag.java  |   1 +
 .../helix/integration/task/TestStopWorkflow.java   |   3 +-
 .../task/TestStopWorkflowWithExecutionDelay.java   |   6 +-
 .../helix/integration/task/TestTaskAssignment.java |   1 +
 .../task/TestTaskAssignmentCalculator.java         |   5 +-
 .../integration/task/TestTaskConditionalRetry.java |   1 +
 .../integration/task/TestTaskErrorReporting.java   |   1 +
 .../helix/integration/task/TestTaskRebalancer.java |   5 +-
 .../task/TestTaskRebalancerFailover.java           |   3 +-
 .../task/TestTaskRebalancerParallel.java           |   1 +
 .../task/TestTaskRebalancerStopResume.java         |   9 +-
 .../helix/integration/task/TestTaskStopQueue.java  |   8 +-
 .../helix/integration/task/TestTaskThreadLeak.java |   1 +
 .../helix/integration/task/TestTaskThrottling.java |   3 +-
 .../helix/integration/task/TestUpdateWorkflow.java |   3 +-
 .../integration/task/TestUserContentStore.java     |   5 +-
 .../integration/task/TestWorkflowTermination.java  |   5 +-
 .../integration/task/TestWorkflowTimeout.java      |   3 +-
 .../helix/integration/task/WorkflowGenerator.java  |   1 +
 .../org/apache/helix/manager/MockListener.java     |   1 +
 .../manager/zk/TestAddBuiltInStateModelDef.java    |   1 +
 .../zk/TestDefaultControllerMsgHandlerFactory.java |   1 +
 .../apache/helix/manager/zk/TestRawZkClient.java   |   4 +-
 .../manager/zk/TestWtCacheAsyncOpMultiThread.java  |   1 +
 .../manager/zk/TestWtCacheAsyncOpSingleThread.java |   1 +
 .../manager/zk/TestWtCacheSyncOpSingleThread.java  |   1 +
 .../helix/manager/zk/TestZKLiveInstanceData.java   |   1 +
 .../org/apache/helix/manager/zk/TestZKUtil.java    |   1 +
 .../helix/manager/zk/TestZNRecordSerializer.java   |   7 +-
 .../helix/manager/zk/TestZNRecordSizeLimit.java    |   1 +
 .../zk/TestZNRecordStreamingSerializer.java        |   5 +-
 .../manager/zk/TestZkCacheAsyncOpSingleThread.java |   1 +
 .../helix/manager/zk/TestZkClusterManager.java     |   1 +
 .../apache/helix/manager/zk/TestZkFlapping.java    |   1 +
 .../apache/helix/manager/zk/TestZkHelixAdmin.java  |   1 +
 .../apache/helix/manager/zk/TestZkReconnect.java   |   1 +
 .../serializer/TestJacksonPayloadSerializer.java   |   1 +
 .../apache/helix/messaging/TestAsyncCallback.java  |   1 +
 .../helix/messaging/TestAsyncCallbackSvc.java      |   1 +
 .../messaging/TestDefaultMessagingService.java     |   3 +-
 .../messaging/handling/MockHelixTaskExecutor.java  |   1 +
 .../handling/TestBatchMessageModeConfigs.java      |   1 +
 .../handling/TestConfigThreadpoolSize.java         |   3 +-
 .../messaging/handling/TestHelixTaskExecutor.java  |   3 +-
 .../handling/TestResourceThreadpoolSize.java       |   1 +
 .../messaging/p2pMessage/TestP2PMessages.java      |   1 +
 .../TestP2PMessagesAvoidDuplicatedMessage.java     |   3 +-
 .../p2pMessage/TestP2PStateTransitionMessages.java |   3 +-
 .../TestP2PWithStateCancellationMessage.java       |   4 +-
 .../apache/helix/mock/MockBaseDataAccessor.java    |   1 +
 .../helix/mock/MockClusterMessagingService.java    |   1 +
 .../java/org/apache/helix/mock/MockHelixAdmin.java |   1 +
 .../java/org/apache/helix/mock/MockManager.java    |   1 +
 .../java/org/apache/helix/mock/MockZkClient.java   |   1 +
 .../apache/helix/mock/MockZkHelixDataAccessor.java |   1 +
 .../mock/controller/MockControllerProcess.java     |   1 +
 .../helix/mock/participant/ErrTransition.java      |   1 +
 .../mock/participant/MockHelixTaskExecutor.java    |   1 +
 .../helix/mock/spectator/MockSpectatorProcess.java |   1 +
 .../helix/mock/statemodel/MockTaskStateModel.java  |   1 +
 .../mock/statemodel/MockTaskStateModelFactory.java |   1 +
 .../org/apache/helix/model/TestConstraint.java     |   1 +
 .../org/apache/helix/model/TestIdealState.java     |   1 +
 .../apache/helix/model/TestStateModelValidity.java |   3 +-
 .../monitoring/TestClusterEventStatusMonitor.java  |   1 +
 .../TestClusterStatusMonitorLifecycle.java         |   8 +-
 .../helix/monitoring/TestParticipantMonitor.java   |   8 +-
 .../helix/monitoring/TestWorkflowMonitor.java      |   1 +
 .../helix/monitoring/TestZKPathDataDumpTask.java   |   1 +
 .../mbeans/TestClusterAggregateMetrics.java        |   1 +
 .../mbeans/TestClusterStatusMonitor.java           |   3 +-
 .../mbeans/TestDisableResourceMbean.java           |   1 +
 .../mbeans/TestDropResourceMetricsReset.java       |  18 +-
 .../mbeans/TestHelixCallbackMonitor.java           |   1 +
 .../monitoring/mbeans/TestRebalancerMetrics.java   |   3 +-
 .../monitoring/mbeans/TestResetClusterMetrics.java |   1 +
 .../monitoring/mbeans/TestResourceMonitor.java     |   1 +
 .../mbeans/TestRoutingTableProviderMonitor.java    |  14 +-
 .../mbeans/TestTaskPerformanceMetrics.java         |   2 +-
 .../mbeans/TestTopStateHandoffMetrics.java         |   3 +-
 .../monitoring/mbeans/TestZkClientMonitor.java     |   2 +-
 .../helix/participant/MockZKHelixManager.java      |   1 +
 .../statemachine/TestStateModelParser.java         |   1 +
 .../org/apache/helix/store/TestJsonComparator.java |   1 +
 .../store/zk/TestAutoFallbackPropertyStore.java    |   1 +
 .../helix/store/zk/TestZkHelixPropertyStore.java   |   1 +
 .../zk/TestZkManagerWithAutoFallbackStore.java     |   1 +
 .../helix/task/TaskSynchronizedTestBase.java       |   1 +
 .../helix/task/TestAssignableInstanceManager.java  |   1 +
 ...tAssignableInstanceManagerControllerSwitch.java |   3 +-
 .../apache/helix/task/TestCleanExpiredJobs.java    |   1 +
 .../helix/task/TestDropTerminalTasksUponReset.java |   4 +-
 .../task/TestGetLastScheduledTaskExecInfo.java     |   1 +
 .../helix/task/TestGetSetUserContentStore.java     |   1 +
 .../apache/helix/task/TestJobStateOnCreation.java  |   3 +-
 .../helix/task/TestSemiAutoStateTransition.java    |   1 +
 .../helix/task/TestTaskCreateThrottling.java       |   1 +
 .../helix/task/assigner/AssignerTestBase.java      |   1 +
 .../task/assigner/TestAssignableInstance.java      |   1 +
 .../assigner/TestThreadCountBasedTaskAssigner.java |   1 +
 .../TestStrictMatchExternalViewVerifier.java       |   1 +
 .../org/apache/helix/tools/TestClusterSetup.java   |   1 +
 .../helix/tools/TestClusterStateVerifier.java      |   3 +-
 .../apache/helix/tools/TestClusterVerifier.java    |   3 +-
 .../org/apache/helix/tools/TestHelixAdminCli.java  |   1 +
 .../java/org/apache/helix/tools/TestZkCopy.java    |   1 +
 .../helix/util/TestIdealStateAssignment.java       |   1 +
 .../org/apache/helix/util/TestInputLoader.java     |   1 +
 .../helix/util/TestInstanceValidationUtil.java     |  13 +-
 .../apache/helix/util/TestRebalanceScheduler.java  |   1 +
 .../org/apache/helix/util/TestZKClientPool.java    |   1 +
 .../helix/rest/client/CustomRestClientImpl.java    |   7 +-
 .../apache/helix/rest/server/HelixRestMain.java    |   1 +
 .../apache/helix/rest/server/HelixRestServer.java  |   1 +
 .../apache/helix/rest/server/ServerContext.java    |   1 +
 .../helix/rest/server/auditlog/AuditLog.java       |   1 +
 .../helix/rest/server/filters/AuditLogFilter.java  |   3 +-
 .../rest/server/json/cluster/ClusterInfo.java      |   3 +-
 .../rest/server/json/cluster/ClusterTopology.java  |   4 +-
 .../rest/server/json/instance/InstanceInfo.java    |   5 +-
 .../rest/server/resources/AbstractResource.java    |   1 +
 .../resources/helix/AbstractHelixResource.java     |   1 +
 .../server/resources/helix/ClusterAccessor.java    |   6 +-
 .../server/resources/helix/InstancesAccessor.java  |   1 +
 .../rest/server/resources/helix/JobAccessor.java   |   1 +
 .../server/resources/helix/MetadataAccessor.java   |   1 +
 .../resources/helix/PerInstanceAccessor.java       |  26 ++-
 .../server/resources/helix/ResourceAccessor.java   |   5 +-
 .../rest/server/resources/helix/TaskAccessor.java  |   1 +
 .../server/resources/helix/WorkflowAccessor.java   |   1 +
 .../resources/metadata/NamespacesAccessor.java     |   1 +
 .../rest/server/service/ClusterServiceImpl.java    |   2 +-
 .../helix/rest/server/service/InstanceService.java |   8 +-
 .../rest/server/service/InstanceServiceImpl.java   |   9 +-
 .../helix/rest/client/TestCustomRestClient.java    |  12 +-
 .../rest/common/TestHelixDataAccessorWrapper.java  |  29 ++-
 .../helix/rest/server/AbstractTestClass.java       |   4 +-
 .../helix/rest/server/TestClusterAccessor.java     |   6 +-
 .../rest/server/TestDefaultMonitoringMbeans.java   |   1 -
 .../helix/rest/server/TestHelixRestServer.java     |   1 +
 .../helix/rest/server/TestInstancesAccessor.java   |  10 +-
 .../apache/helix/rest/server/TestJobAccessor.java  |   4 +-
 .../helix/rest/server/TestNamespacedAPIAccess.java |   5 +-
 .../helix/rest/server/TestPerInstanceAccessor.java |   6 +-
 .../helix/rest/server/TestResourceAccessor.java    |   4 +-
 .../apache/helix/rest/server/TestTaskAccessor.java |   3 +-
 .../helix/rest/server/TestWorkflowAccessor.java    |   4 +-
 .../rest/server/json/cluster/TestClusterInfo.java  |   5 +-
 .../server/json/cluster/TestClusterTopology.java   |   5 +-
 .../server/json/instance/TestStoppableCheck.java   |   5 +-
 .../rest/server/service/TestClusterService.java    |   7 +-
 .../rest/server/service/TestInstanceService.java   |  17 +-
 .../rest/server/util/JerseyUriRequestBuilder.java  |   6 +-
 .../server/util/TestInstanceValidationUtil.java    |   4 +-
 .../helix/recipes/rabbitmq/ConsumerStateModel.java |   5 +-
 .../helix/filestore/FileStoreStateModel.java       |   2 +-
 .../apache/helix/taskexecution/TaskCluster.java    |   2 +-
 .../apache/helix/taskexecution/TaskStateModel.java |   7 +-
 568 files changed, 1275 insertions(+), 885 deletions(-)

diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/HelixAdminWebApp.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/HelixAdminWebApp.java
index 71fc0ec..9785537 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/HelixAdminWebApp.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/HelixAdminWebApp.java
@@ -23,11 +23,11 @@ import org.apache.helix.manager.zk.ByteArraySerializer;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.resources.ResourceUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.restlet.Component;
 import org.restlet.Context;
 import org.restlet.data.Protocol;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HelixAdminWebApp {
   public final Logger LOG = LoggerFactory.getLogger(HelixAdminWebApp.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/RestAdminApplication.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/RestAdminApplication.java
index 9842a3d..049bc83 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/RestAdminApplication.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/RestAdminApplication.java
@@ -43,8 +43,8 @@ import org.apache.helix.webapp.resources.ExternalViewResource;
 import org.apache.helix.webapp.resources.IdealStateResource;
 import org.apache.helix.webapp.resources.InstanceResource;
 import org.apache.helix.webapp.resources.InstancesResource;
-import org.apache.helix.webapp.resources.JobQueuesResource;
 import org.apache.helix.webapp.resources.JobQueueResource;
+import org.apache.helix.webapp.resources.JobQueuesResource;
 import org.apache.helix.webapp.resources.JobResource;
 import org.apache.helix.webapp.resources.ResourceGroupResource;
 import org.apache.helix.webapp.resources.ResourceGroupsResource;
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClusterResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClusterResource.java
index 8b827d3..e168903 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClusterResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClusterResource.java
@@ -29,8 +29,6 @@ import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.model.LiveInstance;
 import org.apache.helix.tools.ClusterSetup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -39,6 +37,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at <code> "/clusters/{clusterName}"
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClustersResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClustersResource.java
index 27f665d..fe6a6d5 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClustersResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClustersResource.java
@@ -26,8 +26,6 @@ import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.tools.ClusterSetup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -36,6 +34,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at <code> "/clusters"
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConfigResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConfigResource.java
index 2b77f54..c7a58b5 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConfigResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConfigResource.java
@@ -31,14 +31,14 @@ import org.apache.helix.model.HelixConfigScope;
 import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
 import org.apache.helix.model.builder.HelixConfigScopeBuilder;
 import org.apache.helix.tools.ClusterSetup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.restlet.data.MediaType;
 import org.restlet.data.Status;
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at <code> "/clusters/{clusterName}/configs"
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java
index 9aa60f3..dc16c18 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ConstraintResource.java
@@ -27,14 +27,14 @@ import org.apache.helix.manager.zk.ZKHelixAdmin;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.model.ClusterConstraints.ConstraintType;
 import org.apache.helix.tools.ClusterSetup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.restlet.data.MediaType;
 import org.restlet.data.Status;
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at <code>"/clusters/{clusterName}/constraints/{constraintType}"
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java
index 9e5c9ad..fede1b6 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerResource.java
@@ -37,8 +37,6 @@ import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.model.LiveInstance;
 import org.apache.helix.tools.ClusterSetup;
 import org.apache.helix.util.StatusUpdateUtil.Level;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -47,6 +45,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at <code>"/clusters/{clusterName}/Controller"
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java
index 85bb7af..6a6a7b7 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ControllerStatusUpdateResource.java
@@ -25,8 +25,6 @@ import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -34,6 +32,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ControllerStatusUpdateResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(ControllerStatusUpdateResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java
index 6739e3b..424ce92 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStateResource.java
@@ -25,8 +25,6 @@ import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -34,6 +32,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CurrentStateResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(CurrentStateResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java
index 97ed03c..02582a3 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/CurrentStatesResource.java
@@ -24,8 +24,6 @@ import java.io.IOException;
 import org.apache.helix.PropertyType;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -33,6 +31,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CurrentStatesResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(CurrentStatesResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java
index 05eef5e..0c12705 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorResource.java
@@ -25,8 +25,6 @@ import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -34,6 +32,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ErrorResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(ErrorResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java
index df7fe38..671c528 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ErrorsResource.java
@@ -24,8 +24,6 @@ import java.io.IOException;
 import org.apache.helix.PropertyType;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -33,6 +31,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ErrorsResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(ErrorsResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java
index d47eac5..801a86f 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ExternalViewResource.java
@@ -24,8 +24,6 @@ import java.io.IOException;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.manager.zk.ZkClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -33,6 +31,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExternalViewResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(ExternalViewResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java
index fd6a5c1..b927a35 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/IdealStateResource.java
@@ -30,8 +30,6 @@ import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.tools.ClusterSetup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -40,6 +38,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java
index 1df5d97..23d6303 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstanceResource.java
@@ -27,8 +27,6 @@ import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.tools.ClusterSetup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -37,6 +35,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class InstanceResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(InstanceResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java
index 016023e..5909d72 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/InstancesResource.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.google.common.collect.Lists;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
@@ -33,8 +34,6 @@ import org.apache.helix.model.InstanceConfig;
 import org.apache.helix.model.LiveInstance;
 import org.apache.helix.tools.ClusterSetup;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -43,8 +42,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
-
-import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class InstancesResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(InstancesResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobQueueResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobQueueResource.java
index 93c52db..10c603d 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobQueueResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobQueueResource.java
@@ -19,6 +19,8 @@ package org.apache.helix.webapp.resources;
  * under the License.
  */
 
+import java.util.Map;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.PropertyKey;
@@ -30,8 +32,6 @@ import org.apache.helix.task.TaskDriver;
 import org.apache.helix.task.TaskUtil;
 import org.apache.helix.task.Workflow;
 import org.apache.helix.task.WorkflowContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.restlet.data.Form;
 import org.restlet.data.MediaType;
 import org.restlet.data.Status;
@@ -39,8 +39,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
-
-import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at <code>"/clusters/{clusterName}/jobQueues/{jobQueue}"
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobQueuesResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobQueuesResource.java
index 3cca5e3..2937026 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobQueuesResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobQueuesResource.java
@@ -19,6 +19,11 @@ package org.apache.helix.webapp.resources;
  * under the License.
  */
 
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.collect.Lists;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
@@ -30,8 +35,6 @@ import org.apache.helix.task.JobQueue;
 import org.apache.helix.task.TaskDriver;
 import org.apache.helix.task.Workflow;
 import org.apache.helix.task.WorkflowConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.Form;
@@ -42,11 +45,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at <code>"/clusters/{clusterName}/jobQueues"
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobResource.java
index ee417dc..8389e5d 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/JobResource.java
@@ -27,14 +27,14 @@ import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.task.JobContext;
 import org.apache.helix.task.TaskDriver;
 import org.apache.helix.task.TaskUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.restlet.data.MediaType;
 import org.restlet.data.Status;
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for server-side resource at <code>"/clusters/{clusterName}/jobQueues/{jobQueue}/{job}"
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java
index dbbbca4..a8c7634 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupResource.java
@@ -27,8 +27,6 @@ import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.tools.ClusterSetup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -37,6 +35,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ResourceGroupResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(ResourceGroupResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java
index 6618d7d..75f8fb5 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ResourceGroupsResource.java
@@ -23,6 +23,8 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixException;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.ZNRecord;
@@ -30,8 +32,6 @@ import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.model.IdealState.RebalanceMode;
 import org.apache.helix.tools.ClusterSetup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -40,9 +40,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ResourceGroupsResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(ResourceGroupsResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/SchedulerTasksResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/SchedulerTasksResource.java
index 1024f4d..9e4b849 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/SchedulerTasksResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/SchedulerTasksResource.java
@@ -37,8 +37,6 @@ import org.apache.helix.model.Message;
 import org.apache.helix.model.Message.MessageType;
 import org.apache.helix.tools.ClusterSetup;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.Form;
@@ -48,6 +46,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This resource can be used to send scheduler tasks to the controller.
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StateModelResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StateModelResource.java
index 7c2a98c..efb5776 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StateModelResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StateModelResource.java
@@ -30,8 +30,6 @@ import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.model.StateModelDefinition;
 import org.apache.helix.tools.ClusterSetup;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -40,6 +38,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StateModelResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(StateModelResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StateModelsResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StateModelsResource.java
index ce9c7a6..326fa54 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StateModelsResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StateModelsResource.java
@@ -29,8 +29,6 @@ import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.model.StateModelDefinition;
 import org.apache.helix.tools.ClusterSetup;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -39,6 +37,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StateModelsResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(StateModelsResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StatusUpdateResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StatusUpdateResource.java
index b5e29ab..2d81a22 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StatusUpdateResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StatusUpdateResource.java
@@ -25,8 +25,6 @@ import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -34,6 +32,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StatusUpdateResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(StatusUpdateResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StatusUpdatesResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StatusUpdatesResource.java
index 4e2a891..0838a85 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StatusUpdatesResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/StatusUpdatesResource.java
@@ -24,8 +24,6 @@ import java.io.IOException;
 import org.apache.helix.PropertyType;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.MediaType;
@@ -33,6 +31,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StatusUpdatesResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(StatusUpdatesResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/WorkflowsResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/WorkflowsResource.java
index 7cabcb6..a695c36 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/WorkflowsResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/WorkflowsResource.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Lists;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
@@ -37,8 +38,6 @@ import org.apache.helix.task.TaskDriver;
 import org.apache.helix.task.Workflow;
 import org.apache.helix.task.WorkflowConfig;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.data.Form;
@@ -49,8 +48,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
-
-import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WorkflowsResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(WorkflowsResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java
index 967536d..d321e38 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java
@@ -24,8 +24,6 @@ import java.util.List;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.data.Stat;
 import org.restlet.data.MediaType;
 import org.restlet.data.Status;
@@ -33,6 +31,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZkChildResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(ZkChildResource.class);
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java
index 30ffba1..3e49284 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java
@@ -26,8 +26,6 @@ import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.webapp.RestAdminApplication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.data.Stat;
 import org.restlet.data.MediaType;
 import org.restlet.data.Status;
@@ -35,6 +33,8 @@ import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
 import org.restlet.representation.Variant;
 import org.restlet.resource.ServerResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZkPathResource extends ServerResource {
   private final static Logger LOG = LoggerFactory.getLogger(ZkPathResource.class);
diff --git a/helix-admin-webapp/src/test/java/org/apache/helix/webapp/AdminTestBase.java b/helix-admin-webapp/src/test/java/org/apache/helix/webapp/AdminTestBase.java
index 1daf330..0037a5b 100644
--- a/helix-admin-webapp/src/test/java/org/apache/helix/webapp/AdminTestBase.java
+++ b/helix-admin-webapp/src/test/java/org/apache/helix/webapp/AdminTestBase.java
@@ -19,6 +19,8 @@ package org.apache.helix.webapp;
  * under the License.
  */
 
+import java.util.logging.Level;
+
 import org.I0Itec.zkclient.ZkServer;
 import org.apache.helix.TestHelper;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
@@ -34,8 +36,6 @@ import org.testng.AssertJUnit;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
 
-import java.util.logging.Level;
-
 public class AdminTestBase {
   private static Logger LOG = LoggerFactory.getLogger(AdminTestBase.class);
   public static final String ZK_ADDR = "localhost:2187";
diff --git a/helix-admin-webapp/src/test/java/org/apache/helix/webapp/resources/TestJobQueuesResource.java b/helix-admin-webapp/src/test/java/org/apache/helix/webapp/resources/TestJobQueuesResource.java
index 81597b2..6d5d5e2 100644
--- a/helix-admin-webapp/src/test/java/org/apache/helix/webapp/resources/TestJobQueuesResource.java
+++ b/helix-admin-webapp/src/test/java/org/apache/helix/webapp/resources/TestJobQueuesResource.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.google.common.collect.Lists;
-
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.integration.manager.ClusterControllerManager;
@@ -46,7 +45,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-
 import org.yaml.snakeyaml.Yaml;
 
 public class TestJobQueuesResource extends AdminTestBase {
diff --git a/helix-agent/src/main/java/org/apache/helix/agent/AgentStateModel.java b/helix-agent/src/main/java/org/apache/helix/agent/AgentStateModel.java
index c46a31e..3552f85 100644
--- a/helix-agent/src/main/java/org/apache/helix/agent/AgentStateModel.java
+++ b/helix-agent/src/main/java/org/apache/helix/agent/AgentStateModel.java
@@ -30,8 +30,8 @@ import org.apache.helix.ExternalCommand;
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.HelixConfigScope;
-import org.apache.helix.model.Message;
 import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
+import org.apache.helix.model.Message;
 import org.apache.helix.model.builder.HelixConfigScopeBuilder;
 import org.apache.helix.participant.statemachine.StateModel;
 import org.apache.helix.participant.statemachine.StateModelInfo;
diff --git a/helix-core/src/main/java/org/apache/helix/HelixAdmin.java b/helix-core/src/main/java/org/apache/helix/HelixAdmin.java
index 7402c19..a986f8a 100644
--- a/helix-core/src/main/java/org/apache/helix/HelixAdmin.java
+++ b/helix-core/src/main/java/org/apache/helix/HelixAdmin.java
@@ -22,6 +22,7 @@ package org.apache.helix;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.model.ClusterConstraints;
 import org.apache.helix.model.ClusterConstraints.ConstraintType;
 import org.apache.helix.model.ConstraintItem;
diff --git a/helix-core/src/main/java/org/apache/helix/HelixManager.java b/helix-core/src/main/java/org/apache/helix/HelixManager.java
index 1a6815f..67d77ec 100644
--- a/helix-core/src/main/java/org/apache/helix/HelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/HelixManager.java
@@ -20,10 +20,19 @@ package org.apache.helix;
  */
 
 import java.util.List;
-
 import java.util.Set;
+
 import org.apache.helix.api.listeners.ClusterConfigChangeListener;
+import org.apache.helix.api.listeners.ConfigChangeListener;
+import org.apache.helix.api.listeners.ControllerChangeListener;
+import org.apache.helix.api.listeners.CurrentStateChangeListener;
+import org.apache.helix.api.listeners.ExternalViewChangeListener;
+import org.apache.helix.api.listeners.IdealStateChangeListener;
+import org.apache.helix.api.listeners.InstanceConfigChangeListener;
+import org.apache.helix.api.listeners.LiveInstanceChangeListener;
+import org.apache.helix.api.listeners.MessageListener;
 import org.apache.helix.api.listeners.ResourceConfigChangeListener;
+import org.apache.helix.api.listeners.ScopedConfigChangeListener;
 import org.apache.helix.controller.GenericHelixController;
 import org.apache.helix.controller.pipeline.Pipeline;
 import org.apache.helix.healthcheck.ParticipantHealthReportCollector;
@@ -34,15 +43,6 @@ import org.apache.helix.participant.HelixStateMachineEngine;
 import org.apache.helix.participant.StateMachineEngine;
 import org.apache.helix.spectator.RoutingTableProvider;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
-import org.apache.helix.api.listeners.MessageListener;
-import org.apache.helix.api.listeners.ScopedConfigChangeListener;
-import org.apache.helix.api.listeners.IdealStateChangeListener;
-import org.apache.helix.api.listeners.LiveInstanceChangeListener;
-import org.apache.helix.api.listeners.CurrentStateChangeListener;
-import org.apache.helix.api.listeners.ExternalViewChangeListener;
-import org.apache.helix.api.listeners.InstanceConfigChangeListener;
-import org.apache.helix.api.listeners.ConfigChangeListener;
-import org.apache.helix.api.listeners.ControllerChangeListener;
 
 /**
  * Class that represents the Helix Agent.
diff --git a/helix-core/src/main/java/org/apache/helix/InstanceType.java b/helix-core/src/main/java/org/apache/helix/InstanceType.java
index 2e135ba..84e9d87 100644
--- a/helix-core/src/main/java/org/apache/helix/InstanceType.java
+++ b/helix-core/src/main/java/org/apache/helix/InstanceType.java
@@ -20,8 +20,8 @@ package org.apache.helix;
  */
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
+
 import org.apache.helix.monitoring.mbeans.MonitorDomainNames;
 
 /**
diff --git a/helix-core/src/main/java/org/apache/helix/PropertyKey.java b/helix-core/src/main/java/org/apache/helix/PropertyKey.java
index 369e48e..30305b8 100644
--- a/helix-core/src/main/java/org/apache/helix/PropertyKey.java
+++ b/helix-core/src/main/java/org/apache/helix/PropertyKey.java
@@ -19,8 +19,6 @@ package org.apache.helix;
  * under the License.
  */
 
-import static org.apache.helix.PropertyType.*;
-
 import java.util.Arrays;
 import java.util.Objects;
 
@@ -50,6 +48,27 @@ import org.apache.helix.task.WorkflowContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.helix.PropertyType.CONFIGS;
+import static org.apache.helix.PropertyType.CONTROLLER;
+import static org.apache.helix.PropertyType.CURRENTSTATES;
+import static org.apache.helix.PropertyType.ERRORS;
+import static org.apache.helix.PropertyType.ERRORS_CONTROLLER;
+import static org.apache.helix.PropertyType.EXTERNALVIEW;
+import static org.apache.helix.PropertyType.HISTORY;
+import static org.apache.helix.PropertyType.IDEALSTATES;
+import static org.apache.helix.PropertyType.INSTANCE_HISTORY;
+import static org.apache.helix.PropertyType.LEADER;
+import static org.apache.helix.PropertyType.LIVEINSTANCES;
+import static org.apache.helix.PropertyType.MAINTENANCE;
+import static org.apache.helix.PropertyType.MESSAGES;
+import static org.apache.helix.PropertyType.MESSAGES_CONTROLLER;
+import static org.apache.helix.PropertyType.PAUSE;
+import static org.apache.helix.PropertyType.RESTCONFIGS;
+import static org.apache.helix.PropertyType.STATEMODELDEFS;
+import static org.apache.helix.PropertyType.STATUSUPDATES;
+import static org.apache.helix.PropertyType.STATUSUPDATES_CONTROLLER;
+import static org.apache.helix.PropertyType.TARGETEXTERNALVIEW;
+
 /**
  * Key allowing for type-safe lookups of and conversions to {@link HelixProperty} objects.
  */
diff --git a/helix-core/src/main/java/org/apache/helix/PropertyPathBuilder.java b/helix-core/src/main/java/org/apache/helix/PropertyPathBuilder.java
index a0de770..52bf9f7 100644
--- a/helix-core/src/main/java/org/apache/helix/PropertyPathBuilder.java
+++ b/helix-core/src/main/java/org/apache/helix/PropertyPathBuilder.java
@@ -25,11 +25,11 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.helix.model.ControllerHistory;
 import org.apache.helix.model.CurrentState;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.model.InstanceConfig;
-import org.apache.helix.model.ControllerHistory;
 import org.apache.helix.model.LiveInstance;
 import org.apache.helix.model.MaintenanceSignal;
 import org.apache.helix.model.Message;
@@ -40,7 +40,18 @@ import org.apache.helix.task.WorkflowContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.helix.PropertyType.*;
+import static org.apache.helix.PropertyType.CONFIGS;
+import static org.apache.helix.PropertyType.CURRENTSTATES;
+import static org.apache.helix.PropertyType.EXTERNALVIEW;
+import static org.apache.helix.PropertyType.HISTORY;
+import static org.apache.helix.PropertyType.IDEALSTATES;
+import static org.apache.helix.PropertyType.LIVEINSTANCES;
+import static org.apache.helix.PropertyType.MAINTENANCE;
+import static org.apache.helix.PropertyType.MESSAGES;
+import static org.apache.helix.PropertyType.PAUSE;
+import static org.apache.helix.PropertyType.STATEMODELDEFS;
+import static org.apache.helix.PropertyType.STATUSUPDATES;
+import static org.apache.helix.PropertyType.WORKFLOWCONTEXT;
 
 /**
  * Utility mapping properties to their Zookeeper locations
diff --git a/helix-core/src/main/java/org/apache/helix/api/config/HelixConfigProperty.java b/helix-core/src/main/java/org/apache/helix/api/config/HelixConfigProperty.java
index eff63cb..5cf9aac 100644
--- a/helix-core/src/main/java/org/apache/helix/api/config/HelixConfigProperty.java
+++ b/helix-core/src/main/java/org/apache/helix/api/config/HelixConfigProperty.java
@@ -22,6 +22,7 @@ package org.apache.helix.api.config;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
 
 /**
diff --git a/helix-core/src/main/java/org/apache/helix/api/config/RebalanceConfig.java b/helix-core/src/main/java/org/apache/helix/api/config/RebalanceConfig.java
index 4c82cf6..3750554 100644
--- a/helix-core/src/main/java/org/apache/helix/api/config/RebalanceConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/api/config/RebalanceConfig.java
@@ -21,6 +21,7 @@ package org.apache.helix.api.config;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.rebalancer.Rebalancer;
 import org.apache.helix.task.TaskRebalancer;
diff --git a/helix-core/src/main/java/org/apache/helix/api/config/StateTransitionThrottleConfig.java b/helix-core/src/main/java/org/apache/helix/api/config/StateTransitionThrottleConfig.java
index 65791e9..a884c31 100644
--- a/helix-core/src/main/java/org/apache/helix/api/config/StateTransitionThrottleConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/api/config/StateTransitionThrottleConfig.java
@@ -22,6 +22,7 @@ package org.apache.helix.api.config;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.ObjectReader;
 import org.codehaus.jackson.map.ObjectWriter;
diff --git a/helix-core/src/main/java/org/apache/helix/api/config/StateTransitionTimeoutConfig.java b/helix-core/src/main/java/org/apache/helix/api/config/StateTransitionTimeoutConfig.java
index 0a69215..d39f466 100644
--- a/helix-core/src/main/java/org/apache/helix/api/config/StateTransitionTimeoutConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/api/config/StateTransitionTimeoutConfig.java
@@ -21,6 +21,7 @@ package org.apache.helix.api.config;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.ZNRecord;
 
 public class StateTransitionTimeoutConfig {
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/ConfigChangeListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/ConfigChangeListener.java
index 7b4159a..73cac3a 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/ConfigChangeListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/ConfigChangeListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.InstanceConfig;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/CurrentStateChangeListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/CurrentStateChangeListener.java
index 2a94da4..c03ece3 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/CurrentStateChangeListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/CurrentStateChangeListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.CurrentState;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/ExternalViewChangeListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/ExternalViewChangeListener.java
index a3e8977..24d023a 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/ExternalViewChangeListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/ExternalViewChangeListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.ExternalView;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/IdealStateChangeListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/IdealStateChangeListener.java
index 561a25e..35aa233 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/IdealStateChangeListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/IdealStateChangeListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.IdealState;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/InstanceConfigChangeListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/InstanceConfigChangeListener.java
index 02bebaa..e6d0db7 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/InstanceConfigChangeListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/InstanceConfigChangeListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.InstanceConfig;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/LiveInstanceChangeListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/LiveInstanceChangeListener.java
index b8d9461..fa78b76 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/LiveInstanceChangeListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/LiveInstanceChangeListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.LiveInstance;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/MessageListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/MessageListener.java
index 8cd0c20..24383a6 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/MessageListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/MessageListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.Message;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/ResourceConfigChangeListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/ResourceConfigChangeListener.java
index e453ecd..ee8cc62 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/ResourceConfigChangeListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/ResourceConfigChangeListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.ResourceConfig;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/listeners/ScopedConfigChangeListener.java b/helix-core/src/main/java/org/apache/helix/api/listeners/ScopedConfigChangeListener.java
index d25f386..08c4563 100644
--- a/helix-core/src/main/java/org/apache/helix/api/listeners/ScopedConfigChangeListener.java
+++ b/helix-core/src/main/java/org/apache/helix/api/listeners/ScopedConfigChangeListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.api.listeners;
  */
 
 import java.util.List;
+
 import org.apache.helix.HelixProperty;
 import org.apache.helix.NotificationContext;
 
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/constraint/AbstractRebalanceHardConstraint.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/constraint/AbstractRebalanceHardConstraint.java
index 7f2559e..f5ef994 100644
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/constraint/AbstractRebalanceHardConstraint.java
+++ b/helix-core/src/main/java/org/apache/helix/api/rebalancer/constraint/AbstractRebalanceHardConstraint.java
@@ -19,10 +19,10 @@ package org.apache.helix.api.rebalancer.constraint;
  * under the License.
  */
 
-import org.apache.helix.controller.common.ResourcesStateMap;
-
 import java.util.Map;
 
+import org.apache.helix.controller.common.ResourcesStateMap;
+
 public abstract class AbstractRebalanceHardConstraint {
   /**
    * Return a list of validate results.
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/constraint/AbstractRebalanceSoftConstraint.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/constraint/AbstractRebalanceSoftConstraint.java
index e06ad68..a466010 100644
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/constraint/AbstractRebalanceSoftConstraint.java
+++ b/helix-core/src/main/java/org/apache/helix/api/rebalancer/constraint/AbstractRebalanceSoftConstraint.java
@@ -19,10 +19,10 @@ package org.apache.helix.api.rebalancer.constraint;
  * under the License.
  */
 
-import org.apache.helix.controller.common.ResourcesStateMap;
-
 import java.util.Map;
 
+import org.apache.helix.controller.common.ResourcesStateMap;
+
 public abstract class AbstractRebalanceSoftConstraint {
   private static int DEFAULT_WEIGHT = 1;
   protected int _weight = DEFAULT_WEIGHT;
diff --git a/helix-core/src/main/java/org/apache/helix/common/DedupEventBlockingQueue.java b/helix-core/src/main/java/org/apache/helix/common/DedupEventBlockingQueue.java
index 0810456..34cc293 100644
--- a/helix-core/src/main/java/org/apache/helix/common/DedupEventBlockingQueue.java
+++ b/helix-core/src/main/java/org/apache/helix/common/DedupEventBlockingQueue.java
@@ -19,12 +19,13 @@ package org.apache.helix.common;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
 /**
  * A blocking queue of events, which automatically deduplicate events with the same "type" within
  * the queue, i.e, when putting an event into the queue, if there is already an event with the
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/AbstractDataCache.java b/helix-core/src/main/java/org/apache/helix/common/caches/AbstractDataCache.java
index 4387083..7c11b41 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/AbstractDataCache.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/AbstractDataCache.java
@@ -19,12 +19,13 @@ package org.apache.helix.common.caches;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixProperty;
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/AbstractDataSnapshot.java b/helix-core/src/main/java/org/apache/helix/common/caches/AbstractDataSnapshot.java
index cef090f..b239d3f 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/AbstractDataSnapshot.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/AbstractDataSnapshot.java
@@ -1,11 +1,11 @@
 package org.apache.helix.common.caches;
 
-import org.apache.helix.PropertyKey;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.helix.PropertyKey;
+
 public abstract class AbstractDataSnapshot<T> {
   protected final Map<PropertyKey, T> _properties;
 
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/BasicClusterDataCache.java b/helix-core/src/main/java/org/apache/helix/common/caches/BasicClusterDataCache.java
index b01bb0c..d4ffedd 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/BasicClusterDataCache.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/BasicClusterDataCache.java
@@ -21,6 +21,7 @@ package org.apache.helix.common.caches;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.helix.HelixConstants;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/CurrentStateCache.java b/helix-core/src/main/java/org/apache/helix/common/caches/CurrentStateCache.java
index c4801cc..d266196 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/CurrentStateCache.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/CurrentStateCache.java
@@ -19,7 +19,6 @@ package org.apache.helix.common.caches;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,6 +26,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.common.controllers.ControlContextProvider;
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/CurrentStateSnapshot.java b/helix-core/src/main/java/org/apache/helix/common/caches/CurrentStateSnapshot.java
index 1e405a4..a8b7087 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/CurrentStateSnapshot.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/CurrentStateSnapshot.java
@@ -1,13 +1,13 @@
 package org.apache.helix.common.caches;
 
-import org.apache.helix.PropertyKey;
-import org.apache.helix.model.CurrentState;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
+import org.apache.helix.PropertyKey;
+import org.apache.helix.model.CurrentState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/ExternalViewCache.java b/helix-core/src/main/java/org/apache/helix/common/caches/ExternalViewCache.java
index 49be1e6..15e9144 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/ExternalViewCache.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/ExternalViewCache.java
@@ -19,15 +19,15 @@ package org.apache.helix.common.caches;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/IdealStateCache.java b/helix-core/src/main/java/org/apache/helix/common/caches/IdealStateCache.java
index 0d2bf96..3271fa7 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/IdealStateCache.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/IdealStateCache.java
@@ -19,15 +19,15 @@ package org.apache.helix.common.caches;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.controller.LogUtil;
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/InstanceMessagesCache.java b/helix-core/src/main/java/org/apache/helix/common/caches/InstanceMessagesCache.java
index 56045a6..0740966 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/InstanceMessagesCache.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/InstanceMessagesCache.java
@@ -19,9 +19,6 @@ package org.apache.helix.common.caches;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -31,10 +28,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.PropertyKey;
-import org.apache.helix.controller.GenericHelixController;
 import org.apache.helix.model.CurrentState;
 import org.apache.helix.model.LiveInstance;
 import org.apache.helix.model.Message;
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/PropertyCache.java b/helix-core/src/main/java/org/apache/helix/common/caches/PropertyCache.java
index ad77524..a8c0ea2 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/PropertyCache.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/PropertyCache.java
@@ -27,6 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.PropertyKey;
@@ -35,9 +37,6 @@ import org.apache.helix.controller.LogUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Sets;
-
 /**
  * A general cache for HelixProperty that supports LIST, GET, SET, DELETE methods of Helix property.
  * All operation is in memory and is not persisted into the data store, but it provides a method to
diff --git a/helix-core/src/main/java/org/apache/helix/common/caches/TaskDataCache.java b/helix-core/src/main/java/org/apache/helix/common/caches/TaskDataCache.java
index 5c29124..58c1220 100644
--- a/helix-core/src/main/java/org/apache/helix/common/caches/TaskDataCache.java
+++ b/helix-core/src/main/java/org/apache/helix/common/caches/TaskDataCache.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyType;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/ExternalViewGenerator.java b/helix-core/src/main/java/org/apache/helix/controller/ExternalViewGenerator.java
index 693fd6e..ab25118 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/ExternalViewGenerator.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/ExternalViewGenerator.java
@@ -28,8 +28,8 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.apache.helix.ZNRecord;
-import org.apache.helix.model.Message;
 import org.apache.helix.model.CurrentState.CurrentStateProperty;
+import org.apache.helix.model.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
index b80b8cc..39a5ad7 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
@@ -19,7 +19,6 @@ package org.apache.helix.controller;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -36,6 +35,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+
+import com.google.common.collect.Sets;
 import org.I0Itec.zkclient.exception.ZkInterruptedException;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
@@ -98,7 +99,7 @@ import org.apache.helix.monitoring.mbeans.ClusterStatusMonitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.helix.HelixConstants.*;
+import static org.apache.helix.HelixConstants.ChangeType;
 
 /**
  * Cluster Controllers main goal is to keep the cluster state as close as possible to Ideal State.
diff --git a/helix-core/src/main/java/org/apache/helix/controller/common/PartitionStateMap.java b/helix-core/src/main/java/org/apache/helix/controller/common/PartitionStateMap.java
index c320285..e242839 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/common/PartitionStateMap.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/common/PartitionStateMap.java
@@ -19,13 +19,13 @@ package org.apache.helix.controller.common;
  * under the License.
  */
 
-import org.apache.helix.model.Partition;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.helix.model.Partition;
+
 /**
  * Hold the partition->{Instance, State} mapping for a resource.
  */
diff --git a/helix-core/src/main/java/org/apache/helix/controller/common/ResourcesStateMap.java b/helix-core/src/main/java/org/apache/helix/controller/common/ResourcesStateMap.java
index ccc31d1..da63c71 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/common/ResourcesStateMap.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/common/ResourcesStateMap.java
@@ -19,13 +19,13 @@ package org.apache.helix.controller.common;
  * under the License.
  */
 
-import org.apache.helix.model.Partition;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.helix.model.Partition;
+
 /**
  * Hold the Resource -> partition -> instance -> state mapping for all resources.
  * This is the base class for BestPossibleStateOutput, IdealState
diff --git a/helix-core/src/main/java/org/apache/helix/controller/dataproviders/BaseControllerDataProvider.java b/helix-core/src/main/java/org/apache/helix/controller/dataproviders/BaseControllerDataProvider.java
index dc0d507..405af47 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/dataproviders/BaseControllerDataProvider.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/dataproviders/BaseControllerDataProvider.java
@@ -19,6 +19,19 @@ package org.apache.helix.controller.dataproviders;
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.apache.helix.HelixConstants;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixProperty;
@@ -43,19 +56,6 @@ import org.apache.helix.model.StateModelDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 /**
  * Common building block for controller to cache their data. This common building block contains
  * information about cluster config, instance config, resource config, ideal states, current state,
diff --git a/helix-core/src/main/java/org/apache/helix/controller/dataproviders/WorkflowControllerDataProvider.java b/helix-core/src/main/java/org/apache/helix/controller/dataproviders/WorkflowControllerDataProvider.java
index b235695..714b659 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/dataproviders/WorkflowControllerDataProvider.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/dataproviders/WorkflowControllerDataProvider.java
@@ -19,6 +19,11 @@ package org.apache.helix.controller.dataproviders;
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.helix.HelixConstants;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.ZNRecord;
@@ -38,11 +43,6 @@ import org.apache.helix.task.WorkflowContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Data provider for workflow controller.
  *
diff --git a/helix-core/src/main/java/org/apache/helix/controller/pipeline/PipelineRegistry.java b/helix-core/src/main/java/org/apache/helix/controller/pipeline/PipelineRegistry.java
index 20a80e9..2ec6de4 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/pipeline/PipelineRegistry.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/pipeline/PipelineRegistry.java
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.controller.stages.ClusterEventType;
 
 public class PipelineRegistry {
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/AbstractRebalancer.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/AbstractRebalancer.java
index 6f93543..4a6eff8 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/AbstractRebalancer.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/AbstractRebalancer.java
@@ -28,6 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/CustomRebalancer.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/CustomRebalancer.java
index 3cf90c1..8f82312 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/CustomRebalancer.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/CustomRebalancer.java
@@ -22,6 +22,7 @@ package org.apache.helix.controller.rebalancer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.stages.CurrentStateOutput;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/DelayedAutoRebalancer.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/DelayedAutoRebalancer.java
index 65b3f84..6ae7076 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/DelayedAutoRebalancer.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/DelayedAutoRebalancer.java
@@ -28,6 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.api.config.StateTransitionThrottleConfig;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/MaintenanceRebalancer.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/MaintenanceRebalancer.java
index 7b0c997..a232a2a 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/MaintenanceRebalancer.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/MaintenanceRebalancer.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.stages.CurrentStateOutput;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/PartitionWeightAwareEvennessConstraint.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/PartitionWeightAwareEvennessConstraint.java
index af5e462..465c430 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/PartitionWeightAwareEvennessConstraint.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/PartitionWeightAwareEvennessConstraint.java
@@ -19,15 +19,15 @@ package org.apache.helix.controller.rebalancer.constraint;
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceSoftConstraint;
 import org.apache.helix.api.rebalancer.constraint.dataprovider.CapacityProvider;
 import org.apache.helix.api.rebalancer.constraint.dataprovider.PartitionWeightProvider;
 import org.apache.helix.controller.common.ResourcesStateMap;
 import org.apache.helix.controller.rebalancer.util.ResourceUsageCalculator;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class PartitionWeightAwareEvennessConstraint extends AbstractRebalanceSoftConstraint {
   private final PartitionWeightProvider _partitionWeightProvider;
   private final CapacityProvider _capacityProvider;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/TotalCapacityConstraint.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/TotalCapacityConstraint.java
index f76c555..6c3314f 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/TotalCapacityConstraint.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/TotalCapacityConstraint.java
@@ -19,15 +19,15 @@ package org.apache.helix.controller.rebalancer.constraint;
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceHardConstraint;
 import org.apache.helix.api.rebalancer.constraint.dataprovider.CapacityProvider;
 import org.apache.helix.api.rebalancer.constraint.dataprovider.PartitionWeightProvider;
 import org.apache.helix.controller.common.ResourcesStateMap;
 import org.apache.helix.controller.rebalancer.util.ResourceUsageCalculator;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class TotalCapacityConstraint extends AbstractRebalanceHardConstraint {
   private final PartitionWeightProvider _partitionWeightProvider;
   private final CapacityProvider _capacityProvider;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/ZkBasedCapacityProvider.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/ZkBasedCapacityProvider.java
index 0172b24..b4fefb3 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/ZkBasedCapacityProvider.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/ZkBasedCapacityProvider.java
@@ -19,14 +19,18 @@ package org.apache.helix.controller.rebalancer.constraint.dataprovider;
  * under the License.
  */
 
-import org.apache.helix.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.helix.AccessOption;
+import org.apache.helix.HelixException;
+import org.apache.helix.HelixProperty;
+import org.apache.helix.PropertyPathBuilder;
+import org.apache.helix.ZNRecord;
 import org.apache.helix.api.rebalancer.constraint.dataprovider.CapacityProvider;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * A capacity provider based on ZK node.
  * This class support persistent through Helix Property Store.
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/ZkBasedPartitionWeightProvider.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/ZkBasedPartitionWeightProvider.java
index 8cd46b3..8325682 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/ZkBasedPartitionWeightProvider.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/ZkBasedPartitionWeightProvider.java
@@ -19,14 +19,18 @@ package org.apache.helix.controller.rebalancer.constraint.dataprovider;
  * under the License.
  */
 
-import org.apache.helix.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.helix.AccessOption;
+import org.apache.helix.HelixException;
+import org.apache.helix.HelixProperty;
+import org.apache.helix.PropertyPathBuilder;
+import org.apache.helix.ZNRecord;
 import org.apache.helix.api.rebalancer.constraint.dataprovider.PartitionWeightProvider;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * A resource weight provider based on ZK node.
  * This class support persistent through Helix Property Store.
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/ConstraintRebalanceStrategy.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/ConstraintRebalanceStrategy.java
index 683518e..4d8b41f 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/ConstraintRebalanceStrategy.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/ConstraintRebalanceStrategy.java
@@ -26,6 +26,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceHardConstraint;
@@ -33,8 +34,8 @@ import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceSoftConstrain
 import org.apache.helix.api.rebalancer.constraint.dataprovider.CapacityProvider;
 import org.apache.helix.api.rebalancer.constraint.dataprovider.PartitionWeightProvider;
 import org.apache.helix.controller.LogUtil;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.ResourcesStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.rebalancer.constraint.PartitionWeightAwareEvennessConstraint;
 import org.apache.helix.controller.rebalancer.strategy.crushMapping.CardDealingAdjustmentAlgorithmV2;
 import org.apache.helix.controller.rebalancer.topology.Topology;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/RebalanceStrategy.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/RebalanceStrategy.java
index 337dc89..223cf8e 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/RebalanceStrategy.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/RebalanceStrategy.java
@@ -22,6 +22,7 @@ package org.apache.helix.controller.rebalancer.strategy;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/crushMapping/CRUSHPlacementAlgorithm.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/crushMapping/CRUSHPlacementAlgorithm.java
index c8b00e5..2c5d6eb 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/crushMapping/CRUSHPlacementAlgorithm.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/strategy/crushMapping/CRUSHPlacementAlgorithm.java
@@ -15,8 +15,6 @@
 
 package org.apache.helix.controller.rebalancer.strategy.crushMapping;
 
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -26,6 +24,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import org.apache.helix.controller.rebalancer.topology.Node;
 import org.apache.helix.util.JenkinsHash;
 import org.slf4j.Logger;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/RebalanceScheduler.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/RebalanceScheduler.java
index 732734c..9a57c07 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/RebalanceScheduler.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/RebalanceScheduler.java
@@ -1,23 +1,22 @@
 package org.apache.helix.controller.rebalancer.util;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.model.IdealState;
-
 import org.apache.helix.model.ResourceConfig;
 import org.apache.helix.util.RebalanceUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Class for trigger rebalancing of a set of resource in a future time.
  */
diff --git a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/ResourceUsageCalculator.java b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/ResourceUsageCalculator.java
index b47a2ed..c2d472a 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/ResourceUsageCalculator.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/ResourceUsageCalculator.java
@@ -1,12 +1,12 @@
 package org.apache.helix.controller.rebalancer.util;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.helix.api.rebalancer.constraint.dataprovider.PartitionWeightProvider;
 import org.apache.helix.controller.common.ResourcesStateMap;
 import org.apache.helix.model.Partition;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class ResourceUsageCalculator {
   /**
    * A convenient tool for calculating partition capacity usage based on the assignment and resource weight provider.
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateOutput.java b/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateOutput.java
index b5be5fe..c0270c0 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateOutput.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateOutput.java
@@ -23,7 +23,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.helix.controller.common.PartitionStateMap;
 import org.apache.helix.controller.common.ResourcesStateMap;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java b/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java
index 25917fa..0f321e1 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.common.caches.CurrentStateCache;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterEvent.java b/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterEvent.java
index b09c297..c05d0a6 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterEvent.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterEvent.java
@@ -21,8 +21,8 @@ package org.apache.helix.controller.stages;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import java.util.UUID;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/CompatibilityCheckStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/CompatibilityCheckStage.java
index b6a0560..70e3444a 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/CompatibilityCheckStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/CompatibilityCheckStage.java
@@ -23,8 +23,8 @@ import java.util.Map;
 
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerProperties;
-import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.LogUtil;
+import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
 import org.apache.helix.controller.pipeline.StageException;
 import org.apache.helix.model.LiveInstance;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/CurrentStateComputationStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/CurrentStateComputationStage.java
index d5c65cd..66da8ba 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/CurrentStateComputationStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/CurrentStateComputationStage.java
@@ -22,12 +22,17 @@ package org.apache.helix.controller.stages;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
+
 import org.apache.helix.controller.LogUtil;
+import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
 import org.apache.helix.controller.pipeline.StageException;
-import org.apache.helix.model.*;
+import org.apache.helix.model.CurrentState;
+import org.apache.helix.model.LiveInstance;
+import org.apache.helix.model.Message;
 import org.apache.helix.model.Message.MessageType;
+import org.apache.helix.model.Partition;
+import org.apache.helix.model.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/CurrentStateOutput.java b/helix-core/src/main/java/org/apache/helix/controller/stages/CurrentStateOutput.java
index 13e1dbf..bbbf0fd 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/CurrentStateOutput.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/CurrentStateOutput.java
@@ -23,12 +23,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.model.CurrentState;
 import org.apache.helix.model.Message;
 import org.apache.helix.model.Partition;
 
-import com.google.common.collect.Sets;
-
 /**
  * The current state includes both current state and pending messages
  * For pending messages, we consider both toState and fromState
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
index 37df042..f14f82a 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
@@ -28,20 +28,20 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.api.config.StateTransitionThrottleConfig;
 import org.apache.helix.api.config.StateTransitionThrottleConfig.RebalanceType;
 import org.apache.helix.controller.LogUtil;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
 import org.apache.helix.controller.pipeline.StageException;
 import org.apache.helix.model.BuiltInStateModelDefinitions;
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.IdealState;
-import org.apache.helix.model.InstanceConfig;
 import org.apache.helix.model.MaintenanceSignal;
 import org.apache.helix.model.Partition;
 import org.apache.helix.model.Resource;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/MaintenanceRecoveryStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/MaintenanceRecoveryStage.java
index d64459a..269f139 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/MaintenanceRecoveryStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/MaintenanceRecoveryStage.java
@@ -21,6 +21,7 @@ package org.apache.helix.controller.stages;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.HelixManager;
 import org.apache.helix.controller.LogUtil;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/MessageDispatchStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/MessageDispatchStage.java
index 4252e8d..f2a5e2c 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/MessageDispatchStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/MessageDispatchStage.java
@@ -31,8 +31,8 @@ import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerProperties;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
-import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.LogUtil;
+import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
 import org.apache.helix.controller.pipeline.StageException;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java b/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java
index 196dfee..99bcdb5 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/MessageGenerationPhase.java
@@ -33,10 +33,10 @@ import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.SystemPropertyKeys;
 import org.apache.helix.api.config.StateTransitionTimeoutConfig;
-import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.LogUtil;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.ResourcesStateMap;
+import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
 import org.apache.helix.controller.pipeline.StageException;
 import org.apache.helix.manager.zk.DefaultSchedulerMessageHandlerFactory;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/MessageThrottleStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/MessageThrottleStage.java
index 4a7b321..b935752 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/MessageThrottleStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/MessageThrottleStage.java
@@ -31,13 +31,13 @@ import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
 import org.apache.helix.controller.pipeline.StageException;
 import org.apache.helix.model.ClusterConstraints;
-import org.apache.helix.model.Message;
-import org.apache.helix.model.Partition;
-import org.apache.helix.model.Resource;
 import org.apache.helix.model.ClusterConstraints.ConstraintAttribute;
-import org.apache.helix.model.ConstraintItem;
 import org.apache.helix.model.ClusterConstraints.ConstraintType;
 import org.apache.helix.model.ClusterConstraints.ConstraintValue;
+import org.apache.helix.model.ConstraintItem;
+import org.apache.helix.model.Message;
+import org.apache.helix.model.Partition;
+import org.apache.helix.model.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/PersistAssignmentStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/PersistAssignmentStage.java
index 12a0b23..d33cdfc 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/PersistAssignmentStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/PersistAssignmentStage.java
@@ -33,8 +33,8 @@ import org.apache.helix.HelixManager;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.LogUtil;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractAsyncBaseStage;
 import org.apache.helix.controller.pipeline.AsyncWorkerType;
 import org.apache.helix.model.BuiltInStateModelDefinitions;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/ReadClusterDataStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/ReadClusterDataStage.java
index d9f3428..d284c8e 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/ReadClusterDataStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/ReadClusterDataStage.java
@@ -19,16 +19,17 @@ package org.apache.helix.controller.stages;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
-import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.LogUtil;
+import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/ResourceComputationStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/ResourceComputationStage.java
index 359d836..f44cde0 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/ResourceComputationStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/ResourceComputationStage.java
@@ -22,8 +22,9 @@ package org.apache.helix.controller.stages;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
+
 import org.apache.helix.controller.LogUtil;
+import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
 import org.apache.helix.controller.pipeline.StageException;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/ResourceValidationStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/ResourceValidationStage.java
index 44a92df..99bc9a1 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/ResourceValidationStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/ResourceValidationStage.java
@@ -21,8 +21,8 @@ package org.apache.helix.controller.stages;
 
 import java.util.Map;
 
-import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.LogUtil;
+import org.apache.helix.controller.dataproviders.BaseControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractBaseStage;
 import org.apache.helix.controller.pipeline.StageException;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/TargetExteralViewCalcStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/TargetExteralViewCalcStage.java
index 7a7c2e6..967bdd9 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/TargetExteralViewCalcStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/TargetExteralViewCalcStage.java
@@ -23,12 +23,14 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.PropertyKey;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractAsyncBaseStage;
 import org.apache.helix.controller.pipeline.AsyncWorkerType;
 import org.apache.helix.model.ClusterConfig;
@@ -38,8 +40,6 @@ import org.apache.helix.model.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Maps;
-
 public class TargetExteralViewCalcStage extends AbstractAsyncBaseStage {
   private static final Logger LOG = LoggerFactory.getLogger(TargetExteralViewCalcStage.class);
 
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/TaskGarbageCollectionStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/TaskGarbageCollectionStage.java
index e701f65..7b7bc03 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/TaskGarbageCollectionStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/TaskGarbageCollectionStage.java
@@ -2,6 +2,7 @@ package org.apache.helix.controller.stages;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
 import org.apache.helix.controller.pipeline.AbstractAsyncBaseStage;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/resource/ResourceMessageGenerationPhase.java b/helix-core/src/main/java/org/apache/helix/controller/stages/resource/ResourceMessageGenerationPhase.java
index f12f7ca..d0462c5 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/resource/ResourceMessageGenerationPhase.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/resource/ResourceMessageGenerationPhase.java
@@ -19,10 +19,10 @@ package org.apache.helix.controller.stages.resource;
  * under the License.
  */
 
-import org.apache.helix.controller.stages.MessageGenerationPhase;
 import org.apache.helix.controller.stages.AttributeName;
 import org.apache.helix.controller.stages.ClusterEvent;
 import org.apache.helix.controller.stages.IntermediateStateOutput;
+import org.apache.helix.controller.stages.MessageGenerationPhase;
 
 /**
  * Compares the currentState, pendingState with IdealState and generate messages for regular resource
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/task/TaskMessageGenerationPhase.java b/helix-core/src/main/java/org/apache/helix/controller/stages/task/TaskMessageGenerationPhase.java
index bdeace3..0fe327f 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/task/TaskMessageGenerationPhase.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/task/TaskMessageGenerationPhase.java
@@ -19,10 +19,10 @@ package org.apache.helix.controller.stages.task;
  * under the License.
  */
 
-import org.apache.helix.controller.stages.MessageGenerationPhase;
 import org.apache.helix.controller.stages.AttributeName;
 import org.apache.helix.controller.stages.BestPossibleStateOutput;
 import org.apache.helix.controller.stages.ClusterEvent;
+import org.apache.helix.controller.stages.MessageGenerationPhase;
 
 /**
  * Compares the currentState, pendingState with IdealState and generate messages for task pipeline
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/task/TaskSchedulingStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/task/TaskSchedulingStage.java
index 94af50d..add4d35 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/task/TaskSchedulingStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/task/TaskSchedulingStage.java
@@ -1,6 +1,5 @@
 package org.apache.helix.controller.stages.task;
 
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -8,6 +7,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.PriorityQueue;
 import java.util.Set;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixConstants;
 import org.apache.helix.HelixManager;
 import org.apache.helix.controller.LogUtil;
diff --git a/helix-core/src/main/java/org/apache/helix/controller/strategy/AutoRebalanceStrategy.java b/helix-core/src/main/java/org/apache/helix/controller/strategy/AutoRebalanceStrategy.java
index d445664..270e6de 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/strategy/AutoRebalanceStrategy.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/strategy/AutoRebalanceStrategy.java
@@ -19,11 +19,6 @@ package org.apache.helix.controller.strategy;
  * under the License.
  */
 
-import org.apache.helix.HelixManager;
-import org.apache.helix.ZNRecord;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -37,6 +32,11 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.apache.helix.HelixManager;
+import org.apache.helix.ZNRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * The class was moved to controller.rebalancer.strategy.
  */
diff --git a/helix-core/src/main/java/org/apache/helix/examples/BootstrapProcess.java b/helix-core/src/main/java/org/apache/helix/examples/BootstrapProcess.java
index de72993..0e73b8c 100644
--- a/helix-core/src/main/java/org/apache/helix/examples/BootstrapProcess.java
+++ b/helix-core/src/main/java/org/apache/helix/examples/BootstrapProcess.java
@@ -18,11 +18,13 @@ package org.apache.helix.examples;
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Date;
 import java.util.List;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
@@ -46,8 +48,6 @@ import org.apache.helix.participant.StateMachineEngine;
 import org.apache.helix.participant.statemachine.StateModel;
 import org.apache.helix.participant.statemachine.StateModelFactory;
 
-import com.google.common.collect.ImmutableList;
-
 /**
  * This process does little more than handling the state transition messages.
  * This is generally the case when the server needs to bootstrap when it comes
diff --git a/helix-core/src/main/java/org/apache/helix/examples/WeightAwareRebalanceUtilExample.java b/helix-core/src/main/java/org/apache/helix/examples/WeightAwareRebalanceUtilExample.java
index 43ab511..13d22ba 100644
--- a/helix-core/src/main/java/org/apache/helix/examples/WeightAwareRebalanceUtilExample.java
+++ b/helix-core/src/main/java/org/apache/helix/examples/WeightAwareRebalanceUtilExample.java
@@ -1,5 +1,11 @@
 package org.apache.helix.examples;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.I0Itec.zkclient.ZkServer;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceHardConstraint;
@@ -17,8 +23,6 @@ import org.apache.helix.model.InstanceConfig;
 import org.apache.helix.model.ResourceConfig;
 import org.apache.helix.util.WeightAwareRebalanceUtil;
 
-import java.util.*;
-
 public class WeightAwareRebalanceUtilExample {
   private static String ZK_ADDRESS = "localhost:2199";
   private static String CLUSTER_NAME = "RebalanceUtilExampleCluster";
diff --git a/helix-core/src/main/java/org/apache/helix/healthcheck/ParticipantHealthReportCollectorImpl.java b/helix-core/src/main/java/org/apache/helix/healthcheck/ParticipantHealthReportCollectorImpl.java
index 977dfdf..2ca9dd2 100644
--- a/helix-core/src/main/java/org/apache/helix/healthcheck/ParticipantHealthReportCollectorImpl.java
+++ b/helix-core/src/main/java/org/apache/helix/healthcheck/ParticipantHealthReportCollectorImpl.java
@@ -24,8 +24,8 @@ import java.util.Map;
 
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
-import org.apache.helix.ZNRecord;
 import org.apache.helix.PropertyKey.Builder;
+import org.apache.helix.ZNRecord;
 import org.apache.helix.model.HealthStat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/CallbackHandler.java b/helix-core/src/main/java/org/apache/helix/manager/zk/CallbackHandler.java
index 42afcd1..0f03ee4 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/CallbackHandler.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/CallbackHandler.java
@@ -72,7 +72,18 @@ import org.apache.zookeeper.Watcher.Event.EventType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.helix.HelixConstants.ChangeType.*;
+import static org.apache.helix.HelixConstants.ChangeType.CLUSTER_CONFIG;
+import static org.apache.helix.HelixConstants.ChangeType.CONFIG;
+import static org.apache.helix.HelixConstants.ChangeType.CONTROLLER;
+import static org.apache.helix.HelixConstants.ChangeType.CURRENT_STATE;
+import static org.apache.helix.HelixConstants.ChangeType.EXTERNAL_VIEW;
+import static org.apache.helix.HelixConstants.ChangeType.IDEAL_STATE;
+import static org.apache.helix.HelixConstants.ChangeType.INSTANCE_CONFIG;
+import static org.apache.helix.HelixConstants.ChangeType.LIVE_INSTANCE;
+import static org.apache.helix.HelixConstants.ChangeType.MESSAGE;
+import static org.apache.helix.HelixConstants.ChangeType.MESSAGES_CONTROLLER;
+import static org.apache.helix.HelixConstants.ChangeType.RESOURCE_CONFIG;
+import static org.apache.helix.HelixConstants.ChangeType.TARGET_EXTERNAL_VIEW;
 
 @PreFetch(enabled = false)
 public class CallbackHandler implements IZkChildListener, IZkDataListener {
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/DefaultControllerMessageHandlerFactory.java b/helix-core/src/main/java/org/apache/helix/manager/zk/DefaultControllerMessageHandlerFactory.java
index fc8fb7b..6c18da8 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/DefaultControllerMessageHandlerFactory.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/DefaultControllerMessageHandlerFactory.java
@@ -21,6 +21,7 @@ package org.apache.helix.manager.zk;
 
 import java.util.List;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.HelixException;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.messaging.handling.HelixTaskResult;
@@ -31,8 +32,6 @@ import org.apache.helix.model.Message.MessageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-
 public class DefaultControllerMessageHandlerFactory implements MultiTypeMessageHandlerFactory {
   private static Logger _logger = LoggerFactory.getLogger(DefaultControllerMessageHandlerFactory.class);
 
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/DefaultParticipantErrorMessageHandlerFactory.java b/helix-core/src/main/java/org/apache/helix/manager/zk/DefaultParticipantErrorMessageHandlerFactory.java
index e4d0c84..d08b38e 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/DefaultParticipantErrorMessageHandlerFactory.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/DefaultParticipantErrorMessageHandlerFactory.java
@@ -22,6 +22,7 @@ package org.apache.helix.manager.zk;
 import java.util.Arrays;
 import java.util.List;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
@@ -32,8 +33,6 @@ import org.apache.helix.model.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-
 /**
  * DefaultParticipantErrorMessageHandlerFactory works on controller side.
  * When the participant detects a critical error, it will send the PARTICIPANT_ERROR_REPORT
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/DistributedLeaderElection.java b/helix-core/src/main/java/org/apache/helix/manager/zk/DistributedLeaderElection.java
index d6b14b2..0a9d72d 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/DistributedLeaderElection.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/DistributedLeaderElection.java
@@ -19,6 +19,9 @@ package org.apache.helix.manager.zk;
  * under the License.
  */
 
+import java.lang.management.ManagementFactory;
+import java.util.List;
+
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
@@ -37,9 +40,6 @@ import org.apache.helix.model.LiveInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.management.ManagementFactory;
-import java.util.List;
-
 /**
  * do distributed leader election
  */
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/HelixGroupCommit.java b/helix-core/src/main/java/org/apache/helix/manager/zk/HelixGroupCommit.java
index 2dca50a..9cada74 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/HelixGroupCommit.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/HelixGroupCommit.java
@@ -18,6 +18,7 @@ package org.apache.helix.manager.zk;
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -27,9 +28,9 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.I0Itec.zkclient.DataUpdater;
 import org.I0Itec.zkclient.exception.ZkBadVersionException;
 import org.I0Itec.zkclient.exception.ZkNoNodeException;
+import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.data.Stat;
 
 public class HelixGroupCommit<T> {
   private static Logger LOG = LoggerFactory.getLogger(HelixGroupCommit.class);
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/WriteThroughCache.java b/helix-core/src/main/java/org/apache/helix/manager/zk/WriteThroughCache.java
index 1e0d8b7..82e9b21 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/WriteThroughCache.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/WriteThroughCache.java
@@ -26,9 +26,9 @@ import org.apache.helix.AccessOption;
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.store.zk.ZNode;
 import org.apache.helix.util.HelixUtil;
+import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.data.Stat;
 
 public class WriteThroughCache<T> extends Cache<T> {
   private static Logger LOG = LoggerFactory.getLogger(WriteThroughCache.class);
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
index 9ea8b5d..0a978e5 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
@@ -36,6 +36,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.I0Itec.zkclient.exception.ZkException;
 import org.I0Itec.zkclient.exception.ZkNoNodeException;
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixDataAccessor.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixDataAccessor.java
index 51f16ac..8d3eafa 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixDataAccessor.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixDataAccessor.java
@@ -47,9 +47,9 @@ import org.apache.helix.model.MaintenanceSignal;
 import org.apache.helix.model.Message;
 import org.apache.helix.model.PauseSignal;
 import org.apache.helix.model.StateModelDefinition;
+import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.data.Stat;
 
 
 public class ZKHelixDataAccessor implements HelixDataAccessor {
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
index 31d45c0..4058719 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
@@ -19,7 +19,6 @@ package org.apache.helix.manager.zk;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -30,6 +29,8 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.concurrent.TimeUnit;
 import javax.management.JMException;
+
+import com.google.common.collect.Sets;
 import org.I0Itec.zkclient.IZkStateListener;
 import org.I0Itec.zkclient.exception.ZkInterruptedException;
 import org.apache.helix.BaseDataAccessor;
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java
index 59e81fa..75ba130 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java
@@ -30,10 +30,10 @@ import org.apache.helix.InstanceType;
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.client.HelixZkClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class ZKUtil {
   private static Logger logger = LoggerFactory.getLogger(ZKUtil.class);
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZNRecordSerializer.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZNRecordSerializer.java
index 890bb13..df9acaa 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZNRecordSerializer.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZNRecordSerializer.java
@@ -28,11 +28,11 @@ import org.I0Itec.zkclient.serialize.ZkSerializer;
 import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.util.GZipCompressionUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZNRecordSerializer implements ZkSerializer {
   private static Logger logger = LoggerFactory.getLogger(ZNRecordSerializer.class);
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZNRecordStreamingSerializer.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZNRecordStreamingSerializer.java
index 39f307c..769baa0 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZNRecordStreamingSerializer.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZNRecordStreamingSerializer.java
@@ -26,20 +26,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.google.common.collect.Maps;
 import org.I0Itec.zkclient.exception.ZkMarshallingError;
 import org.I0Itec.zkclient.serialize.ZkSerializer;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.util.GZipCompressionUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonParser;
 import org.codehaus.jackson.JsonToken;
-
-import com.google.common.collect.Maps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZNRecordStreamingSerializer implements ZkSerializer {
   private static Logger LOG = LoggerFactory.getLogger(ZNRecordStreamingSerializer.class);
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkAsyncCallbacks.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkAsyncCallbacks.java
index bfdf7bb..6b51b47 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkAsyncCallbacks.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkAsyncCallbacks.java
@@ -22,14 +22,14 @@ package org.apache.helix.manager.zk;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.helix.monitoring.mbeans.ZkClientMonitor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.AsyncCallback.DataCallback;
 import org.apache.zookeeper.AsyncCallback.StatCallback;
 import org.apache.zookeeper.AsyncCallback.StringCallback;
 import org.apache.zookeeper.AsyncCallback.VoidCallback;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZkAsyncCallbacks {
   private static Logger LOG = LoggerFactory.getLogger(ZkAsyncCallbacks.class);
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkCallbackCache.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkCallbackCache.java
index 5b82242..7197542 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkCallbackCache.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkCallbackCache.java
@@ -35,11 +35,11 @@ import org.apache.helix.manager.zk.ZkCacheEventThread.ZkCacheEvent;
 import org.apache.helix.store.HelixPropertyListener;
 import org.apache.helix.store.zk.ZNode;
 import org.apache.helix.util.HelixUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.Watcher.Event.EventType;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZkCallbackCache<T> extends Cache<T> implements IZkChildListener, IZkDataListener,
     IZkStateListener {
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/serializer/JacksonPayloadSerializer.java b/helix-core/src/main/java/org/apache/helix/manager/zk/serializer/JacksonPayloadSerializer.java
index 213036e..1cc8102 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/serializer/JacksonPayloadSerializer.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/serializer/JacksonPayloadSerializer.java
@@ -23,11 +23,11 @@ import java.io.ByteArrayInputStream;
 import java.io.StringWriter;
 
 import org.apache.helix.HelixException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Serializes and deserializes data of a generic type using Jackson
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java b/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
index 66f26d6..1ad7fac 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
@@ -10,7 +10,6 @@
  */
 package org.apache.helix.manager.zk.zookeeper;
 
-import javax.management.JMException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Date;
@@ -23,6 +22,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.TimeUnit;
+import javax.management.JMException;
 
 import org.I0Itec.zkclient.DataUpdater;
 import org.I0Itec.zkclient.ExceptionUtil;
diff --git a/helix-core/src/main/java/org/apache/helix/messaging/handling/AsyncCallbackService.java b/helix-core/src/main/java/org/apache/helix/messaging/handling/AsyncCallbackService.java
index 9e02c60..80eb4fd 100644
--- a/helix-core/src/main/java/org/apache/helix/messaging/handling/AsyncCallbackService.java
+++ b/helix-core/src/main/java/org/apache/helix/messaging/handling/AsyncCallbackService.java
@@ -22,6 +22,7 @@ package org.apache.helix.messaging.handling;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.HelixException;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.messaging.AsyncCallback;
@@ -30,8 +31,6 @@ import org.apache.helix.model.Message.MessageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-
 public class AsyncCallbackService implements MultiTypeMessageHandlerFactory {
   private final ConcurrentHashMap<String, AsyncCallback> _callbackMap =
       new ConcurrentHashMap<String, AsyncCallback>();
diff --git a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixStateTransitionHandler.java b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixStateTransitionHandler.java
index 769969a..316284b 100644
--- a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixStateTransitionHandler.java
+++ b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixStateTransitionHandler.java
@@ -23,11 +23,11 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixDefinedState;
diff --git a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
index a0481e3..f35eda7 100644
--- a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
+++ b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
@@ -36,6 +36,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.Criteria;
 import org.apache.helix.HelixConstants;
diff --git a/helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java b/helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java
index 8905dda..bb478c3 100644
--- a/helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java
@@ -19,12 +19,13 @@ package org.apache.helix.model;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java b/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java
index f65a1bd..4d01766 100644
--- a/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.base.Splitter;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.ZNRecord;
@@ -35,8 +36,6 @@ import org.apache.helix.util.HelixUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Splitter;
-
 /**
  * Instance configurations
  */
diff --git a/helix-core/src/main/java/org/apache/helix/model/LiveInstance.java b/helix-core/src/main/java/org/apache/helix/model/LiveInstance.java
index 2bf8e88..f9a5d6a 100644
--- a/helix-core/src/main/java/org/apache/helix/model/LiveInstance.java
+++ b/helix-core/src/main/java/org/apache/helix/model/LiveInstance.java
@@ -20,6 +20,7 @@ package org.apache.helix.model;
  */
 
 import java.util.Map;
+
 import org.apache.helix.HelixProperty;
 import org.apache.helix.ZNRecord;
 import org.slf4j.Logger;
diff --git a/helix-core/src/main/java/org/apache/helix/model/Message.java b/helix-core/src/main/java/org/apache/helix/model/Message.java
index 348aefd..6317af1 100644
--- a/helix-core/src/main/java/org/apache/helix/model/Message.java
+++ b/helix-core/src/main/java/org/apache/helix/model/Message.java
@@ -19,7 +19,6 @@ package org.apache.helix.model;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -31,6 +30,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import com.google.common.collect.Lists;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/main/java/org/apache/helix/model/ParticipantHistory.java b/helix-core/src/main/java/org/apache/helix/model/ParticipantHistory.java
index e56c3e3..6e5a8c6 100644
--- a/helix-core/src/main/java/org/apache/helix/model/ParticipantHistory.java
+++ b/helix-core/src/main/java/org/apache/helix/model/ParticipantHistory.java
@@ -19,9 +19,6 @@ package org.apache.helix.model;
  * under the License.
  */
 
-import org.apache.helix.HelixProperty;
-import org.apache.helix.ZNRecord;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -30,6 +27,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+
+import org.apache.helix.HelixProperty;
+import org.apache.helix.ZNRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/helix-core/src/main/java/org/apache/helix/model/ResourceConfig.java b/helix-core/src/main/java/org/apache/helix/model/ResourceConfig.java
index 274640c..c37a594 100644
--- a/helix-core/src/main/java/org/apache/helix/model/ResourceConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/model/ResourceConfig.java
@@ -22,8 +22,8 @@ package org.apache.helix.model;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
 import java.util.TreeMap;
+
 import org.apache.helix.HelixProperty;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.api.config.HelixConfigProperty;
diff --git a/helix-core/src/main/java/org/apache/helix/model/builder/AutoModeISBuilder.java b/helix-core/src/main/java/org/apache/helix/model/builder/AutoModeISBuilder.java
index cbd1387..e231fc6 100644
--- a/helix-core/src/main/java/org/apache/helix/model/builder/AutoModeISBuilder.java
+++ b/helix-core/src/main/java/org/apache/helix/model/builder/AutoModeISBuilder.java
@@ -19,11 +19,11 @@ package org.apache.helix.model.builder;
  * under the License.
  */
 
-import org.apache.helix.model.IdealState.RebalanceMode;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.apache.helix.model.IdealState.RebalanceMode;
+
 /**
  * This is the deprecated IS builder for SEMI-AUTO rebalance mode. Please use SemiAutoISBuilder instead.
  */
diff --git a/helix-core/src/main/java/org/apache/helix/model/builder/AutoRebalanceModeISBuilder.java b/helix-core/src/main/java/org/apache/helix/model/builder/AutoRebalanceModeISBuilder.java
index 2f58d0b..66663fb 100644
--- a/helix-core/src/main/java/org/apache/helix/model/builder/AutoRebalanceModeISBuilder.java
+++ b/helix-core/src/main/java/org/apache/helix/model/builder/AutoRebalanceModeISBuilder.java
@@ -19,10 +19,10 @@ package org.apache.helix.model.builder;
  * under the License.
  */
 
-import org.apache.helix.model.IdealState.RebalanceMode;
-
 import java.util.ArrayList;
 
+import org.apache.helix.model.IdealState.RebalanceMode;
+
 /**
  * Please use FullAutoModeISBuilder instead.
  */
diff --git a/helix-core/src/main/java/org/apache/helix/model/builder/ConstraintItemBuilder.java b/helix-core/src/main/java/org/apache/helix/model/builder/ConstraintItemBuilder.java
index 54835f8..2ee6f67 100644
--- a/helix-core/src/main/java/org/apache/helix/model/builder/ConstraintItemBuilder.java
+++ b/helix-core/src/main/java/org/apache/helix/model/builder/ConstraintItemBuilder.java
@@ -22,9 +22,9 @@ package org.apache.helix.model.builder;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.helix.model.ConstraintItem;
 import org.apache.helix.model.ClusterConstraints.ConstraintAttribute;
 import org.apache.helix.model.ClusterConstraints.ConstraintValue;
+import org.apache.helix.model.ConstraintItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/helix-core/src/main/java/org/apache/helix/model/builder/CustomModeISBuilder.java b/helix-core/src/main/java/org/apache/helix/model/builder/CustomModeISBuilder.java
index 78d8ca3..65c40a0 100644
--- a/helix-core/src/main/java/org/apache/helix/model/builder/CustomModeISBuilder.java
+++ b/helix-core/src/main/java/org/apache/helix/model/builder/CustomModeISBuilder.java
@@ -19,11 +19,11 @@ package org.apache.helix.model.builder;
  * under the License.
  */
 
-import org.apache.helix.model.IdealState.RebalanceMode;
-
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.helix.model.IdealState.RebalanceMode;
+
 public class CustomModeISBuilder extends IdealStateBuilder {
 
   public CustomModeISBuilder(String resourceName) {
diff --git a/helix-core/src/main/java/org/apache/helix/model/builder/FullAutoModeISBuilder.java b/helix-core/src/main/java/org/apache/helix/model/builder/FullAutoModeISBuilder.java
index b83e000..080eb4c 100644
--- a/helix-core/src/main/java/org/apache/helix/model/builder/FullAutoModeISBuilder.java
+++ b/helix-core/src/main/java/org/apache/helix/model/builder/FullAutoModeISBuilder.java
@@ -19,10 +19,10 @@ package org.apache.helix.model.builder;
  * under the License.
  */
 
-import org.apache.helix.model.IdealState.RebalanceMode;
-
 import java.util.ArrayList;
 
+import org.apache.helix.model.IdealState.RebalanceMode;
+
 /**
  * IS Builder for resource in Full-Auto rebalance mode.
  */
diff --git a/helix-core/src/main/java/org/apache/helix/model/builder/SemiAutoModeISBuilder.java b/helix-core/src/main/java/org/apache/helix/model/builder/SemiAutoModeISBuilder.java
index cb813a1..7ee0529 100644
--- a/helix-core/src/main/java/org/apache/helix/model/builder/SemiAutoModeISBuilder.java
+++ b/helix-core/src/main/java/org/apache/helix/model/builder/SemiAutoModeISBuilder.java
@@ -19,11 +19,11 @@ package org.apache.helix.model.builder;
  * under the License.
  */
 
-import org.apache.helix.model.IdealState.RebalanceMode;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.apache.helix.model.IdealState.RebalanceMode;
+
 public class SemiAutoModeISBuilder extends IdealStateBuilder {
   public SemiAutoModeISBuilder(String resourceName) {
     super(resourceName);
diff --git a/helix-core/src/main/java/org/apache/helix/model/util/StateModelDefinitionValidator.java b/helix-core/src/main/java/org/apache/helix/model/util/StateModelDefinitionValidator.java
index 174e0df..2cb400a 100644
--- a/helix-core/src/main/java/org/apache/helix/model/util/StateModelDefinitionValidator.java
+++ b/helix-core/src/main/java/org/apache/helix/model/util/StateModelDefinitionValidator.java
@@ -24,14 +24,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.model.StateModelDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
 /**
  * Validator logic for a StateModelDefinition.<br/>
  * <br/>
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/ZKPathDataDumpTask.java b/helix-core/src/main/java/org/apache/helix/monitoring/ZKPathDataDumpTask.java
index 0b70e41..c0d6285 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/ZKPathDataDumpTask.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/ZKPathDataDumpTask.java
@@ -22,6 +22,7 @@ package org.apache.helix.monitoring;
 import java.util.List;
 import java.util.TimerTask;
 
+import com.google.common.collect.Lists;
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
@@ -29,11 +30,9 @@ import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
+import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.data.Stat;
-
-import com.google.common.collect.Lists;
 
 public class ZKPathDataDumpTask extends TimerTask {
   static Logger LOG = LoggerFactory.getLogger(ZKPathDataDumpTask.class);
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterEventMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterEventMonitor.java
index 417f020..948763b 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterEventMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterEventMonitor.java
@@ -19,18 +19,18 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.management.JMException;
+
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
-import java.util.concurrent.TimeUnit;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric;
 
-import javax.management.JMException;
-import java.util.ArrayList;
-import java.util.List;
-
 public class ClusterEventMonitor extends DynamicMBeanProvider {
   public enum PhaseName {
     Callback,
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterMBeanObserver.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterMBeanObserver.java
index 9b95b11..b55890d 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterMBeanObserver.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterMBeanObserver.java
@@ -21,7 +21,6 @@ package org.apache.helix.monitoring.mbeans;
 
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
-
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServerConnection;
 import javax.management.MBeanServerDelegate;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterStatusMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterStatusMonitor.java
index 5e8c17a..d6c3bb2 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterStatusMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ClusterStatusMonitor.java
@@ -19,10 +19,6 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
 import java.util.Arrays;
 import java.util.Collection;
@@ -35,6 +31,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Maps;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/HelixCallbackMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/HelixCallbackMonitor.java
index c256c41..f71d065 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/HelixCallbackMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/HelixCallbackMonitor.java
@@ -19,6 +19,11 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.management.JMException;
+
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import org.apache.helix.HelixConstants;
@@ -28,11 +33,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric;
 
-import javax.management.JMException;
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-import java.util.List;
-
 public class HelixCallbackMonitor extends DynamicMBeanProvider {
   public static final String MONITOR_TYPE = "Type";
   public static final String MONITOR_KEY = "Key";
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/JobMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/JobMonitor.java
index 3a69947..2f180f2 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/JobMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/JobMonitor.java
@@ -19,13 +19,14 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.management.JMException;
 import javax.management.ObjectName;
+
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MBeanRegistrar.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MBeanRegistrar.java
index 00db47f..9cff11b 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MBeanRegistrar.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MBeanRegistrar.java
@@ -19,12 +19,16 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
+import java.lang.management.ManagementFactory;
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.management.*;
-import java.lang.management.ManagementFactory;
-
 public class MBeanRegistrar {
   private static Logger LOG = LoggerFactory.getLogger(MBeanRegistrar.class);
 
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageLatencyMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageLatencyMonitor.java
index 0bca7ab..9528165 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageLatencyMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageLatencyMonitor.java
@@ -19,19 +19,19 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.management.JMException;
+
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
-import java.util.concurrent.TimeUnit;
 import org.apache.helix.model.Message;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric;
 
-import javax.management.JMException;
-import java.util.ArrayList;
-import java.util.List;
-
 public class MessageLatencyMonitor extends DynamicMBeanProvider {
   private static final String MBEAN_DESCRIPTION = "Helix Message Latency Monitor";
   private final String _sensorName;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageQueueMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageQueueMonitor.java
index 2bd3c7c..8bb9c7a 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageQueueMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MessageQueueMonitor.java
@@ -20,7 +20,6 @@ package org.apache.helix.monitoring.mbeans;
  */
 
 import java.lang.management.ManagementFactory;
-
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ParticipantStatusMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ParticipantStatusMonitor.java
index f2fe72d..7ea93d7 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ParticipantStatusMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ParticipantStatusMonitor.java
@@ -19,21 +19,21 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import org.apache.helix.model.Message;
-import org.apache.helix.monitoring.StateTransitionContext;
-import org.apache.helix.monitoring.StateTransitionDataPoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.helix.model.Message;
+import org.apache.helix.monitoring.StateTransitionContext;
+import org.apache.helix.monitoring.StateTransitionDataPoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ParticipantStatusMonitor {
   private final ConcurrentHashMap<StateTransitionContext, StateTransitionStatMonitor> _monitorMap =
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/PerInstanceResourceMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/PerInstanceResourceMonitor.java
index 76959cf..66e16b5 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/PerInstanceResourceMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/PerInstanceResourceMonitor.java
@@ -24,13 +24,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.helix.HelixDefinedState;
-import org.apache.helix.model.Partition;
-import org.apache.helix.model.StateModelDefinition;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import org.apache.helix.HelixDefinedState;
+import org.apache.helix.model.Partition;
+import org.apache.helix.model.StateModelDefinition;
 
 public class PerInstanceResourceMonitor implements PerInstanceResourceMonitorMBean {
   public static class BeanName {
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ResourceMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ResourceMonitor.java
index 07d2e78..d7a368e 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ResourceMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ResourceMonitor.java
@@ -19,8 +19,6 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -30,6 +28,9 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import javax.management.JMException;
 import javax.management.ObjectName;
+
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/RoutingTableProviderMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/RoutingTableProviderMonitor.java
index 158dfdd..a295ddb 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/RoutingTableProviderMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/RoutingTableProviderMonitor.java
@@ -19,6 +19,13 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.management.JMException;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import org.apache.helix.PropertyType;
@@ -27,13 +34,6 @@ import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.HistogramDynamicMetric;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.SimpleDynamicMetric;
 
-import javax.management.JMException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 public class RoutingTableProviderMonitor extends DynamicMBeanProvider {
   public static final String DATA_TYPE_KEY = "DataType";
   public static final String CLUSTER_KEY = "Cluster";
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/StateTransitionStatMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/StateTransitionStatMonitor.java
index efe4f09..987c8ce 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/StateTransitionStatMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/StateTransitionStatMonitor.java
@@ -19,14 +19,14 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.management.JMException;
 import javax.management.ObjectName;
+
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
 import org.apache.helix.monitoring.StateTransitionContext;
 import org.apache.helix.monitoring.StateTransitionDataPoint;
 import org.apache.helix.monitoring.mbeans.dynamicMBeans.DynamicMBeanProvider;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientMonitor.java
index 88441be..61b574c 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientMonitor.java
@@ -19,10 +19,6 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import javax.management.JMException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -30,6 +26,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import javax.management.JMException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 
 import org.apache.helix.HelixException;
 import org.apache.helix.manager.zk.zookeeper.ZkEventThread;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java
index 76edf56..1795243 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java
@@ -19,11 +19,11 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import javax.management.JMException;
-import javax.management.ObjectName;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import javax.management.JMException;
+import javax.management.ObjectName;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.SlidingTimeWindowArrayReservoir;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/DynamicMBeanProvider.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/DynamicMBeanProvider.java
index a28bb9d..0ce0b44 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/DynamicMBeanProvider.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/DynamicMBeanProvider.java
@@ -19,6 +19,12 @@ package org.apache.helix.monitoring.mbeans.dynamicMBeans;
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import javax.management.Attribute;
 import javax.management.AttributeList;
 import javax.management.AttributeNotFoundException;
@@ -33,12 +39,6 @@ import javax.management.MBeanNotificationInfo;
 import javax.management.MBeanOperationInfo;
 import javax.management.ObjectName;
 import javax.management.ReflectionException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import org.apache.helix.SystemPropertyKeys;
 import org.apache.helix.monitoring.SensorNameProvider;
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/DynamicMetric.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/DynamicMetric.java
index cbfa356..5ac4cbd 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/DynamicMetric.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/DynamicMetric.java
@@ -19,13 +19,13 @@ package org.apache.helix.monitoring.mbeans.dynamicMBeans;
  * under the License.
  */
 
-import org.apache.helix.HelixException;
-
-import javax.management.MBeanAttributeInfo;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import javax.management.MBeanAttributeInfo;
+
+import org.apache.helix.HelixException;
 
 /**
  * The abstract class for dynamic metrics that is used to emitting monitor data to DynamicMBean.
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/HistogramDynamicMetric.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/HistogramDynamicMetric.java
index 9b176a5..b683043 100644
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/HistogramDynamicMetric.java
+++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/dynamicMBeans/HistogramDynamicMetric.java
@@ -19,16 +19,16 @@ package org.apache.helix.monitoring.mbeans.dynamicMBeans;
  * under the License.
  */
 
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Snapshot;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.management.MBeanAttributeInfo;
 import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import javax.management.MBeanAttributeInfo;
+
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.Snapshot;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The dynamic metric that accept Long monitor data and emits histogram information based on the input
diff --git a/helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModel.java b/helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModel.java
index d5e6ec2..803d3b1 100644
--- a/helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModel.java
+++ b/helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModel.java
@@ -19,8 +19,9 @@ package org.apache.helix.participant;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.Set;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModelFactory.java b/helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModelFactory.java
index e8f6d4d..c28d2f6 100644
--- a/helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModelFactory.java
+++ b/helix-core/src/main/java/org/apache/helix/participant/DistClusterControllerStateModelFactory.java
@@ -19,8 +19,9 @@ package org.apache.helix.participant;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.Set;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.controller.pipeline.Pipeline;
 import org.apache.helix.participant.statemachine.StateModelFactory;
 
diff --git a/helix-core/src/main/java/org/apache/helix/participant/GenericLeaderStandbyModel.java b/helix-core/src/main/java/org/apache/helix/participant/GenericLeaderStandbyModel.java
index d6f350c..4385887 100644
--- a/helix-core/src/main/java/org/apache/helix/participant/GenericLeaderStandbyModel.java
+++ b/helix-core/src/main/java/org/apache/helix/participant/GenericLeaderStandbyModel.java
@@ -21,9 +21,9 @@ package org.apache.helix.participant;
 
 import java.util.List;
 
+import org.apache.helix.HelixConstants.ChangeType;
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
-import org.apache.helix.HelixConstants.ChangeType;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.model.Message;
 import org.apache.helix.participant.statemachine.StateModel;
diff --git a/helix-core/src/main/java/org/apache/helix/participant/HelixCustomCodeRunner.java b/helix-core/src/main/java/org/apache/helix/participant/HelixCustomCodeRunner.java
index 794e9e1..b29126c 100644
--- a/helix-core/src/main/java/org/apache/helix/participant/HelixCustomCodeRunner.java
+++ b/helix-core/src/main/java/org/apache/helix/participant/HelixCustomCodeRunner.java
@@ -23,9 +23,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.helix.HelixConstants.ChangeType;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
-import org.apache.helix.HelixConstants.ChangeType;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZKHelixDataAccessor;
diff --git a/helix-core/src/main/java/org/apache/helix/participant/HelixStateMachineEngine.java b/helix-core/src/main/java/org/apache/helix/participant/HelixStateMachineEngine.java
index 2e40d80..64d0ad5 100644
--- a/helix-core/src/main/java/org/apache/helix/participant/HelixStateMachineEngine.java
+++ b/helix-core/src/main/java/org/apache/helix/participant/HelixStateMachineEngine.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.HelixConstants;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
@@ -50,8 +51,6 @@ import org.apache.helix.task.TaskPartitionState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-
 public class HelixStateMachineEngine implements StateMachineEngine {
   private static Logger logger = LoggerFactory.getLogger(HelixStateMachineEngine.class);
 
diff --git a/helix-core/src/main/java/org/apache/helix/spectator/RoutingTable.java b/helix-core/src/main/java/org/apache/helix/spectator/RoutingTable.java
index c6a28f5..dd1b623 100644
--- a/helix-core/src/main/java/org/apache/helix/spectator/RoutingTable.java
+++ b/helix-core/src/main/java/org/apache/helix/spectator/RoutingTable.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+
 import org.apache.helix.model.CurrentState;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.InstanceConfig;
diff --git a/helix-core/src/main/java/org/apache/helix/spectator/RoutingTableProvider.java b/helix-core/src/main/java/org/apache/helix/spectator/RoutingTableProvider.java
index 2d12f09..1a8f641 100644
--- a/helix-core/src/main/java/org/apache/helix/spectator/RoutingTableProvider.java
+++ b/helix-core/src/main/java/org/apache/helix/spectator/RoutingTableProvider.java
@@ -18,6 +18,23 @@ package org.apache.helix.spectator;
  * specific language governing permissions and limitations
  * under the License.
  */
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.management.JMException;
+
 import org.apache.helix.HelixConstants;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
@@ -45,22 +62,6 @@ import org.apache.helix.monitoring.mbeans.RoutingTableProviderMonitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.management.JMException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
 public class RoutingTableProvider
     implements ExternalViewChangeListener, InstanceConfigChangeListener, ConfigChangeListener,
     LiveInstanceChangeListener, CurrentStateChangeListener {
diff --git a/helix-core/src/main/java/org/apache/helix/spectator/RoutingTableSnapshot.java b/helix-core/src/main/java/org/apache/helix/spectator/RoutingTableSnapshot.java
index 2439906..abfc87b 100644
--- a/helix-core/src/main/java/org/apache/helix/spectator/RoutingTableSnapshot.java
+++ b/helix-core/src/main/java/org/apache/helix/spectator/RoutingTableSnapshot.java
@@ -22,6 +22,7 @@ package org.apache.helix.spectator;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
+
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.InstanceConfig;
 import org.apache.helix.model.LiveInstance;
diff --git a/helix-core/src/main/java/org/apache/helix/store/PropertyJsonSerializer.java b/helix-core/src/main/java/org/apache/helix/store/PropertyJsonSerializer.java
index 163d64f..d9bb82d 100644
--- a/helix-core/src/main/java/org/apache/helix/store/PropertyJsonSerializer.java
+++ b/helix-core/src/main/java/org/apache/helix/store/PropertyJsonSerializer.java
@@ -24,11 +24,11 @@ import java.io.StringWriter;
 
 import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PropertyJsonSerializer<T> implements PropertySerializer<T> {
   static private Logger LOG = LoggerFactory.getLogger(PropertyJsonSerializer.class);
diff --git a/helix-core/src/main/java/org/apache/helix/store/zk/AutoFallbackPropertyStore.java b/helix-core/src/main/java/org/apache/helix/store/zk/AutoFallbackPropertyStore.java
index ca1174e..dafa36d 100644
--- a/helix-core/src/main/java/org/apache/helix/store/zk/AutoFallbackPropertyStore.java
+++ b/helix-core/src/main/java/org/apache/helix/store/zk/AutoFallbackPropertyStore.java
@@ -29,9 +29,9 @@ import java.util.Set;
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.manager.zk.ZkBaseDataAccessor;
+import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.data.Stat;
 
 /**
  * Property store that does auto fallback to an old location.
diff --git a/helix-core/src/main/java/org/apache/helix/task/AbstractTaskDispatcher.java b/helix-core/src/main/java/org/apache/helix/task/AbstractTaskDispatcher.java
index dd4f409..fa4f249 100644
--- a/helix-core/src/main/java/org/apache/helix/task/AbstractTaskDispatcher.java
+++ b/helix-core/src/main/java/org/apache/helix/task/AbstractTaskDispatcher.java
@@ -19,8 +19,6 @@ package org.apache.helix.task;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -30,6 +28,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.HelixManager;
 import org.apache.helix.common.caches.TaskDataCache;
diff --git a/helix-core/src/main/java/org/apache/helix/task/AssignableInstanceManager.java b/helix-core/src/main/java/org/apache/helix/task/AssignableInstanceManager.java
index ace0339..4e8c591 100644
--- a/helix-core/src/main/java/org/apache/helix/task/AssignableInstanceManager.java
+++ b/helix-core/src/main/java/org/apache/helix/task/AssignableInstanceManager.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.helix.common.caches.TaskDataCache;
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.InstanceConfig;
diff --git a/helix-core/src/main/java/org/apache/helix/task/DeprecatedTaskRebalancer.java b/helix-core/src/main/java/org/apache/helix/task/DeprecatedTaskRebalancer.java
index 74a8c25..115237f 100644
--- a/helix-core/src/main/java/org/apache/helix/task/DeprecatedTaskRebalancer.java
+++ b/helix-core/src/main/java/org/apache/helix/task/DeprecatedTaskRebalancer.java
@@ -19,13 +19,6 @@ package org.apache.helix.task;
  * under the License.
  */
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -43,6 +36,14 @@ import java.util.TreeSet;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java b/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java
index 5e62269..329b26e 100644
--- a/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java
+++ b/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java
@@ -29,14 +29,13 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.apache.helix.controller.stages.CurrentStateOutput;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.model.Message;
 import org.apache.helix.model.Partition;
 import org.apache.helix.model.ResourceAssignment;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import org.apache.helix.task.assigner.TaskAssignResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java b/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java
index c72282d..6746176 100644
--- a/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java
+++ b/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java
@@ -30,6 +30,8 @@ import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixException;
 import org.apache.helix.controller.stages.CurrentStateOutput;
 import org.apache.helix.model.IdealState;
@@ -38,9 +40,6 @@ import org.apache.helix.util.JenkinsHash;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
 /**
  * This class does an assignment based on an automatic rebalancing strategy, rather than requiring
  * assignment to target partitions and states of another resource
diff --git a/helix-core/src/main/java/org/apache/helix/task/JobConfig.java b/helix-core/src/main/java/org/apache/helix/task/JobConfig.java
index ab352ec..dafdb9a 100644
--- a/helix-core/src/main/java/org/apache/helix/task/JobConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/task/JobConfig.java
@@ -26,16 +26,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.helix.HelixProperty;
-import org.apache.helix.model.ResourceConfig;
-import org.apache.helix.task.beans.JobBean;
-import org.apache.helix.task.beans.TaskBean;
-
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.helix.HelixProperty;
+import org.apache.helix.model.ResourceConfig;
+import org.apache.helix.task.beans.JobBean;
+import org.apache.helix.task.beans.TaskBean;
 
 /**
  * Provides a typed interface to job configurations.
diff --git a/helix-core/src/main/java/org/apache/helix/task/JobContext.java b/helix-core/src/main/java/org/apache/helix/task/JobContext.java
index c84f660..26628a4 100644
--- a/helix-core/src/main/java/org/apache/helix/task/JobContext.java
+++ b/helix-core/src/main/java/org/apache/helix/task/JobContext.java
@@ -25,12 +25,11 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.apache.helix.HelixProperty;
-import org.apache.helix.ZNRecord;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import org.apache.helix.HelixProperty;
+import org.apache.helix.ZNRecord;
 
 /**
  * Provides a typed interface to the context information stored by {@link TaskRebalancer} in the
diff --git a/helix-core/src/main/java/org/apache/helix/task/JobDag.java b/helix-core/src/main/java/org/apache/helix/task/JobDag.java
index d84c1bd..d53d593 100644
--- a/helix-core/src/main/java/org/apache/helix/task/JobDag.java
+++ b/helix-core/src/main/java/org/apache/helix/task/JobDag.java
@@ -21,18 +21,18 @@ package org.apache.helix.task;
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
-
 import java.util.TreeMap;
 import java.util.TreeSet;
+
 import org.codehaus.jackson.annotate.JsonIgnore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides a convenient way to construct, traverse,
diff --git a/helix-core/src/main/java/org/apache/helix/task/JobDispatcher.java b/helix-core/src/main/java/org/apache/helix/task/JobDispatcher.java
index 6334818..90729d6 100644
--- a/helix-core/src/main/java/org/apache/helix/task/JobDispatcher.java
+++ b/helix-core/src/main/java/org/apache/helix/task/JobDispatcher.java
@@ -19,7 +19,6 @@ package org.apache.helix.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -29,6 +28,8 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
+
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
 import org.apache.helix.controller.stages.CurrentStateOutput;
diff --git a/helix-core/src/main/java/org/apache/helix/task/JobQueue.java b/helix-core/src/main/java/org/apache/helix/task/JobQueue.java
index 389b7d0..5c75b80 100644
--- a/helix-core/src/main/java/org/apache/helix/task/JobQueue.java
+++ b/helix-core/src/main/java/org/apache/helix/task/JobQueue.java
@@ -19,12 +19,12 @@ package org.apache.helix.task;
  * under the License.
  */
 
-import org.apache.helix.HelixException;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.helix.HelixException;
+
 /**
  * A named queue to which jobs can be added
  */
diff --git a/helix-core/src/main/java/org/apache/helix/task/RuntimeJobDag.java b/helix-core/src/main/java/org/apache/helix/task/RuntimeJobDag.java
index c223a29..b21723b 100644
--- a/helix-core/src/main/java/org/apache/helix/task/RuntimeJobDag.java
+++ b/helix-core/src/main/java/org/apache/helix/task/RuntimeJobDag.java
@@ -21,9 +21,9 @@ package org.apache.helix.task;
 
 import java.util.ArrayDeque;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java b/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java
index 0ce0c3d..6d324b8 100644
--- a/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java
+++ b/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java
@@ -1,13 +1,13 @@
 package org.apache.helix.task;
 
-import org.apache.helix.controller.stages.CurrentStateOutput;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.model.ResourceAssignment;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
+
+import org.apache.helix.controller.stages.CurrentStateOutput;
+import org.apache.helix.model.IdealState;
+import org.apache.helix.model.ResourceAssignment;
 import org.apache.helix.task.assigner.AssignableInstance;
 
 public abstract class TaskAssignmentCalculator {
diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskConfig.java b/helix-core/src/main/java/org/apache/helix/task/TaskConfig.java
index 55d1a2f..83b7d67 100644
--- a/helix-core/src/main/java/org/apache/helix/task/TaskConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/task/TaskConfig.java
@@ -19,10 +19,11 @@ package org.apache.helix.task;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
 import java.io.IOException;
 import java.util.Map;
 import java.util.UUID;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.task.beans.TaskBean;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskDriver.java b/helix-core/src/main/java/org/apache/helix/task/TaskDriver.java
index dfca045..9eb46fc 100644
--- a/helix-core/src/main/java/org/apache/helix/task/TaskDriver.java
+++ b/helix-core/src/main/java/org/apache/helix/task/TaskDriver.java
@@ -27,6 +27,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.BaseDataAccessor;
diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskExecutionInfo.java b/helix-core/src/main/java/org/apache/helix/task/TaskExecutionInfo.java
index 03d66b4..f4ee936 100644
--- a/helix-core/src/main/java/org/apache/helix/task/TaskExecutionInfo.java
+++ b/helix-core/src/main/java/org/apache/helix/task/TaskExecutionInfo.java
@@ -1,6 +1,7 @@
 package org.apache.helix.task;
 
 import java.io.IOException;
+
 import org.codehaus.jackson.annotate.JsonCreator;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java b/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java
index 14e0b43..f30dd9f 100644
--- a/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java
+++ b/helix-core/src/main/java/org/apache/helix/task/TaskStateModelFactory.java
@@ -23,10 +23,10 @@ import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
-
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.management.JMException;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.monitoring.mbeans.ThreadPoolExecutorMonitor;
 import org.apache.helix.participant.statemachine.StateModelFactory;
diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java b/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java
index b746fd2..aa24c4d 100644
--- a/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java
@@ -26,6 +26,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Sets;
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixDataAccessor;
@@ -45,9 +48,6 @@ import org.codehaus.jackson.type.TypeReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.Sets;
-
 /**
  * Static utility methods.
  */
diff --git a/helix-core/src/main/java/org/apache/helix/task/ThreadCountBasedTaskAssignmentCalculator.java b/helix-core/src/main/java/org/apache/helix/task/ThreadCountBasedTaskAssignmentCalculator.java
index f76bc1b..463f331 100644
--- a/helix-core/src/main/java/org/apache/helix/task/ThreadCountBasedTaskAssignmentCalculator.java
+++ b/helix-core/src/main/java/org/apache/helix/task/ThreadCountBasedTaskAssignmentCalculator.java
@@ -18,6 +18,7 @@ package org.apache.helix.task;
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,6 +26,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+
 import org.apache.helix.controller.stages.CurrentStateOutput;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.model.ResourceAssignment;
diff --git a/helix-core/src/main/java/org/apache/helix/task/WorkflowDispatcher.java b/helix-core/src/main/java/org/apache/helix/task/WorkflowDispatcher.java
index e6dab31..1ed9ab0 100644
--- a/helix-core/src/main/java/org/apache/helix/task/WorkflowDispatcher.java
+++ b/helix-core/src/main/java/org/apache/helix/task/WorkflowDispatcher.java
@@ -19,7 +19,6 @@ package org.apache.helix.task;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -31,6 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
+
+import com.google.common.collect.Lists;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/main/java/org/apache/helix/task/WorkflowRebalancer.java b/helix-core/src/main/java/org/apache/helix/task/WorkflowRebalancer.java
index 7df02d8..3c8f30b 100644
--- a/helix-core/src/main/java/org/apache/helix/task/WorkflowRebalancer.java
+++ b/helix-core/src/main/java/org/apache/helix/task/WorkflowRebalancer.java
@@ -19,9 +19,8 @@ package org.apache.helix.task;
  * under the License.
  */
 
-
-import org.apache.helix.controller.stages.BestPossibleStateOutput;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
+import org.apache.helix.controller.stages.BestPossibleStateOutput;
 import org.apache.helix.controller.stages.CurrentStateOutput;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.model.Resource;
diff --git a/helix-core/src/main/java/org/apache/helix/task/assigner/AssignableInstance.java b/helix-core/src/main/java/org/apache/helix/task/assigner/AssignableInstance.java
index e78368d..c1f2ef6 100644
--- a/helix-core/src/main/java/org/apache/helix/task/assigner/AssignableInstance.java
+++ b/helix-core/src/main/java/org/apache/helix/task/assigner/AssignableInstance.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.InstanceConfig;
 import org.apache.helix.model.LiveInstance;
diff --git a/helix-core/src/main/java/org/apache/helix/task/assigner/TaskAssigner.java b/helix-core/src/main/java/org/apache/helix/task/assigner/TaskAssigner.java
index 244ecd8..4502ff6 100644
--- a/helix-core/src/main/java/org/apache/helix/task/assigner/TaskAssigner.java
+++ b/helix-core/src/main/java/org/apache/helix/task/assigner/TaskAssigner.java
@@ -21,6 +21,7 @@ package org.apache.helix.task.assigner;
 
 import java.util.Collection;
 import java.util.Map;
+
 import org.apache.helix.task.AssignableInstanceManager;
 import org.apache.helix.task.TaskConfig;
 
diff --git a/helix-core/src/main/java/org/apache/helix/task/assigner/ThreadCountBasedTaskAssigner.java b/helix-core/src/main/java/org/apache/helix/task/assigner/ThreadCountBasedTaskAssigner.java
index 146fd14..454528b 100644
--- a/helix-core/src/main/java/org/apache/helix/task/assigner/ThreadCountBasedTaskAssigner.java
+++ b/helix-core/src/main/java/org/apache/helix/task/assigner/ThreadCountBasedTaskAssigner.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.PriorityQueue;
+
 import org.apache.helix.model.LiveInstance;
 import org.apache.helix.task.AssignableInstanceManager;
 import org.apache.helix.task.TaskConfig;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/ClusterExternalViewVerifier.java b/helix-core/src/main/java/org/apache/helix/tools/ClusterExternalViewVerifier.java
index 43e98f4..a342c2e 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/ClusterExternalViewVerifier.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/ClusterExternalViewVerifier.java
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.Stage;
 import org.apache.helix.controller.pipeline.StageContext;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/ClusterSetup.java b/helix-core/src/main/java/org/apache/helix/tools/ClusterSetup.java
index 677c1b4..f0c909d 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/ClusterSetup.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/ClusterSetup.java
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/ClusterStateVerifier.java b/helix-core/src/main/java/org/apache/helix/tools/ClusterStateVerifier.java
index 6d71c04..a398c24 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/ClusterStateVerifier.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/ClusterStateVerifier.java
@@ -19,7 +19,6 @@ package org.apache.helix.tools;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -28,6 +27,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+
+import com.google.common.collect.Sets;
 import org.I0Itec.zkclient.IZkChildListener;
 import org.I0Itec.zkclient.IZkDataListener;
 import org.I0Itec.zkclient.exception.ZkNodeExistsException;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifier.java b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifier.java
index d6e5a73..bbae075 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifier.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifier.java
@@ -19,6 +19,10 @@ package org.apache.helix.tools;
  * under the License.
  */
 
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 import org.I0Itec.zkclient.IZkChildListener;
 import org.I0Itec.zkclient.IZkDataListener;
 import org.apache.helix.HelixDataAccessor;
@@ -31,10 +35,6 @@ import org.apache.helix.manager.zk.client.HelixZkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Please use implementations of HelixClusterVerifier (BestPossibleExternalViewVerifier, StrictMatchExternalViewVerifier, etc in tools.ClusterVerifiers).
  */
diff --git a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/BestPossibleExternalViewVerifier.java b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/BestPossibleExternalViewVerifier.java
index 52ced19..d190976 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/BestPossibleExternalViewVerifier.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/BestPossibleExternalViewVerifier.java
@@ -19,10 +19,20 @@ package org.apache.helix.tools.ClusterVerifiers;
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.PropertyKey;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.Stage;
 import org.apache.helix.controller.pipeline.StageContext;
 import org.apache.helix.controller.stages.AttributeName;
@@ -43,16 +53,6 @@ import org.apache.helix.task.TaskConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * verifier that the ExternalViews of given resources (or all resources in the cluster)
  * match its best possible mapping states.
diff --git a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/StrictMatchExternalViewVerifier.java b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/StrictMatchExternalViewVerifier.java
index 85f0397..29b1c76 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/StrictMatchExternalViewVerifier.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/StrictMatchExternalViewVerifier.java
@@ -28,6 +28,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/ZkHelixClusterVerifier.java b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/ZkHelixClusterVerifier.java
index a049f24..020acbc 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/ZkHelixClusterVerifier.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/ZkHelixClusterVerifier.java
@@ -19,9 +19,13 @@ package org.apache.helix.tools.ClusterVerifiers;
  * under the License.
  */
 
+import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
 import org.I0Itec.zkclient.IZkChildListener;
 import org.I0Itec.zkclient.IZkDataListener;
 import org.apache.helix.HelixDataAccessor;
@@ -37,10 +41,6 @@ import org.apache.helix.model.ResourceConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 public abstract class ZkHelixClusterVerifier
     implements IZkChildListener, IZkDataListener, HelixClusterVerifier {
   private static Logger LOG = LoggerFactory.getLogger(ZkHelixClusterVerifier.class);
diff --git a/helix-core/src/main/java/org/apache/helix/tools/RUSHrHash.java b/helix-core/src/main/java/org/apache/helix/tools/RUSHrHash.java
index fb9c594..c130902 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/RUSHrHash.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/RUSHrHash.java
@@ -19,7 +19,9 @@ package org.apache.helix.tools;
  * under the License.
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Random;
 import java.util.zip.CRC32;
 
 public class RUSHrHash {
diff --git a/helix-core/src/main/java/org/apache/helix/tools/StateModelConfigGenerator.java b/helix-core/src/main/java/org/apache/helix/tools/StateModelConfigGenerator.java
index d5600e9..992797f 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/StateModelConfigGenerator.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/StateModelConfigGenerator.java
@@ -25,8 +25,8 @@ import org.apache.helix.model.LeaderStandbySMD;
 import org.apache.helix.model.MasterSlaveSMD;
 import org.apache.helix.model.OnlineOfflineSMD;
 import org.apache.helix.model.ScheduledTaskSMD;
-import org.apache.helix.model.TaskSMD;
 import org.apache.helix.model.StorageSchemataSMD;
+import org.apache.helix.model.TaskSMD;
 
 // TODO refactor to use StateModelDefinition.Builder
 @Deprecated
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/CurrentStateCleanUp.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/CurrentStateCleanUp.java
index c1fe89f..29bcdf8 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/CurrentStateCleanUp.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/CurrentStateCleanUp.java
@@ -3,6 +3,7 @@ package org.apache.helix.tools.commandtools;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ExampleParticipant.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ExampleParticipant.java
index 3673a6b..7ad38c5 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ExampleParticipant.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ExampleParticipant.java
@@ -21,6 +21,7 @@ package org.apache.helix.tools.commandtools;
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/JmxDumper.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/JmxDumper.java
index 0bcd216..2ce4037 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/JmxDumper.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/JmxDumper.java
@@ -33,7 +33,6 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
-
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
 import javax.management.MBeanOperationInfo;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/TaskAdmin.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/TaskAdmin.java
index 7af443c..30220b9 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/TaskAdmin.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/TaskAdmin.java
@@ -19,11 +19,12 @@ package org.apache.helix.tools.commandtools;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+
+import com.google.common.collect.Lists;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ToolsUtil.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ToolsUtil.java
index 0229585..84e8a0a 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ToolsUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ToolsUtil.java
@@ -6,7 +6,7 @@ import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-import static org.apache.helix.tools.commandtools.IntegrationTestUtil.*;
+import static org.apache.helix.tools.commandtools.IntegrationTestUtil.printUsage;
 
 public class ToolsUtil {
   public static CommandLine processCommandLineArgs(String[] cliArgs, Options cliOptions) throws Exception {
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKLogFormatter.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKLogFormatter.java
index 0ed2db1..ffef227 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKLogFormatter.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKLogFormatter.java
@@ -35,13 +35,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
-
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
 
 import org.apache.jute.BinaryInputArchive;
 import org.apache.jute.Record;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.apache.zookeeper.ZooDefs.OpCode;
 import org.apache.zookeeper.data.Stat;
@@ -52,6 +49,8 @@ import org.apache.zookeeper.server.persistence.FileSnap;
 import org.apache.zookeeper.server.persistence.FileTxnLog;
 import org.apache.zookeeper.server.util.SerializeUtils;
 import org.apache.zookeeper.txn.TxnHeader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZKLogFormatter {
   private static final Logger LOG = LoggerFactory.getLogger(ZKLogFormatter.class);
diff --git a/helix-core/src/main/java/org/apache/helix/util/HelixUtil.java b/helix-core/src/main/java/org/apache/helix/util/HelixUtil.java
index 5e7f7b4..a31c3fe 100644
--- a/helix-core/src/main/java/org/apache/helix/util/HelixUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/util/HelixUtil.java
@@ -29,6 +29,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
+
+import com.google.common.base.Joiner;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyType;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
@@ -43,8 +45,6 @@ import org.apache.helix.model.StateModelDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Joiner;
-
 public final class HelixUtil {
   static private Logger LOG = LoggerFactory.getLogger(HelixUtil.class);
 
diff --git a/helix-core/src/main/java/org/apache/helix/util/InstanceValidationUtil.java b/helix-core/src/main/java/org/apache/helix/util/InstanceValidationUtil.java
index 30b733d..a74d632 100644
--- a/helix-core/src/main/java/org/apache/helix/util/InstanceValidationUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/util/InstanceValidationUtil.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.collect.ImmutableSet;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.HelixException;
@@ -41,8 +42,6 @@ import org.apache.helix.task.TaskConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * Utility class for validating Helix properties
  * Warning: each method validates one single property of instance individually and independently.
diff --git a/helix-core/src/main/java/org/apache/helix/util/StatusUpdateUtil.java b/helix-core/src/main/java/org/apache/helix/util/StatusUpdateUtil.java
index b7a422a..1249fec 100644
--- a/helix-core/src/main/java/org/apache/helix/util/StatusUpdateUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/util/StatusUpdateUtil.java
@@ -32,6 +32,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixProperty;
diff --git a/helix-core/src/main/java/org/apache/helix/util/WeightAwareRebalanceUtil.java b/helix-core/src/main/java/org/apache/helix/util/WeightAwareRebalanceUtil.java
index 0df2014..7bef7b7 100644
--- a/helix-core/src/main/java/org/apache/helix/util/WeightAwareRebalanceUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/util/WeightAwareRebalanceUtil.java
@@ -1,17 +1,27 @@
 package org.apache.helix.util;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.api.config.RebalanceConfig;
 import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceHardConstraint;
 import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceSoftConstraint;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
 import org.apache.helix.controller.common.ResourcesStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.rebalancer.strategy.ConstraintRebalanceStrategy;
-import org.apache.helix.model.*;
-
-import java.util.*;
+import org.apache.helix.model.BuiltInStateModelDefinitions;
+import org.apache.helix.model.ClusterConfig;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.helix.model.LiveInstance;
+import org.apache.helix.model.Partition;
+import org.apache.helix.model.ResourceConfig;
+import org.apache.helix.model.StateModelDefinition;
 
 /**
  * A rebalance tool that generate an resource partition assignment based on the input.
diff --git a/helix-core/src/main/scripts/integration-test/script/cm_driver.py b/helix-core/src/main/scripts/integration-test/script/cm_driver.py
index 5884976..6cf724e 100755
--- a/helix-core/src/main/scripts/integration-test/script/cm_driver.py
+++ b/helix-core/src/main/scripts/integration-test/script/cm_driver.py
@@ -25,7 +25,7 @@
 __version__ = "$Revision: 0.1 $"
 __date__ = "$Date: 2011/6/27 $"
 
-import os, pdb
+import os
 
 #pdb.set_trace()
 
diff --git a/helix-core/src/main/scripts/integration-test/script/dds_driver.py b/helix-core/src/main/scripts/integration-test/script/dds_driver.py
index 886c769..927c49b 100755
--- a/helix-core/src/main/scripts/integration-test/script/dds_driver.py
+++ b/helix-core/src/main/scripts/integration-test/script/dds_driver.py
@@ -28,28 +28,30 @@
   bootstrap_consumer  start/stop, stop_scn, stop_after_secs
   profile_relay
   profile_consumer
-  
+
   zookeeper  start/stop/wait_exist/wait_no_exist/wait_value/cmd
 $SCRIPT_DIR/dbus2_driver.py -c zookeeper -o start --zookeeper_server_ports=${zookeeper_server_ports}  --cmdline_props="tickTime=2000;initLimit=5;syncLimit=2" --zookeeper_cmds=<semicolon separate list of command> --zookeeper_path= zookeeper_value=
   -. start, parse the port, generate the local file path in var/work/zookeeper_data/1, start, port default from 2181, generate log4j file
   -. stop, find the process id, id is port - 2181 + 1, will stop all the processes
-  -. wait, query client and get the status 
+  -. wait, query client and get the status
   -. execute the cmd
 
 '''
 __version__ = "$Revision: 0.1 $"
 __date__ = "$Date: 2010/11/16 $"
 
-import sys, os, fcntl
-import pdb
-import time, copy, re
-from optparse import OptionParser, OptionGroup
-import logging
+import distutils.dir_util
+import fcntl
+import os
+import re
+import sys
 import threading
+import time
+from optparse import OptionParser, OptionGroup
+
 import pexpect
 from utility import *
-import distutils.dir_util
-        
+
 # Global varaibles
 options=None
 server_host="localhost"
@@ -102,7 +104,7 @@ def get_wait_timeout():
 
 def pause_resume_consumer(oper):
     global consumer_port
-    if options.component_id: consumer_port=find_open_port(consumer_host, consumer_http_start_port, options.component_id) 
+    if options.component_id: consumer_port=find_open_port(consumer_host, consumer_http_start_port, options.component_id)
     url = "http://%s:%s/pauseConsumer/%s" % (consumer_host, consumer_port, oper)
     out = send_url(url).split("\n")[1]
     dbg_print("out = %s" % out)
@@ -194,7 +196,7 @@ class cmd_thread(threading.Thread):
       self.ok_to_run=True
     def run(self):
       self.subp = subprocess_call_1(self.cmd)
-      if not self.subp: 
+      if not self.subp:
          self.thread_wait_end=True
          return
       # capture java call here
@@ -208,9 +210,9 @@ class cmd_thread(threading.Thread):
       fd = self.subp.stdout.fileno()
       fl = fcntl.fcntl(fd, fcntl.F_GETFL)
       fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
-      while (self.ok_to_run):  # for timeout case, must terminate the thread, need non block read 
+      while (self.ok_to_run):  # for timeout case, must terminate the thread, need non block read
         try: line = self.subp.stdout.readline()
-        except IOError, e: 
+        except IOError, e:
           time.sleep(0.1)
           #dbg_print("IOError %s" % e)
           continue
@@ -250,14 +252,14 @@ def cmd_call_capture_java_call():
     #pdb.set_trace()
     for jar_path in java_ps_call.split("-classpath ")[-1].split(" com.linkedin")[0].split(":"):  # classpath
       if not jar_path: continue
-      if not re.search("(%s|%s)" % (ivy_dir,view_root),jar_path): 
+      if not re.search("(%s|%s)" % (ivy_dir,view_root),jar_path):
         class_path_list.append(jar_path)
         continue
-      if re.search(ivy_dir,jar_path): 
+      if re.search(ivy_dir,jar_path):
         sub_dir= ivy_dir
         sub_str = "IVY_DIR"
-      if re.search(view_root,jar_path): 
-        sub_dir= view_root 
+      if re.search(view_root,jar_path):
+        sub_dir= view_root
         sub_str = "VIEW_ROOT"
       class_path_list.append('\"%s\"' % re.sub(sub_dir,sub_str,jar_path))
     class_path_list.sort()
@@ -271,7 +273,7 @@ def cmd_call_capture_java_call():
   ,"class_name":"%s"
    }
 ''' % (options.component, class_path, class_name)
-#}    
+#}
 
     #dbg_print("class_path = %s, class_name = %s" % (class_path, class_name))
     #sys.exit(0)
@@ -284,7 +286,7 @@ def cmd_call(cmd, timeout, ret_pattern=None, outf=None):
       key=get_process_info_key(options.component, options.component_id)
       if key in process_info:
         kill_cmd="kill -9"
-        if "stop" in cmd_dict[options.component]: 
+        if "stop" in cmd_dict[options.component]:
           kill_cmd = cmd_dict[options.component]["stop"]
           m = re.search("^.*(kill.*)\s*$",kill_cmd)
           if m: kill_cmd = m.group(1)
@@ -297,7 +299,7 @@ def cmd_call(cmd, timeout, ret_pattern=None, outf=None):
     sleep_interval = 0.5
     ret = RetCode.TIMEOUT
     while (sleep_cnt * sleep_interval < timeout):
-      if ct.thread_wait_end or (ct.subp and not process_exist(ct.subp.pid)): 
+      if ct.thread_wait_end or (ct.subp and not process_exist(ct.subp.pid)):
         print "end"
         if ct.thread_ret_ok: ret = RetCode.OK  # include find pattern or no pattern given
         else: ret= RetCode.ERROR
@@ -321,7 +323,7 @@ def run_cmd_remote_setup():
     component_cnt = 0
     # find the one in the cfg file, so multiple consumers must be in sequence
     for section in remote_run_config:
-      if re.search(options.component, section): 
+      if re.search(options.component, section):
         remote_component=section
         component_cnt +=1
         if not options.component_id or compnent_cnt == options.component_id: break
@@ -330,7 +332,7 @@ def run_cmd_remote_setup():
     set_remote_view_root(remote_component_properties["view_root"])
     # create the remote var/work dir, may not be needed as the current view have them
     #sys_call("ssh %s mkdir -p %s %s" % remote_run_config[remote_component]["host"], get_remote_work_dir(), get_remote_var_dir()
-   
+
 def run_cmd_remote(cmd):
     ret = remote_cmd_template % (remote_run_config[remote_component]["host"], get_remote_view_root(),  cmd)
     return ret
@@ -345,7 +347,7 @@ def run_cmd_add_option(cmd, option_name, value=None, check_exist=False):
     global run_cmd_added_options
     run_cmd_added_options.append(option_name)
     if not getattr(options, option_name): return cmd  # not such option
-    if not value: value = getattr(options,option_name) 
+    if not value: value = getattr(options,option_name)
     dbg_print("after option_name = %s, value = %s" % (option_name, value))
     #pdb.set_trace()
     if check_exist:
@@ -355,7 +357,7 @@ def run_cmd_add_option(cmd, option_name, value=None, check_exist=False):
     is_jvm_option = re.search("jvm_",option_name)
     if isinstance(value, str) and value[0]!='"' and not (option_name in ["cmdline_args"] or is_jvm_option) and options.enable_direct_java_call:   # do not quote the cmdline args
       #value = value.replace(' ','\\ ')     # escape the white space
-      value = '"%s"' % value   # quote it 
+      value = '"%s"' % value   # quote it
     if options.enable_direct_java_call:
       option_mapping = direct_java_call_option_mapping
       option_prefix = ""
@@ -376,25 +378,25 @@ def run_cmd_add_option(cmd, option_name, value=None, check_exist=False):
     if not option_str: return cmd
     cmd_split=cmd.split()
     if options.enable_direct_java_call: # add option to the end
-      cmd += " %s" % option_str     
+      cmd += " %s" % option_str
     else:
       cmd_split.insert(len(cmd_split)-1,option_str) # here it handles insert before the last one
       cmd = " ".join(cmd_split)
     dbg_print("cmd = %s" % cmd)
     return cmd
-    
+
 def run_cmd_add_log_file(cmd):
     global options
-    if options.logfile: log_file = options.logfile 
+    if options.logfile: log_file = options.logfile
     else: log_file= log_file_pattern % (options.testname, options.component, options.operation, time.strftime('%y%m%d_%H%M%S'), os.getpid())
     #log_file = os.path.join(remote_run and get_remote_log_dir() or get_log_dir(), log_file)
     # TODO: maybe we want to put the logs in the remote host
     log_file = os.path.join(get_log_dir(), log_file)
     dbg_print("log_file = %s" % log_file)
     options.logfile = log_file
-    open(log_file,"w").write("TEST_NAME=%s\n" % options.testname) 
+    open(log_file,"w").write("TEST_NAME=%s\n" % options.testname)
     # logging for all the command
-    cmd += " 2>&1 | tee -a %s" % log_file 
+    cmd += " 2>&1 | tee -a %s" % log_file
     return cmd
 
 def run_cmd_get_return_pattern():
@@ -406,15 +408,15 @@ def run_cmd_get_return_pattern():
     return ret_pattern
 
 def run_cmd_setup():
-    if re.search("_consumer",options.component): 
+    if re.search("_consumer",options.component):
       global consumer_host
       if remote_run: consumer_host = remote_component_properties["host"]
       else: consumer_host = "localhost"
       dbg_print("consumer_host= %s" % consumer_host)
 
-# need to remove from ant_call_option_mapping and run_cmd_add_option to avoid invalid option name 
+# need to remove from ant_call_option_mapping and run_cmd_add_option to avoid invalid option name
 def run_cmd_add_config(cmd):
-    if options.operation in ["start","clean_log","default"]: 
+    if options.operation in ["start","clean_log","default"]:
       if options.enable_direct_java_call:
         pass_down_options=direct_java_call_option_mapping.keys()
         pass_down_options.extend(direct_java_call_jvm_args.keys())
@@ -423,11 +425,11 @@ def run_cmd_add_config(cmd):
         pass_down_options=ant_call_option_mapping.keys()
       #option_mapping = options.enable_direct_java_call and direct_java_call_option_mapping or ant_call_option_mapping
       #if options.enable_direct_java_call: pass_down_options.append("jvm_args")
-      if options.config: 
-        if not remote_run: 
+      if options.config:
+        if not remote_run:
           cmd = run_cmd_add_option(cmd, "config", options.config, check_exist=True)      # check exist will figure out
-        else: 
-          cmd = run_cmd_add_option(cmd, "config", os.path.join(get_remote_view_root(), options.config), check_exist=False)  
+        else:
+          cmd = run_cmd_add_option(cmd, "config", os.path.join(get_remote_view_root(), options.config), check_exist=False)
       run_cmd_view_root = remote_run and get_remote_view_root() or get_view_root()
       #cmd = run_cmd_add_option(cmd, "dump_file", options.dump_file and os.path.join(run_cmd_view_root, options.dump_file) or None)
       #cmd = run_cmd_add_option(cmd, "value_file", options.value_file and os.path.join(run_cmd_view_root, options.value_file) or None)
@@ -440,18 +442,18 @@ def run_cmd_add_config(cmd):
       #cmd = run_cmd_add_option(cmd, "cmdline_props")
 #      cmd = run_cmd_add_option(cmd, "filter_conf_file")
 
-      if options.checkpoint_dir: 
+      if options.checkpoint_dir:
          if options.checkpoint_dir == "auto":
            checkpoint_dir = os.path.join(get_work_dir(), "databus2_checkpoint_%s_%s" % time.strftime('%y%m%d_%H%M%S'), os.getpid())
          else:
            checkpoint_dir = options.checkpoint_dir
-         checkpoint_dir = os.path.join(run_cmd_view_root(), checkpoint_dir) 
-         cmd = run_cmd_add_option(cmd, "checkpoint_dir", checkpoint_dir)   
+         checkpoint_dir = os.path.join(run_cmd_view_root(), checkpoint_dir)
+         cmd = run_cmd_add_option(cmd, "checkpoint_dir", checkpoint_dir)
          # clear up the directory
          if not options.checkpoint_keep and os.path.exists(checkpoint_dir): distutils.dir_util.remove_tree(checkpoint_dir)
 
       # options can be changed during remote run
-      if remote_run: 
+      if remote_run:
         remote_component_properties = remote_run_config[remote_component]
         if not options.relay_host and "relay_host" in remote_component_properties: options.relay_host = remote_component_properties["relay_host"]
         if not options.relay_port and "relay_port" in remote_component_properties: options.relay_port = remote_component_properties["relay_port"]
@@ -462,26 +464,26 @@ def run_cmd_add_config(cmd):
       #cmd = run_cmd_add_option(cmd, "bootstrap_host")
       #cmd = run_cmd_add_option(cmd, "bootstrap_port")
       #cmd = run_cmd_add_option(cmd, "consumer_event_pattern")
-      if re.search("_consumer",options.component): 
+      if re.search("_consumer",options.component):
         # next available port
         if options.http_port: http_port = options.http_port
-        else: http_port = next_available_port(consumer_host, consumer_http_start_port)   
+        else: http_port = next_available_port(consumer_host, consumer_http_start_port)
         #cmd = run_cmd_add_option(cmd, "http_port", http_port)
-        #cmd = run_cmd_add_option(cmd, "jmx_service_port", next_available_port(consumer_host, consumer_jmx_service_start_port))   
+        #cmd = run_cmd_add_option(cmd, "jmx_service_port", next_available_port(consumer_host, consumer_jmx_service_start_port))
       # this will take care of the passdown, no need for run_cmd_add_directly
       for option in [x for x in pass_down_options if x not in run_cmd_added_options]:
         cmd = run_cmd_add_option(cmd, option)
 
 
     if options.component=="espresso-relay": cmd+= " -d " # temp hack. TODO: remove
-        
-    if options.enable_direct_java_call: 
+
+    if options.enable_direct_java_call:
       #cmd = re.sub("java -classpath","java -d64 -ea %s -classpath" % " ".join([x[0]+x[1] for x in [direct_java_call_jvm_args[y] for y in direct_java_call_jvm_args_ordered] if x[1]]) ,cmd) # d64 here
       cmd = re.sub("java -classpath","java -d64 -ea %s -classpath" % " ".join([x[0]+x[1] for x in direct_java_call_jvm_args.values() if x[1]]) ,cmd) # d64 here
     dbg_print("cmd = %s" % cmd)
     return cmd
 
-def run_cmd_add_ant_debug(cmd): 
+def run_cmd_add_ant_debug(cmd):
     if re.search("^ant", cmd): cmd = re.sub("^ant","ant -d", cmd)
     dbg_print("cmd = %s" % cmd)
     return cmd
@@ -489,13 +491,13 @@ def run_cmd_add_ant_debug(cmd):
 def run_cmd_save_cmd(cmd):
     if not options.logfile: return
     re_suffix = re.compile("\.\w+$")
-    if re_suffix.search(options.logfile): command_file = re_suffix.sub(".sh", options.logfile)  
-    else: command_file = "%s.sh" % options.logfile 
+    if re_suffix.search(options.logfile): command_file = re_suffix.sub(".sh", options.logfile)
+    else: command_file = "%s.sh" % options.logfile
     dbg_print("command_file = %s" % command_file)
     open(command_file,"w").write("%s\n" % cmd)
 
 def run_cmd_restart(cmd):
-    ''' restart using a previous .sh file ''' 
+    ''' restart using a previous .sh file '''
     if not options.logfile: return cmd
     previous_run_sh_pattern = "%s_*.sh" % "_".join(options.logfile.split("_")[:-3])
     import glob
@@ -509,38 +511,38 @@ def run_cmd_restart(cmd):
     cmd = lines[0].split("2>&1")[0]
     return cmd
 
-def run_cmd_direct_java_call(cmd, component): 
-    ''' this needs to be consistent with adding option 
+def run_cmd_direct_java_call(cmd, component):
+    ''' this needs to be consistent with adding option
         currently ant -f ; will mess up if there are options
-    ''' 
+    '''
 
     if not component in cmd_direct_call:
       options.enable_direct_java_call = False   # disable direct java call if classpath not given
       return cmd
-    #if re.search("^ant", cmd): # only component in has class path given will be 
+    #if re.search("^ant", cmd): # only component in has class path given will be
     #if True: # every thing
-    if re.search("ant ", cmd): # only component in has class path given will be 
+    if re.search("ant ", cmd): # only component in has class path given will be
       ivy_dir = get_ivy_dir()
       view_root = get_view_root()
       class_path_list=[]
       for class_path in cmd_direct_call[component]["class_path"]:
-        if re.search("IVY_DIR",class_path): 
+        if re.search("IVY_DIR",class_path):
           class_path_list.append(re.sub("IVY_DIR", ivy_dir,class_path))
           continue
-        if re.search("VIEW_ROOT",class_path): 
+        if re.search("VIEW_ROOT",class_path):
           class_path_list.append(re.sub("VIEW_ROOT", view_root,class_path))
           if not os.path.exists(class_path_list[-1]): # some jars not in VIEW_ROOT, trigger before command
-            if "before_cmd" in cmd_direct_call[component]: 
+            if "before_cmd" in cmd_direct_call[component]:
               before_cmd = "%s; " % cmd_direct_call[component]["before_cmd"]
               sys_call(before_cmd)
           continue
         class_path_list.append(class_path)
-      if options.check_class_path: 
-        for jar_file in class_path_list: 
-          if not os.path.exists(jar_file): 
+      if options.check_class_path:
+        for jar_file in class_path_list:
+          if not os.path.exists(jar_file):
             print "==WARNING NOT EXISTS: " + jar_file
             new_jar_path = sys_pipe_call("find %s -name %s" % (ivy_dir, os.path.basename(jar_file))).split("\n")[0]
-            if new_jar_path: 
+            if new_jar_path:
               print "==found " + new_jar_path
             class_path_list[class_path_list.index(jar_file)] = new_jar_path
       direct_call_cmd = "java -classpath %s %s" % (":".join(class_path_list), cmd_direct_call[component]["class_name"])
@@ -552,18 +554,18 @@ def run_cmd_direct_java_call(cmd, component):
 def run_cmd():
     if (options.component=="bootstrap_dbreset"): setup_rmi("stop")
     if (not options.operation): options.operation="default"
-    if (not options.testname): 
+    if (not options.testname):
       options.testname = "TEST_NAME" in os.environ and os.environ["TEST_NAME"] or "default"
-    if (options.operation not in cmd_dict[options.component]): 
+    if (options.operation not in cmd_dict[options.component]):
       my_error("%s is not one of the command for %s. Valid values are %s " % (options.operation, options.component, cmd_dict[options.component].keys()))
     # handle the different connetion string for hudson
-    if (options.component=="db_relay" and options.db_config_file): 
+    if (options.component=="db_relay" and options.db_config_file):
        options.db_config_file = db_config_change(options.db_config_file)
-    if (options.component=="test_bootstrap_producer" and options.operation=="lock_tab"): 
+    if (options.component=="test_bootstrap_producer" and options.operation=="lock_tab"):
       producer_lock_tab("save_file")
-    cmd = cmd_dict[options.component][options.operation]  
+    cmd = cmd_dict[options.component][options.operation]
     # cmd can be a funciton call
-    if isinstance(cmd, list): 
+    if isinstance(cmd, list):
       if not callable(cmd[0]): my_error("First element should be function")
       cmd[0](*tuple(cmd[1:]))        # call the function
       return
@@ -571,7 +573,7 @@ def run_cmd():
     if remote_run: run_cmd_remote_setup()
     if options.ant_debug: cmd = run_cmd_add_ant_debug(cmd) # need ant debug call or not
     cmd = run_cmd_add_config(cmd) # handle config file
-    if remote_run: cmd = run_cmd_remote(cmd) 
+    if remote_run: cmd = run_cmd_remote(cmd)
     ret_pattern = run_cmd_get_return_pattern()
     if options.restart: cmd = run_cmd_restart(cmd)
     cmd = run_cmd_add_log_file(cmd)
@@ -634,7 +636,7 @@ def get_stats_1(pid, jmx_bean, jmx_attr):
     start_jmx_cli()
     jmx_cli_cmd("open %s" % pid)
     ret = jmx_cli_cmd("beans")
-    if jmx_bean=="list": 
+    if jmx_bean=="list":
       stat_re = re.compile("^com.linkedin.databus2:")
       stats = [x for x in ret if stat_re.search(x)]
       outf.write("%s\n" % "\n".join(stats))
@@ -645,7 +647,7 @@ def get_stats_1(pid, jmx_bean, jmx_attr):
       stat_re = re.compile("^com.linkedin.databus2:")
       stats = [x.split("=")[-1].rstrip() for x in ret if stat_re.search(x)]
       my_error("Possible beans are %s" % stats)
-    full_jmx_bean = stats[0] 
+    full_jmx_bean = stats[0]
     jmx_cli_cmd("bean %s" % full_jmx_bean)
     if jmx_attr == "all": jmx_attr = "*"
     ret = jmx_cli_cmd("get %s" % jmx_attr)
@@ -654,9 +656,9 @@ def get_stats_1(pid, jmx_bean, jmx_attr):
 
 def run_testcase(testcase):
     dbg_print("testcase = %s" % testcase)
-    os.chdir(get_testcase_dir()) 
+    os.chdir(get_testcase_dir())
     if not re.search("\.test$", testcase): testcase += ".test"
-    if not os.path.exists(testcase): 
+    if not os.path.exists(testcase):
       my_error("Test case %s does not exist" % testcase)
     dbg_print("testcase = %s" % testcase)
     ret = sys_call("/bin/bash %s" % testcase)
@@ -664,7 +666,7 @@ def run_testcase(testcase):
     return ret
 
 def get_ebuf_inbound_total_maxStreamWinScn(host, port, option=None):
-    url_template = "http://%s:%s/containerStats/inbound/events/total"    
+    url_template = "http://%s:%s/containerStats/inbound/events/total"
     if option == "bootstrap":
        url_template = "http://%s:%s/clientStats/bootstrap/events/total"
     return http_get_field(url_template, host, port, "maxSeenWinScn")
@@ -685,13 +687,13 @@ def producer_reach_maxStreamWinScn(name, maxWinScn):
     return producerMaxWinScn >= maxWinScn
 
 def wait_for_condition(cond, timeout=60, sleep_interval = 0.1):
-    ''' wait for a certain cond. cond could be a function. 
+    ''' wait for a certain cond. cond could be a function.
        This cannot be in utility. Because it needs to see the cond function '''
     dbg_print("cond = %s" % cond)
     sleep_cnt = 0
     ret = RetCode.TIMEOUT
     while (sleep_cnt * sleep_interval < timeout):
-      if eval(cond): 
+      if eval(cond):
         ret = RetCode.OK
         break
       time.sleep(sleep_interval)
@@ -711,8 +713,8 @@ def producer_wait_event_1(name, timeout):
 
 def send_shutdown(host, port, force=False):
     ''' use kill which is much faster '''
-    #url_template = "http://%s:%s/operation/shutdown" 
-    url_template = "http://%s:%s/operation/getpid" 
+    #url_template = "http://%s:%s/operation/shutdown"
+    url_template = "http://%s:%s/operation/getpid"
     pid = http_get_field(url_template, host, port, "pid")
     force_str = force and "-9" or ""
     sys_call("kill %s %s" % (force_str,pid))
@@ -726,7 +728,7 @@ def wait_event_1(timeout, option=None):
     dbg_print("maxWinScn = %s, timeout = %s" % (maxWinScn, timeout))
     # consumer host is defined already
     global consumer_port
-    if options.component_id: consumer_port=find_open_port(consumer_host, consumer_http_start_port, options.component_id) 
+    if options.component_id: consumer_port=find_open_port(consumer_host, consumer_http_start_port, options.component_id)
     if options.http_port: consumer_port = options.http_port
     ret = wait_for_condition('consumer_reach_maxStreamWinScn(%s, "%s", %s, "%s")' % (maxWinScn, consumer_host, consumer_port, option and option or ""), timeout)
     if ret == RetCode.TIMEOUT: print "Timed out waiting consumer to reach maxWinScn %s" % maxWinScn
@@ -740,7 +742,7 @@ def conf_and_deploy_1_find_dir_name(ant_target, screen_out):
       if not found_target and line == ant_target: found_target = True
       if found_target:
          dbg_print("line = %s" % line)
-         m = copy_file_re.search(line) 
+         m = copy_file_re.search(line)
          if m: return m.group(1)
     return None
 
@@ -759,7 +761,7 @@ def conf_and_deploy_1_find_extservice_name(ant_target, screen_out):
       if not found_target and line == ant_target: found_target = True
       if found_target:
          dbg_print("line = %s" % line)
-         m = copy_file_re.search(line) 
+         m = copy_file_re.search(line)
          if m: return m.group(1)
     return None
 
@@ -769,17 +771,17 @@ from xml.dom.minidom import Element
 def conf_and_deploy_1_add_conf(file_name):
     dom1 = parse(file_name)
     map_element=[x for x in dom1.getElementsByTagName("map")][0]
-    for prop in options.extservice_props: 
+    for prop in options.extservice_props:
       #props = prop.split(";")
       props = prop.split("=")
       len_props = len(props)
-      if len_props not in (2,3): 
+      if len_props not in (2,3):
         print "WARNING: prop %s is not a valid setting. IGNORED" % prop
         continue
       is_top_level= (len_props == 2)
       find_keys=[x for x in dom1.getElementsByTagName("entry") if x.attributes["key"].value == props[0]]
       dbg_print("find_keys = %s" % find_keys)
-      if not find_keys: 
+      if not find_keys:
         print "WARNING: prop %s part %s is not in file %s. " % (prop, props[0], file_name)
         if is_top_level:  # only add when is top level
           print "WARNING: prop %s part %s is added to file %s. " % (prop, props[0], file_name)
@@ -788,13 +790,13 @@ def conf_and_deploy_1_add_conf(file_name):
           new_entry.setAttribute("value", props[1])
           map_element.appendChild(new_entry)
         continue
-      keyNode = find_keys[0] 
-      if is_top_level: 
+      keyNode = find_keys[0]
+      if is_top_level:
         keyNode.attributes["value"].value=props[-1]
         continue
       find_props= [x for x in keyNode.getElementsByTagName("prop") if x.attributes["key"].value == props[1]]
       dbg_print("find_props = %s" % find_props)
-      if not find_props: 
+      if not find_props:
         print "WARNING: prop %s part %s is not in file %s. IGNORED" % (prop, props[1], file_name)
         continue
       find_props[0].childNodes[0].nodeValue=props[-1]
@@ -820,7 +822,7 @@ def conf_and_deploy_1(ant_file):
     #out = sys_pipe_call("ant -f %s -d build-app-conf" % (ant_file))
     #extservice_file_name = conf_and_deploy_1_find_extservice_name("build-app-conf:", out.split("\n"))
     dbg_print("extservice_file_name = %s" % extservice_file_name)
-    if options.extservice_props: 
+    if options.extservice_props:
       tmp_files = [extservice_file_name]
       tmp_files = save_copy([extservice_file_name])
       dbg_print("new_files = %s" % tmp_files)
@@ -843,7 +845,7 @@ def get_ivy_dir():
       if os.path.exists(ivy_dir): break
     if not os.path.exists(ivy_dir): raise
     return ivy_dir
- 
+
 def zookeeper_setup(oper):
     ''' may need to do a find later. find $HOME/.ivy2/lin-cache -name zookeeper-3.3.0.jar '''
     global zookeeper_cmd, zookeeper_server_ports, zookeeper_server_dir, zookeeper_server_ids, zookeeper_classpath
@@ -853,7 +855,7 @@ def zookeeper_setup(oper):
     zookeeper_class= (oper=="start") and  "org.apache.zookeeper.server.quorum.QuorumPeerMain" or "org.apache.zookeeper.ZooKeeperMain"
     log4j_file=os.path.join(get_view_root(),"integration-test/config/zookeeper-log4j2file.properties")
     dbg_print("zookeeper_classpath = %s" % zookeeper_classpath)
-    if not "zookeeper_classpath" in globals(): 
+    if not "zookeeper_classpath" in globals():
       zookeeper_classpath="IVY_DIR/org/apache/zookeeper/zookeeper/3.3.0/zookeeper-3.3.0.jar:IVY_DIR/log4j/log4j/1.2.15/log4j-1.2.15.jar"
     if re.search("IVY_DIR",zookeeper_classpath): zookeeper_classpath=re.sub("IVY_DIR", ivy_dir,zookeeper_classpath)
     if re.search("VIEW_ROOT",zookeeper_classpath): zookeeper_classpath=re.sub("VIEW_ROOT", view_root,zookeeper_classpath)
@@ -885,10 +887,10 @@ def zookeeper_opers_start_create_conf(zookeeper_server_ports_split):
     #for server_id in range(1,zookeeper_num_servers+1):
     for server_id in range(zookeeper_num_servers):
       zookeeper_host = zookeeper_server_ports_split[server_id].split(":")[0]
-      zookeeper_internal_port_1 = zookeeper_internal_port_1_start + server_id  
-      zookeeper_internal_port_2 = zookeeper_internal_port_2_start +  server_id 
+      zookeeper_internal_port_1 = zookeeper_internal_port_1_start + server_id
+      zookeeper_internal_port_2 = zookeeper_internal_port_2_start +  server_id
       if zookeeper_num_servers>1:
-        zookeeper_internal_conf += "server.%s=%s:%s:%s\n" % (server_id, zookeeper_host, zookeeper_internal_port_1, zookeeper_internal_port_2) 
+        zookeeper_internal_conf += "server.%s=%s:%s:%s\n" % (server_id, zookeeper_host, zookeeper_internal_port_1, zookeeper_internal_port_2)
     dbg_print("zookeeper_internal_conf = %s" % zookeeper_internal_conf)
 
     #for server_id in range(1,zookeeper_num_servers+1):
@@ -912,7 +914,7 @@ def zookeeper_opers_start_create_dirs(zookeeper_server_ports_split):
       if server_id not in zookeeper_server_ids: continue
       current_server_dir=os.path.join(zookeeper_server_dir,str(server_id))
       dbg_print("current_server_dir = %s" % current_server_dir)
-      if os.path.exists(current_server_dir): 
+      if os.path.exists(current_server_dir):
         if not options.zookeeper_reset: continue
         distutils.dir_util.remove_tree(current_server_dir)
       try: distutils.dir_util.mkpath(current_server_dir)
@@ -920,7 +922,7 @@ def zookeeper_opers_start_create_dirs(zookeeper_server_ports_split):
       my_id_file=os.path.join(current_server_dir, "myid")
       dbg_print("my_id_file = %s" % my_id_file)
       open(my_id_file,"w").write("%s\n" % server_id)
-    
+
 def zookeeper_opers_start():
     zookeeper_server_ports_split = zookeeper_server_ports.split(",")
     zookeeper_opers_start_create_dirs(zookeeper_server_ports_split)
@@ -934,7 +936,7 @@ def zookeeper_opers_start():
       cmd = run_cmd_add_log_file(cmd)
       ret = cmd_call(cmd, 60, re.compile(search_str))
       cnt +=1
-    
+
 def zookeeper_opers_stop():
     # may be better to use pid, but somehow it is not in the datadir
     sys_call(kill_cmd_template % "QuorumPeerMain")
@@ -946,14 +948,14 @@ def zookeeper_opers_wait_for_nonexist():
 def zookeeper_opers_wait_for_value():
     pass
 def zookeeper_opers_cmd():
-    if not options.zookeeper_cmds: 
+    if not options.zookeeper_cmds:
       print "No zookeeper_cmds given"
       return
     splitted_cmds = ";".join(["echo %s" % x for x in options.zookeeper_cmds.split(";")])
     sys_call("(%s) | %s -server %s" % (splitted_cmds, zookeeper_cmd, zookeeper_server_ports))
- 
+
 def main(argv):
-    # default 
+    # default
     global options
     parser.add_option("-n", "--testname", action="store", dest="testname", default=None, help="A test name identifier")
     parser.add_option("-c", "--component", action="store", dest="component", default=None, choices=cmd_dict.keys(),
@@ -972,7 +974,7 @@ def main(argv):
                        help="Store the process id if set.  [default: %default]")
     parser.add_option("", "--restart", action="store_true", dest="restart", default = False,
                        help="Restart the process using previos config if set.  [default: %default]")
- 
+
     jvm_group = OptionGroup(parser, "jvm options", "")
     jvm_group.add_option("", "--jvm_direct_memory_size", action="store", dest="jvm_direct_memory_size", default = None,
                        help="Set the jvm direct memory size. e.g., 2048m. Default using the one driver_cmd_dict.")
@@ -1038,7 +1040,7 @@ def main(argv):
     # load local options
     #execfile(os.path.join(get_this_file_dirname(),"driver_local_options.py"))
     #pdb.set_trace()
-   
+
     parser.add_option_group(jvm_group)
     parser.add_option_group(config_group)
     parser.add_option_group(other_option_group)
@@ -1057,18 +1059,18 @@ def main(argv):
     if not options.component and not options.testcase and not options.remote_deploy:
        print("\n!!!Please give component!!!\n")
        arg_error=True
-    if arg_error: 
+    if arg_error:
       parser.print_help()
       parser.exit()
-    
+
     if afterParsingHook: afterParsingHook(options)   # the hook to call after parsing, change options
 
     setup_env()
     if (not options.testname):
       options.testname = "TEST_NAME" in os.environ and os.environ["TEST_NAME"] or "default"
     os.environ["TEST_NAME"]= options.testname;
-    
-    if (not "WORK_SUB_DIR" in os.environ): 
+
+    if (not "WORK_SUB_DIR" in os.environ):
         os.environ["WORK_SUB_DIR"] = "log"
     if (not "LOG_SUB_DIR" in os.environ):
         os.environ["LOG_SUB_DIR"] = "log"
@@ -1081,7 +1083,7 @@ def main(argv):
     if options.remote_deploy or options.remote_run:
       if options.remote_config_file:
         parse_config(options.remote_config_file)
-      if options.remote_deploy: 
+      if options.remote_deploy:
         sys_call_debug_begin()
         ret = do_remote_deploy()
         sys_call_debug_end()
@@ -1091,7 +1093,7 @@ def main(argv):
     sys_call_debug_end()
 
     my_exit(ret)
-    
+
 if __name__ == "__main__":
     main(sys.argv[1:])
 
diff --git a/helix-core/src/main/scripts/integration-test/script/utility.py b/helix-core/src/main/scripts/integration-test/script/utility.py
index 9140db6..6688b34 100644
--- a/helix-core/src/main/scripts/integration-test/script/utility.py
+++ b/helix-core/src/main/scripts/integration-test/script/utility.py
@@ -21,14 +21,17 @@
 ====  utilities
 '''
 
-import sys, os, subprocess
-import socket, pdb, re
-import urllib, errno
-import time, shutil
-import tempfile
+import errno
+import os
 import random
+import re
+import shutil
 import socket
- 
+import subprocess
+import sys
+import time
+import urllib
+
 sys_call_debug=False
 enable_sys_call_debug=False
 debug_enabled=False
@@ -75,15 +78,15 @@ def sys_pipe_call(cmd):
         print("cmd = %s " % cmd)
         if re.search("svn (log|info)",cmd): return os.popen(cmd).read()
         return ""
-    return os.popen(cmd).read()               
+    return os.popen(cmd).read()
 
 def get_this_file_dirname(): return this_file_dirname
 def get_this_file_name(): return this_file_name
-#handle the json import 
+#handle the json import
 if sys.version_info[0]==2 and sys.version_info[1]<6:
   try:
     import simplejson as json
-  except: 
+  except:
     out=sys_pipe_call(os.path.join(get_this_file_dirname(),"install_python_packages.sh"))
     #print("install json = %s " % out)
     import simplejson as json
@@ -114,8 +117,8 @@ def setup_work_dir():
     else: assert False, "Work Dir Not Defined"
     if "LOG_SUB_DIR" in os.environ: log_dir=os.path.join(var_dir, os.environ["LOG_SUB_DIR"], test_name)
     else: assert False, "Work Dir Not Defined"
-    distutils.dir_util.mkpath(work_dir, verbose=1)  
-    distutils.dir_util.mkpath(log_dir, verbose=1)  
+    distutils.dir_util.mkpath(work_dir, verbose=1)
+    distutils.dir_util.mkpath(log_dir, verbose=1)
 
 def get_test_name(): return test_name
 def get_work_dir(): return work_dir
@@ -133,9 +136,9 @@ def my_exit(ret):
   os.close(3)  # stderr
   sys.exit(ret)
 
-def file_exists(file):  # test both 
+def file_exists(file):  # test both
     ''' return the abs path of the file if exists '''
-    if os.path.isabs(file): 
+    if os.path.isabs(file):
       if os.path.exists(file): return file
       else: return None
     tmp_file=os.path.join(view_root, file)
@@ -143,12 +146,12 @@ def file_exists(file):  # test both
     tmp_file=os.path.join(cwd_dir,file)
     if os.path.exists(tmp_file): return tmp_file
     return None
-  
-def set_debug(flag): 
+
+def set_debug(flag):
     global debug_enabled
     debug_enabled=flag
 
-def set_sys_call_debug(flag): 
+def set_sys_call_debug(flag):
     global enable_sys_call_debug
     enable_sys_call_debug=flag
 
@@ -156,7 +159,7 @@ def sys_call_debug_begin():
     if not enable_sys_call_debug: return
     global sys_call_debug
     sys_call_debug=True
-    
+
 def sys_call_debug_end():
     if not enable_sys_call_debug: return
     global sys_call_debug
@@ -251,14 +254,14 @@ def whoami():
 
 def my_error(s):
     if debug_enabled: assert False, "Error: %s" % s
-    else: 
+    else:
       print "Error: %s" % s
       my_exit(1)
 
 def my_warning(s):
     if debug_enabled:
         print ("== " + sys._getframe(1).f_code.co_name + " == " + str(s))
-    else: 
+    else:
       print "WARNING: %s" % s
 
 def enter_func():
@@ -282,7 +285,7 @@ def next_available_port(ip,port):
     return port_num
 
 def find_open_port(host, start_port, seq_num):
-    ''' find the seq_num th port starting from start_port ''' 
+    ''' find the seq_num th port starting from start_port '''
     limit = 100
     start_port_num = int(start_port)
     seq = 0
@@ -315,12 +318,12 @@ remote_launch=False  # this is to indicate remote ssh recursive call
 remote_run_config={}
 remote_view_root=None
 def get_remote_view_root(): return remote_view_root
-def set_remote_view_root(v_root): 
+def set_remote_view_root(v_root):
     global remote_view_root
     remote_view_root = v_root
-def get_remote_log_dir(): 
+def get_remote_log_dir():
     return os.path.join(var_dir_template % remote_view_root, "log")
-def get_remote_work_dir(): 
+def get_remote_work_dir():
     return os.path.join(var_dir_template % remote_view_root, "work")
 
 import ConfigParser
@@ -333,7 +336,7 @@ def check_remote_config(remote_config_parser):
       my_error("Invalid section %s in config file " % (section))
     if [x for x in ["test_relay, profile_realy, bootstrap_server"] if re.search(x, section)]:
       if not remote_config_parser.has_option(section, "host"):   # set the default host
-        remote_config_parser.set(section, "host",host_name_global) 
+        remote_config_parser.set(section, "host",host_name_global)
 
 def parse_config_cfg(remote_config_file):
   remote_config_parser = ConfigParser.SafeConfigParser()
@@ -360,7 +363,7 @@ def parse_config(remote_config_file_input):
 
 def is_remote_run(): return remote_run
 def is_remote_launch(): return remote_launch
-def set_remote_launch(): 
+def set_remote_launch():
   global remote_launch
   remote_launch=True
 def get_remote_run_config(): return remote_run_config
@@ -368,7 +371,7 @@ def get_remote_run_config(): return remote_run_config
 if "REMOTE_CONFIG_FILE" in os.environ:   # can be set from env or from a file
   parse_config(os.environ["REMOTE_CONFIG_FILE"])
   remote_launch = True # env will not replicated across, so set env will enable launch
- 
+
 # url utilities
 def quote_json(in_str):
     ret = re.sub('([{,])(\w+)(:)','\\1"\\2"\\3', in_str)
@@ -418,13 +421,13 @@ def exec_sql_split_results(result_line):
 
 def exec_sql(qry, user, passwd, sid, host, do_split=False):
     ''' returns an list of results '''
-    dbg_print("qry = %s" % (qry)) 
+    dbg_print("qry = %s" % (qry))
     sqlplus_input="%s \n %s; \n exit \n" % (sqlplus_heading, qry)
     #(user, passwd, sid, host) = tuple(area_conn_info[options.area])
     dbg_print("conn info= %s %s %s %s" % (user, passwd, sid, host))
     sqlplus_call="%s -S %s" % (sqlplus_cmd, conn_str_template % (user, passwd, host, sid))
     os.environ["NLS_LANG"]=".UTF8"  # handle utf8
-    ret_str = sys_pipe_call_2(sqlplus_input, sqlplus_call) 
+    ret_str = sys_pipe_call_2(sqlplus_input, sqlplus_call)
     dbg_print("ret_str = %s" % ret_str)
     # may skip this
     if do_split: return exec_sql_split_results(ret_str)
@@ -448,12 +451,12 @@ def parse_db_conf_file(db_config_file, db_src_ids_str=""):
     schema_registry_list.sort()
     sources={}
     for src in db_sources["sources"]: sources[src["id"]]=src
-    if db_src_ids_str: 
+    if db_src_ids_str:
       if db_src_ids_str=="all": db_src_ids=sources.keys()
       else: db_src_ids = [int(x) for x in db_src_ids_str.split(",")]
     else: db_src_ids=[]
     for src_id in db_src_ids:
-      if src_id not in sources: 
+      if src_id not in sources:
         my_error("source id %s not in config file %s. Available source ids are %s" % (src_id, db_config_file, sources.keys()))
       src_info = sources[src_id]
       src_name = src_info["name"].split(".")[-1]
@@ -492,7 +495,7 @@ def mysql_exec_sql_split_results(result_line):
 
 def mysql_exec_sql(qry, dbname=None, user=None, passwd=None, host=None, do_split=False):
     ''' returns an list of results '''
-    dbg_print("qry = %s" % (qry)) 
+    dbg_print("qry = %s" % (qry))
     mysql_input=" %s; \n exit \n" % (qry)
     dbg_print("conn info= %s %s %s %s" % (dbname, user, passwd, host))
     mysql_call=get_mysql_call(dbname, user, passwd, host)
@@ -584,7 +587,7 @@ class RetCode:
 
 # wait utility
 def wait_for_condition_1(cond_func, timeout=60, sleep_interval = 0.1):
-  ''' wait for a certain cond. cond could be a function. 
+  ''' wait for a certain cond. cond could be a function.
      This cannot be in utility. Because it needs to see the cond function '''
   #dbg_print("cond = %s" % cond)
   if sys_call_debug: return RetCode.OK
@@ -602,7 +605,7 @@ def wait_for_condition_1(cond_func, timeout=60, sleep_interval = 0.1):
 
 def wait_for_port(host, port):
   def test_port_not_open():
-    return not isOpen(host, port) 
+    return not isOpen(host, port)
   ret = wait_for_condition_1(test_port_not_open, timeout=20, sleep_interval=2)
   if ret != RetCode.OK:
     print "ERROR: host:port %s%s is in use" % (host, port)
@@ -636,18 +639,18 @@ def get_process_info_file(dir=None):
 
 def validate_process_info_file():
   process_info_file = get_process_info_file()
-  if os.path.exists(process_info_file): 
+  if os.path.exists(process_info_file):
     return process_info_file
   else: my_error("Process info file %s for test '%s' does not exist. Please run setup first or give correct test name." % (process_info_file, get_test_name()))
 
 def get_process_info(process_info_file=None):
   if not process_info_file: process_info_file = get_process_info_file()
-  if file_exists(process_info_file): 
-    try: 
+  if file_exists(process_info_file):
+    try:
       process_info = json.load(open(process_info_file))
-    except ValueError: 
+    except ValueError:
       my_error("file %s does not have a valid json. Please remove it." % process_info_file)
-  else: 
+  else:
     my_warning("process_info_file %s does not exist" % process_info_file)
     process_info = {}
   return process_info
@@ -671,13 +674,13 @@ def split_process_info_key(key):
   ''' split into component and id '''
   return tuple(key.split(":"))
 
-def save_process_info(component, id, port, log_file, host=None, admin_port=None, mysql_port=None):    
+def save_process_info(component, id, port, log_file, host=None, admin_port=None, mysql_port=None):
   # port can be None
   process_info = get_process_info()
   key = get_process_info_key (component, id)
   process_info[key]={}
   process_info[key]["host"] = host !=None and host or host_name_global
-  process_info[key]["port"] = port 
+  process_info[key]["port"] = port
   process_info[key]["view_root"] = get_view_root()
   if not re.search("^mysql", component):
    process_info[key]["port_byteman"] = port and int(port) + 1000 or random.randint(16000,17000)
@@ -732,7 +735,7 @@ def need_remote_run(process_info):
   for k, v in process_info.items():
     if not re.search("^mysql",k):  # fiter out mysql
       if v["host"].split(".")[0] != host_name_global.split(".")[0]:
-         return True   # need remote run 
+         return True   # need remote run
   return False
 
 metabuilder_file=".metabuilder.properties"
@@ -742,7 +745,7 @@ def get_bldfwk_dir():
     if not os.path.exists(bldfwk_file): return None
     for line in open(bldfwk_file):
       m = re.search("(bldshared-[0-9]+)",line)
-      if m: 
+      if m:
         bldfwk_dir= m.group(1)
         break
     print "Warning. Cannot find bldshared-dir, run ant -f bootstrap.xml"
@@ -764,7 +767,7 @@ def do_remote_deploy(reset=False):
       remote_host = remote_run_config[section]["host"]
       remote_view_root = remote_run_config[section]["view_root"]
       key = "%s:%s" % (remote_host, remote_view_root)
-      if key in already_copied: 
+      if key in already_copied:
         print "Already copied. Skip: host: %s, view_root: %s" % (remote_host, remote_view_root)
         continue
       else: already_copied[key]=1
@@ -773,20 +776,20 @@ def do_remote_deploy(reset=False):
       if reset: sys_call("ssh %s rm -rf %s" % (remote_host, remote_view_root))
       sys_call("ssh %s mkdir -p %s" % (remote_host, remote_view_root))
       cmd = remote_deploy_cmd_template % (rsync_path, view_root, remote_host, remote_view_root)
-      sys_call(cmd) 
+      sys_call(cmd)
       if bldfwk_dir:
         cmd = remote_deploy_bldcmd_template % (rsync_path, os.path.join(os.path.dirname(view_root),bldfwk_dir), remote_host, remote_view_root_parent)
-        sys_call(cmd) 
+        sys_call(cmd)
         # replace the metabuilder, TODO, escape the /
         metabuilder_full_path = os.path.join(remote_view_root, metabuilder_file)
         cmd = remote_deploy_change_blddir_cmd_template % (remote_host, view_root.replace("/","\/"), remote_view_root.replace("/","\/"), metabuilder_full_path,  metabuilder_full_path,  metabuilder_full_path,  metabuilder_full_path)
-        sys_call(cmd) 
+        sys_call(cmd)
       # copy gradle cache
       gradle_cache_template = "%s/.gradle/cache"
-      gradle_cache_dir = gradle_cache_template % os.environ["HOME"] 
+      gradle_cache_dir = gradle_cache_template % os.environ["HOME"]
       if remote_host.split(".")[0] != host_name_global.split(".")[0] and gradle_cache_dir:
         ret = sys_pipe_call("ssh %s pwd" % (remote_host))
-        remote_home = ret.split("\n")[0] 
+        remote_home = ret.split("\n")[0]
         ret = sys_call("ssh %s mkdir -p %s " % (remote_host, (gradle_cache_template % remote_home)))
         cmd = "rsync -avz --rsync-path=%s %s/ %s:%s" % (rsync_path, gradle_cache_dir , remote_host, gradle_cache_template % remote_home)
         sys_call(cmd)
@@ -803,7 +806,7 @@ def get_remote_host_viewroot_path():
       host_viewroot_dict[combined_key] =  "rsync_path" in remote_run_config[component] and remote_run_config[component]["rsync_path"] or rsync_path
   keys = host_viewroot_dict.keys()
   ret = []
-  for k in keys: 
+  for k in keys:
     l = k.split(",")
     l.append(host_viewroot_dict[k])
     ret.append(tuple(l))
diff --git a/helix-core/src/test/java/org/apache/helix/MockAccessor.java b/helix-core/src/test/java/org/apache/helix/MockAccessor.java
index 75f6bbd..c0a0e46 100644
--- a/helix-core/src/test/java/org/apache/helix/MockAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/MockAccessor.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.I0Itec.zkclient.exception.ZkNoNodeException;
 import org.apache.helix.mock.MockBaseDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/ScriptTestHelper.java b/helix-core/src/test/java/org/apache/helix/ScriptTestHelper.java
index f631112..91a8819 100644
--- a/helix-core/src/test/java/org/apache/helix/ScriptTestHelper.java
+++ b/helix-core/src/test/java/org/apache/helix/ScriptTestHelper.java
@@ -22,6 +22,7 @@ package org.apache.helix;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
diff --git a/helix-core/src/test/java/org/apache/helix/TestConfigAccessor.java b/helix-core/src/test/java/org/apache/helix/TestConfigAccessor.java
index f4377d6..9d1c069 100644
--- a/helix-core/src/test/java/org/apache/helix/TestConfigAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/TestConfigAccessor.java
@@ -21,6 +21,7 @@ package org.apache.helix;
 
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.manager.zk.ZKHelixAdmin;
 import org.apache.helix.model.ConfigScope;
 import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
diff --git a/helix-core/src/test/java/org/apache/helix/TestEspressoStorageClusterIdealState.java b/helix-core/src/test/java/org/apache/helix/TestEspressoStorageClusterIdealState.java
index 9cfc697..6cad5af 100644
--- a/helix-core/src/test/java/org/apache/helix/TestEspressoStorageClusterIdealState.java
+++ b/helix-core/src/test/java/org/apache/helix/TestEspressoStorageClusterIdealState.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
+
 import org.apache.helix.model.IdealState;
 import org.apache.helix.tools.DefaultIdealStateCalculator;
 import org.apache.helix.util.RebalanceUtil;
diff --git a/helix-core/src/test/java/org/apache/helix/TestGetProperty.java b/helix-core/src/test/java/org/apache/helix/TestGetProperty.java
index b4496eb..0418407 100644
--- a/helix-core/src/test/java/org/apache/helix/TestGetProperty.java
+++ b/helix-core/src/test/java/org/apache/helix/TestGetProperty.java
@@ -22,6 +22,7 @@ package org.apache.helix;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/helix-core/src/test/java/org/apache/helix/TestGroupCommit.java b/helix-core/src/test/java/org/apache/helix/TestGroupCommit.java
index c5f700f..8465033 100644
--- a/helix-core/src/test/java/org/apache/helix/TestGroupCommit.java
+++ b/helix-core/src/test/java/org/apache/helix/TestGroupCommit.java
@@ -21,6 +21,7 @@ package org.apache.helix;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+
 import org.apache.helix.mock.MockBaseDataAccessor;
 
 public class TestGroupCommit {
diff --git a/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java b/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java
index 6a7bcca..5e10041 100644
--- a/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/TestHelixConfigAccessor.java
@@ -21,6 +21,7 @@ package org.apache.helix;
 
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.manager.zk.ZKHelixAdmin;
 import org.apache.helix.model.HelixConfigScope;
 import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
diff --git a/helix-core/src/test/java/org/apache/helix/TestHelixTaskHandler.java b/helix-core/src/test/java/org/apache/helix/TestHelixTaskHandler.java
index 5228c12..b228e0d 100644
--- a/helix-core/src/test/java/org/apache/helix/TestHelixTaskHandler.java
+++ b/helix-core/src/test/java/org/apache/helix/TestHelixTaskHandler.java
@@ -20,6 +20,7 @@ package org.apache.helix;
  */
 
 import java.util.Date;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.messaging.handling.HelixStateTransitionHandler;
 import org.apache.helix.messaging.handling.HelixTask;
diff --git a/helix-core/src/test/java/org/apache/helix/TestListenerCallback.java b/helix-core/src/test/java/org/apache/helix/TestListenerCallback.java
index f4d0473..d53aed8 100644
--- a/helix-core/src/test/java/org/apache/helix/TestListenerCallback.java
+++ b/helix-core/src/test/java/org/apache/helix/TestListenerCallback.java
@@ -21,6 +21,7 @@ package org.apache.helix;
 
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.api.listeners.ClusterConfigChangeListener;
 import org.apache.helix.api.listeners.InstanceConfigChangeListener;
diff --git a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java b/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java
index 9440af0..136dd3b 100644
--- a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java
+++ b/helix-core/src/test/java/org/apache/helix/TestListenerCallbackBatchMode.java
@@ -22,6 +22,7 @@ package org.apache.helix;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.api.listeners.BatchMode;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java b/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java
index 3ad96ed..c13bcc0 100644
--- a/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java
+++ b/helix-core/src/test/java/org/apache/helix/TestListenerCallbackPrefetch.java
@@ -21,6 +21,7 @@ package org.apache.helix;
 
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.api.listeners.PreFetch;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/test/java/org/apache/helix/TestRelayIdealStateCalculator.java b/helix-core/src/test/java/org/apache/helix/TestRelayIdealStateCalculator.java
index 504d0e6..f81ba67 100644
--- a/helix-core/src/test/java/org/apache/helix/TestRelayIdealStateCalculator.java
+++ b/helix-core/src/test/java/org/apache/helix/TestRelayIdealStateCalculator.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+
 import org.apache.helix.model.IdealState;
 import org.apache.helix.tools.IdealStateCalculatorForEspressoRelay;
 import org.testng.Assert;
diff --git a/helix-core/src/test/java/org/apache/helix/TestRoutingTable.java b/helix-core/src/test/java/org/apache/helix/TestRoutingTable.java
index 631870e..fdd5e5c 100644
--- a/helix-core/src/test/java/org/apache/helix/TestRoutingTable.java
+++ b/helix-core/src/test/java/org/apache/helix/TestRoutingTable.java
@@ -32,6 +32,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+
 import org.apache.helix.mock.MockManager;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
diff --git a/helix-core/src/test/java/org/apache/helix/TestShuffledIdealState.java b/helix-core/src/test/java/org/apache/helix/TestShuffledIdealState.java
index 249e2c5..1297322 100644
--- a/helix-core/src/test/java/org/apache/helix/TestShuffledIdealState.java
+++ b/helix-core/src/test/java/org/apache/helix/TestShuffledIdealState.java
@@ -26,6 +26,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.tools.IdealCalculatorByConsistentHashing;
 import org.apache.helix.tools.IdealStateCalculatorByRush;
 import org.apache.helix.tools.IdealStateCalculatorByShuffling;
diff --git a/helix-core/src/test/java/org/apache/helix/TestZKCallback.java b/helix-core/src/test/java/org/apache/helix/TestZKCallback.java
index b80e4d6..d9b6d8d 100644
--- a/helix-core/src/test/java/org/apache/helix/TestZKCallback.java
+++ b/helix-core/src/test/java/org/apache/helix/TestZKCallback.java
@@ -22,6 +22,7 @@ package org.apache.helix;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.api.listeners.ConfigChangeListener;
 import org.apache.helix.api.listeners.CurrentStateChangeListener;
diff --git a/helix-core/src/test/java/org/apache/helix/TestZKRoutingInfoProvider.java b/helix-core/src/test/java/org/apache/helix/TestZKRoutingInfoProvider.java
index 9936507..5addcfe 100644
--- a/helix-core/src/test/java/org/apache/helix/TestZKRoutingInfoProvider.java
+++ b/helix-core/src/test/java/org/apache/helix/TestZKRoutingInfoProvider.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeMap;
+
 import org.apache.helix.controller.ExternalViewGenerator;
 import org.apache.helix.model.CurrentState.CurrentStateProperty;
 import org.apache.helix.model.Message;
diff --git a/helix-core/src/test/java/org/apache/helix/TestZNRecord.java b/helix-core/src/test/java/org/apache/helix/TestZNRecord.java
index 7dcb9cd..9ff4849 100644
--- a/helix-core/src/test/java/org/apache/helix/TestZNRecord.java
+++ b/helix-core/src/test/java/org/apache/helix/TestZNRecord.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.testng.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/TestZkBasis.java b/helix-core/src/test/java/org/apache/helix/TestZkBasis.java
index e7edd1c..ef6d054 100644
--- a/helix-core/src/test/java/org/apache/helix/TestZkBasis.java
+++ b/helix-core/src/test/java/org/apache/helix/TestZkBasis.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+
 import org.I0Itec.zkclient.IZkChildListener;
 import org.I0Itec.zkclient.IZkDataListener;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
diff --git a/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java b/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java
index a319f3e..7d4bab5 100644
--- a/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java
+++ b/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java
@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.model.IdealState.IdealStateProperty;
 import org.apache.helix.model.IdealState.RebalanceMode;
 import org.apache.helix.tools.TestCommand;
diff --git a/helix-core/src/test/java/org/apache/helix/ZkTestHelper.java b/helix-core/src/test/java/org/apache/helix/ZkTestHelper.java
index f701ae4..2e5409a 100644
--- a/helix-core/src/test/java/org/apache/helix/ZkTestHelper.java
+++ b/helix-core/src/test/java/org/apache/helix/ZkTestHelper.java
@@ -37,6 +37,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+
 import org.I0Itec.zkclient.IZkChildListener;
 import org.I0Itec.zkclient.IZkDataListener;
 import org.I0Itec.zkclient.IZkStateListener;
diff --git a/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java b/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
index 03338b4..d9a470a 100644
--- a/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
@@ -30,9 +30,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
-
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
+
 import org.I0Itec.zkclient.IZkStateListener;
 import org.I0Itec.zkclient.ZkServer;
 import org.apache.helix.BaseDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/common/caches/TestCurrentStateSnapshot.java b/helix-core/src/test/java/org/apache/helix/common/caches/TestCurrentStateSnapshot.java
index ff125ea..62514a4 100644
--- a/helix-core/src/test/java/org/apache/helix/common/caches/TestCurrentStateSnapshot.java
+++ b/helix-core/src/test/java/org/apache/helix/common/caches/TestCurrentStateSnapshot.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.MockAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/common/caches/TestPropertyCache.java b/helix-core/src/test/java/org/apache/helix/common/caches/TestPropertyCache.java
index 8c470f1..b835898 100644
--- a/helix-core/src/test/java/org/apache/helix/common/caches/TestPropertyCache.java
+++ b/helix-core/src/test/java/org/apache/helix/common/caches/TestPropertyCache.java
@@ -1,10 +1,10 @@
 package org.apache.helix.common.caches;
 
-import static org.mockito.Mockito.*;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.PropertyKey;
@@ -13,8 +13,9 @@ import org.apache.helix.model.InstanceConfig;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit test for {@link PropertyCache}
diff --git a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAbstractRebalancer.java b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAbstractRebalancer.java
index 710b372..a3c2d3f 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAbstractRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAbstractRebalancer.java
@@ -22,6 +22,7 @@ package org.apache.helix.controller.rebalancer;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.controller.stages.CurrentStateOutput;
 import org.apache.helix.model.BuiltInStateModelDefinitions;
 import org.apache.helix.model.ClusterConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAutoRebalanceStrategy.java b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAutoRebalanceStrategy.java
index 48c1a0c..26c8e62 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAutoRebalanceStrategy.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAutoRebalanceStrategy.java
@@ -19,10 +19,6 @@ package org.apache.helix.controller.rebalancer;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -37,6 +33,11 @@ import java.util.Random;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.MockAccessor;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAutoRebalanceStrategyImbalanceAssignment.java b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAutoRebalanceStrategyImbalanceAssignment.java
index f26b9c2..a15077c 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAutoRebalanceStrategyImbalanceAssignment.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestAutoRebalanceStrategyImbalanceAssignment.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.rebalancer.strategy.AutoRebalanceStrategy;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestConstraintRebalanceStrategy.java b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestConstraintRebalanceStrategy.java
index ad1f420..1913197 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestConstraintRebalanceStrategy.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestConstraintRebalanceStrategy.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceHardConstraint;
 import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceSoftConstraint;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestZeroReplicaAvoidance.java b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestZeroReplicaAvoidance.java
index 6acbb7f..53a8f49 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestZeroReplicaAvoidance.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/TestZeroReplicaAvoidance.java
@@ -31,6 +31,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
+
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.stages.BaseStageTest;
 import org.apache.helix.controller.stages.CurrentStateOutput;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/MockCapacityProvider.java b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/MockCapacityProvider.java
index d9ea26d..d80274c 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/MockCapacityProvider.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/MockCapacityProvider.java
@@ -21,6 +21,7 @@ package org.apache.helix.controller.rebalancer.constraint.dataprovider;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.api.rebalancer.constraint.dataprovider.CapacityProvider;
 
 public class MockCapacityProvider implements CapacityProvider {
diff --git a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/MockPartitionWeightProvider.java b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/MockPartitionWeightProvider.java
index 49d3aa8..9a26b0d 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/MockPartitionWeightProvider.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/rebalancer/constraint/dataprovider/MockPartitionWeightProvider.java
@@ -21,6 +21,7 @@ package org.apache.helix.controller.rebalancer.constraint.dataprovider;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.api.rebalancer.constraint.dataprovider.PartitionWeightProvider;
 
 public class MockPartitionWeightProvider implements PartitionWeightProvider {
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/BaseStageTest.java b/helix-core/src/test/java/org/apache/helix/controller/stages/BaseStageTest.java
index c7850eb..a91d220 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/BaseStageTest.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/BaseStageTest.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/DummyClusterManager.java b/helix-core/src/test/java/org/apache/helix/controller/stages/DummyClusterManager.java
index abeb5a9..e221f45 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/DummyClusterManager.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/DummyClusterManager.java
@@ -20,6 +20,7 @@ package org.apache.helix.controller.stages;
  */
 
 import java.util.Set;
+
 import org.apache.helix.ClusterMessagingService;
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixAdmin;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestBestPossibleCalcStageCompatibility.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestBestPossibleCalcStageCompatibility.java
index e8883b6..2205c23 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestBestPossibleCalcStageCompatibility.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestBestPossibleCalcStageCompatibility.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestBestPossibleStateCalcStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestBestPossibleStateCalcStage.java
index 3fe45c5..4647334 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestBestPossibleStateCalcStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestBestPossibleStateCalcStage.java
@@ -21,6 +21,7 @@ package org.apache.helix.controller.stages;
 
 import java.util.Date;
 import java.util.Map;
+
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.model.BuiltInStateModelDefinitions;
 import org.apache.helix.model.IdealState.RebalanceMode;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestClusterEventBlockingQueue.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestClusterEventBlockingQueue.java
index b38572d..9b3dbd9 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestClusterEventBlockingQueue.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestClusterEventBlockingQueue.java
@@ -19,14 +19,15 @@ package org.apache.helix.controller.stages;
  * under the License.
  */
 
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
 import org.apache.helix.common.ClusterEventBlockingQueue;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java
index bf4b4f9..d30ec5e 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestCompatibilityCheckStage.java
@@ -21,6 +21,7 @@ package org.apache.helix.controller.stages;
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java
index 67661c9..be7c208 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestCurrentStateComputationStage.java
@@ -20,6 +20,7 @@ package org.apache.helix.controller.stages;
  */
 
 import java.util.Map;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestExternalViewStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestExternalViewStage.java
index 96e334b..15df283 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestExternalViewStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestExternalViewStage.java
@@ -20,6 +20,7 @@ package org.apache.helix.controller.stages;
  */
 
 import java.util.List;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestIntermediateStateCalcStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestIntermediateStateCalcStage.java
index dd727ea..5c3da3e 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestIntermediateStateCalcStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestIntermediateStateCalcStage.java
@@ -21,10 +21,8 @@ package org.apache.helix.controller.stages;
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import com.google.common.collect.ImmutableList;
 import org.apache.helix.api.config.StateTransitionThrottleConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java
index fa3e37a..1c84e65 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestMessageThrottleStage.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java
index 45e1062..0ba2a99 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestMsgSelectionStage.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.controller.stages.MessageSelectionStage.Bounds;
 import org.apache.helix.model.BuiltInStateModelDefinitions;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestQuotaConstraintSkipWorkflowAssignment.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestQuotaConstraintSkipWorkflowAssignment.java
index 210952d..6a7fa0a 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestQuotaConstraintSkipWorkflowAssignment.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestQuotaConstraintSkipWorkflowAssignment.java
@@ -2,6 +2,7 @@ package org.apache.helix.controller.stages;
 
 import java.util.Collections;
 import java.util.HashMap;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
 import org.apache.helix.controller.stages.task.TaskSchedulingStage;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java
index d90c228..e78b1d5 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestRebalancePipeline.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestRecoveryLoadBalance.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestRecoveryLoadBalance.java
index 2e9828f..8c0b08a 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestRecoveryLoadBalance.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestRecoveryLoadBalance.java
@@ -30,6 +30,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.api.config.StateTransitionThrottleConfig;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.rebalancer.DelayedAutoRebalancer;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java
index dceda6e..8b0119a 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceComputationStage.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceValidationStage.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceValidationStage.java
index 1b22acc..95b9303 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceValidationStage.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestResourceValidationStage.java
@@ -19,9 +19,10 @@ package org.apache.helix.controller.stages;
  * under the License.
  */
 
+import java.util.Map;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import java.util.Map;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.MockAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestStateTransitionPriority.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestStateTransitionPriority.java
index 080e270..694596a 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestStateTransitionPriority.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestStateTransitionPriority.java
@@ -29,9 +29,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.api.config.StateTransitionThrottleConfig;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.model.Partition;
diff --git a/helix-core/src/test/java/org/apache/helix/controller/stages/TestStateTransitionThrottleController.java b/helix-core/src/test/java/org/apache/helix/controller/stages/TestStateTransitionThrottleController.java
index 182c428..4a95e70 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/stages/TestStateTransitionThrottleController.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/stages/TestStateTransitionThrottleController.java
@@ -19,22 +19,21 @@ package org.apache.helix.controller.stages;
  * under the License.
  */
 
-import static org.apache.helix.api.config.StateTransitionThrottleConfig.RebalanceType.ANY;
-import static org.apache.helix.api.config.StateTransitionThrottleConfig.RebalanceType.LOAD_BALANCE;
-import static org.apache.helix.api.config.StateTransitionThrottleConfig.RebalanceType.RECOVERY_BALANCE;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import org.apache.helix.api.config.StateTransitionThrottleConfig;
 import org.apache.helix.model.ClusterConfig;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
+import static org.apache.helix.api.config.StateTransitionThrottleConfig.RebalanceType.ANY;
+import static org.apache.helix.api.config.StateTransitionThrottleConfig.RebalanceType.LOAD_BALANCE;
+import static org.apache.helix.api.config.StateTransitionThrottleConfig.RebalanceType.RECOVERY_BALANCE;
 
 public class TestStateTransitionThrottleController {
   private static final String INSTANCE = "instance0";
diff --git a/helix-core/src/test/java/org/apache/helix/controller/strategy/crushMapping/TestCardDealingAdjustmentAlgorithmV2.java b/helix-core/src/test/java/org/apache/helix/controller/strategy/crushMapping/TestCardDealingAdjustmentAlgorithmV2.java
index f99a72d..020682d 100644
--- a/helix-core/src/test/java/org/apache/helix/controller/strategy/crushMapping/TestCardDealingAdjustmentAlgorithmV2.java
+++ b/helix-core/src/test/java/org/apache/helix/controller/strategy/crushMapping/TestCardDealingAdjustmentAlgorithmV2.java
@@ -19,9 +19,6 @@ package org.apache.helix.controller.strategy.crushMapping;
  * under the License.
  */
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -30,6 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.helix.controller.rebalancer.strategy.crushMapping.CardDealingAdjustmentAlgorithmV2;
 import org.apache.helix.controller.rebalancer.topology.InstanceNode;
 import org.apache.helix.controller.rebalancer.topology.Node;
@@ -39,8 +38,8 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class TestCardDealingAdjustmentAlgorithmV2 {
   private static int DEFAULT_REPLICA_COUNT = 3;
diff --git a/helix-core/src/test/java/org/apache/helix/healthcheck/TestParticipantHealthReportCollectorImpl.java b/helix-core/src/test/java/org/apache/helix/healthcheck/TestParticipantHealthReportCollectorImpl.java
index 55d20de..3878f4d 100644
--- a/helix-core/src/test/java/org/apache/helix/healthcheck/TestParticipantHealthReportCollectorImpl.java
+++ b/helix-core/src/test/java/org/apache/helix/healthcheck/TestParticipantHealthReportCollectorImpl.java
@@ -20,6 +20,7 @@ package org.apache.helix.healthcheck;
  */
 
 import java.util.Map;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.mock.MockManager;
 import org.testng.annotations.BeforeMethod;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/SinglePartitionLeaderStandByTest.java b/helix-core/src/test/java/org/apache/helix/integration/SinglePartitionLeaderStandByTest.java
index 82e74c9..00509b3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/SinglePartitionLeaderStandByTest.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/SinglePartitionLeaderStandByTest.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.Arrays;
 import java.util.Date;
+
 import org.apache.helix.HelixConstants;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java b/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
index ef02a41..2b33a44 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.integration.manager.ClusterDistributedController;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java b/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java
index 6419b1a..efef464 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAddNodeAfterControllerStart.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java b/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java
index b36738f..413c343 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAddStateModelFactoryAfterConnect.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java b/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java
index 404c8da..a5779e7 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java
@@ -20,14 +20,14 @@ package org.apache.helix.integration;
  */
 
 import java.io.IOException;
-import javax.management.MBeanServerConnection;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+import javax.management.MBeanServerConnection;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestBasicSpectator.java b/helix-core/src/test/java/org/apache/helix/integration/TestBasicSpectator.java
index 27fbf32..2fa8c9f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestBasicSpectator.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestBasicSpectator.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.ExternalViewChangeListener;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java b/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java
index ec837f8..8ca5975 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.Arrays;
 import java.util.Map;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.integration.task.TaskTestBase;
 import org.apache.helix.integration.task.WorkflowGenerator;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestBatchMessageHandling.java b/helix-core/src/test/java/org/apache/helix/integration/TestBatchMessageHandling.java
index 08d3e33..4dc07f3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestBatchMessageHandling.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestBatchMessageHandling.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java b/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java
index d10234d..a9c6053 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestBucketizedResource.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.apache.helix.ExternalViewChangeListener;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestCMWithFailParticipant.java b/helix-core/src/test/java/org/apache/helix/integration/TestCMWithFailParticipant.java
index 96e7e74..f93b666 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestCMWithFailParticipant.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestCMWithFailParticipant.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.common.ZkTestBase;
 import org.testng.annotations.Test;
 
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java b/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java
index dd2ca3d..c1da527 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestCarryOverBadCurState.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestCleanupExternalView.java b/helix-core/src/test/java/org/apache/helix/integration/TestCleanupExternalView.java
index 751128a..f5b87c5 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestCleanupExternalView.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestCleanupExternalView.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.PropertyKey;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java b/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java
index d4f11a5d..4e2a8fa 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestCorrectnessOnConnectivityLoss.java b/helix-core/src/test/java/org/apache/helix/integration/TestCorrectnessOnConnectivityLoss.java
index 4bf1ecf..b7acfda 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestCorrectnessOnConnectivityLoss.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestCorrectnessOnConnectivityLoss.java
@@ -19,10 +19,10 @@ package org.apache.helix.integration;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
-
 import java.lang.reflect.Method;
 import java.util.Map;
+
+import com.google.common.collect.Maps;
 import org.I0Itec.zkclient.ZkServer;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDisable.java b/helix-core/src/test/java/org/apache/helix/integration/TestDisable.java
index 43c0235..5db4f82 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDisable.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDisable.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDisableCustomCodeRunner.java b/helix-core/src/test/java/org/apache/helix/integration/TestDisableCustomCodeRunner.java
index ab5a830..3c84a28 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDisableCustomCodeRunner.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDisableCustomCodeRunner.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixConstants.ChangeType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java b/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java
index 9b44d24..a021153 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.HelixProperty;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDisablePartition.java b/helix-core/src/test/java/org/apache/helix/integration/TestDisablePartition.java
index 7afe40e..3ccbbf4 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDisablePartition.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDisablePartition.java
@@ -19,14 +19,15 @@ package org.apache.helix.integration;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDisableResource.java b/helix-core/src/test/java/org/apache/helix/integration/TestDisableResource.java
index c474122..3b75821 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDisableResource.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDisableResource.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDistributedCMMain.java b/helix-core/src/test/java/org/apache/helix/integration/TestDistributedCMMain.java
index 2496c25..5ee5aa9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDistributedCMMain.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDistributedCMMain.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDistributedClusterController.java b/helix-core/src/test/java/org/apache/helix/integration/TestDistributedClusterController.java
index c5dbdd4..581759a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDistributedClusterController.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDistributedClusterController.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDrop.java b/helix-core/src/test/java/org/apache/helix/integration/TestDrop.java
index 7dc29c5..4dcc739 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDrop.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDrop.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixDefinedState;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestEnablePartitionDuringDisable.java b/helix-core/src/test/java/org/apache/helix/integration/TestEnablePartitionDuringDisable.java
index ca47e9c..71f15c7 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestEnablePartitionDuringDisable.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestEnablePartitionDuringDisable.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestEntropyFreeNodeBounce.java b/helix-core/src/test/java/org/apache/helix/integration/TestEntropyFreeNodeBounce.java
index ecdd285..3bd01ad 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestEntropyFreeNodeBounce.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestEntropyFreeNodeBounce.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestErrorPartition.java b/helix-core/src/test/java/org/apache/helix/integration/TestErrorPartition.java
index 6806969..8c00c90 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestErrorPartition.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestErrorPartition.java
@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.integration.manager.ClusterControllerManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestErrorReplicaPersist.java b/helix-core/src/test/java/org/apache/helix/integration/TestErrorReplicaPersist.java
index ba690ff..b719714 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestErrorReplicaPersist.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestErrorReplicaPersist.java
@@ -1,6 +1,7 @@
 package org.apache.helix.integration;
 
 import java.util.Date;
+
 import org.apache.helix.HelixRollbackException;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.controller.rebalancer.strategy.CrushEdRebalanceStrategy;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestExpandCluster.java b/helix-core/src/test/java/org/apache/helix/integration/TestExpandCluster.java
index 5eea3e6..e3e018d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestExpandCluster.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestExpandCluster.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Map;
+
 import org.apache.helix.TestEspressoStorageClusterIdealState;
 import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestExternalCmd.java b/helix-core/src/test/java/org/apache/helix/integration/TestExternalCmd.java
index 81ea1d1..b7ed5eb 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestExternalCmd.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestExternalCmd.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.ExternalCommand;
 import org.apache.helix.ScriptTestHelper;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestExternalViewUpdates.java b/helix-core/src/test/java/org/apache/helix/integration/TestExternalViewUpdates.java
index b6058e9..46dc4e4 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestExternalViewUpdates.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestExternalViewUpdates.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestFailOverPerf1kp.java b/helix-core/src/test/java/org/apache/helix/integration/TestFailOverPerf1kp.java
index 5129c74..962cecf 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestFailOverPerf1kp.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestFailOverPerf1kp.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.ExternalCommand;
 import org.apache.helix.ScriptTestHelper;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.java b/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.java
index fe3fe1d..3c8d197 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestHelixUsingDifferentParams.java b/helix-core/src/test/java/org/apache/helix/integration/TestHelixUsingDifferentParams.java
index 71738e2..7828843 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestHelixUsingDifferentParams.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestHelixUsingDifferentParams.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.common.ZkTestBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestInvalidResourceRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/TestInvalidResourceRebalance.java
index 4ff2a29..96506ad 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestInvalidResourceRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestInvalidResourceRebalance.java
@@ -19,9 +19,10 @@ package org.apache.helix.integration;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
 import java.util.Date;
 import java.util.Map;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkUnitTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestMessagePartitionStateMismatch.java b/helix-core/src/test/java/org/apache/helix/integration/TestMessagePartitionStateMismatch.java
index 56b5ca0..f353ca5 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestMessagePartitionStateMismatch.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestMessagePartitionStateMismatch.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestNoThrottleDisabledPartitions.java b/helix-core/src/test/java/org/apache/helix/integration/TestNoThrottleDisabledPartitions.java
index 50d789e..573aebf 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestNoThrottleDisabledPartitions.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestNoThrottleDisabledPartitions.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java b/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java
index fb13558..03cd323 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestNullReplica.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java b/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java
index 1dbaadb..d74b4ac 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestPartitionLevelTransitionConstraint.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java b/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java
index 36a1ee3..e7cf412 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java
@@ -30,6 +30,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.NotificationContext;
@@ -53,9 +55,6 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
 public class TestPartitionMovementThrottle extends ZkStandAloneCMTestBase {
 
   private ConfigAccessor _configAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestPauseSignal.java b/helix-core/src/test/java/org/apache/helix/integration/TestPauseSignal.java
index 9e15469..1db5241 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestPauseSignal.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestPauseSignal.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.ZkTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestPersistAssignmentStage.java b/helix-core/src/test/java/org/apache/helix/integration/TestPersistAssignmentStage.java
index a8218b1..b029ee4 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestPersistAssignmentStage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestPersistAssignmentStage.java
@@ -3,6 +3,7 @@ package org.apache.helix.integration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestPreferenceListAsQueue.java b/helix-core/src/test/java/org/apache/helix/integration/TestPreferenceListAsQueue.java
index 000c0a1..79a26a5 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestPreferenceListAsQueue.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestPreferenceListAsQueue.java
@@ -19,13 +19,14 @@ package org.apache.helix.integration;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+
+import com.google.common.collect.Lists;
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixAdmin;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java b/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java
index 6f72748..1656b48 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestReelectedPipelineCorrectness.java b/helix-core/src/test/java/org/apache/helix/integration/TestReelectedPipelineCorrectness.java
index 7343785..4596dad 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestReelectedPipelineCorrectness.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestReelectedPipelineCorrectness.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestRenamePartition.java b/helix-core/src/test/java/org/apache/helix/integration/TestRenamePartition.java
index 3c0194b..a8e89aa 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestRenamePartition.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestRenamePartition.java
@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResetInstance.java b/helix-core/src/test/java/org/apache/helix/integration/TestResetInstance.java
index 48fa742..034449a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestResetInstance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestResetInstance.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.integration.manager.ClusterControllerManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java b/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java
index f9a6111..3a653f2 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestResetPartitionState.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java b/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java
index 3d39880..b00b584 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestResetResource.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.integration.manager.ClusterControllerManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java b/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java
index 2e98ae8..5f82fe6 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestResourceGroupEndtoEnd.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java b/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java
index f98c460..23bc801 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestResourceWithSamePartitionKey.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java b/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java
index 4dd7191..2f5c777 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestSchemataSM.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Map;
+
 import org.apache.helix.PropertyKey;
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.ZkTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java b/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java
index abc61e1..afd1394 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestSessionExpiryInTransition.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkTestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java b/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java
index ff208ce..596c8b3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMMain.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java b/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java
index d9532c2..dd35c31 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStandAloneCMSessionExpiry.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkTestHelper;
 import org.apache.helix.common.ZkTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java b/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java
index a412dd0..2653c10 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStartMultipleControllersWithSameName.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration;
  */
 
 import java.util.Date;
+
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkTestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java
index 1f9ec5f..0a6bc23 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixRollbackException;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java
index 6162879..455bb44 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionThrottle.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStatusUpdate.java b/helix-core/src/test/java/org/apache/helix/integration/TestStatusUpdate.java
index b7a6eb9..4ee33d4 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStatusUpdate.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStatusUpdate.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
 import org.apache.helix.manager.zk.ZKHelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java b/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
index 5a5a252..9dfda50 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.api.config.RebalanceConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java
index 33c52b1..b514e3d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.I0Itec.zkclient.IZkChildListener;
 import org.I0Itec.zkclient.IZkDataListener;
 import org.apache.helix.CurrentStateChangeListener;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java
index 79451f1..7a1c141 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java
@@ -19,12 +19,13 @@ package org.apache.helix.integration;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java b/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java
index dbb589a..9cbe654 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.common;
  */
 
 import java.util.Date;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java
index c8b5004..8ce456c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java
@@ -19,10 +19,11 @@ package org.apache.helix.integration.controller;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java
index a01afcd..3376885 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.controller;
  */
 
 import java.util.List;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLeadershipChange.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLeadershipChange.java
index 5eaa083..60d19ed 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLeadershipChange.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLeadershipChange.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.controller;
 import java.lang.management.ManagementFactory;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java
index 92ead5d..0dff764 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.controller;
 import java.util.Date;
 import java.util.Map;
 import java.util.Random;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java
index 1577efa..dc878ab 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.controller;
 
 import java.util.ArrayList;
 import java.util.Set;
+
 import org.apache.helix.ZkUnitTestBase;
 import org.apache.helix.controller.GenericHelixController;
 import org.testng.Assert;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestRedundantDroppedMessage.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestRedundantDroppedMessage.java
index ed2ad1b..30f9907 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestRedundantDroppedMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestRedundantDroppedMessage.java
@@ -3,6 +3,7 @@ package org.apache.helix.integration.controller;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.stages.AttributeName;
 import org.apache.helix.controller.stages.BestPossibleStateCalcStage;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java
index e9d6d8a..271682f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.controller;
  */
 
 import java.util.List;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.integration.task.TaskTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java
index 8e1b59c..5b2dedf 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.manager;
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+
 import org.apache.helix.HelixTimerTask;
 import org.apache.helix.InstanceType;
 import org.apache.helix.manager.zk.CallbackHandler;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java b/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java
index 0a49d58..d17f96c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.manager;
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+
 import org.apache.helix.InstanceType;
 import org.apache.helix.manager.zk.CallbackHandler;
 import org.apache.helix.manager.zk.ZKHelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java
index d1677c6..ed4612e 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.manager;
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+
 import org.apache.helix.InstanceType;
 import org.apache.helix.manager.zk.CallbackHandler;
 import org.apache.helix.manager.zk.ZKHelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java
index f8fa101..e64306e 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.manager;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PreConnectCallback;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java
index a4af04b..2411d72 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.manager;
 
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkTestHelper;
 import org.apache.helix.ZkUnitTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
index 6c1e0eb..878833f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.manager;
 
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.InstanceType;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java
index a6882d4..6789d1c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixProperty;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
index 3999bd2..55053a5 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
@@ -29,6 +29,7 @@ import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.InstanceType;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java
index 0521e7a..0907a5d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkUnitTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkHelixAdmin.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkHelixAdmin.java
index 78c8815..1f9ee5f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkHelixAdmin.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestZkHelixAdmin.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.manager;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java
index d1de60a..bf4209b 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.manager;
  */
 
 import java.util.List;
+
 import org.apache.helix.manager.zk.CallbackHandler;
 import org.apache.helix.manager.zk.client.HelixZkClient;
 
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
index eac8860..0b16df2 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.I0Itec.zkclient.IZkChildListener;
 import org.apache.helix.HelixProperty.HelixPropertyAttribute;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java
index bf7cb7c..093c943 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.messaging;
  */
 
 import java.util.Date;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestGroupCommitAddBackData.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestGroupCommitAddBackData.java
index 6e7bfc7..7bfbdb7 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestGroupCommitAddBackData.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestGroupCommitAddBackData.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.messaging;
 
 import java.util.Date;
 import java.util.UUID;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java
index a1f71dc..b4a0b32 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.messaging;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.I0Itec.zkclient.IZkChildListener;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.PropertyPathBuilder;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java
index b6971e0..7b73643 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java
@@ -28,6 +28,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.ControllerChangeListener;
 import org.apache.helix.ExternalViewChangeListener;
 import org.apache.helix.HelixAdmin;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java
index 0edb287..a37f699 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java
@@ -19,10 +19,11 @@ package org.apache.helix.integration.messaging;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.UUID;
+
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.Criteria;
 import org.apache.helix.Criteria.DataSource;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
index 9292e08..03596b3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.common.ZkTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PNoDuplicatedMessage.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PNoDuplicatedMessage.java
index 8cbc74f..a910f28 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PNoDuplicatedMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PNoDuplicatedMessage.java
@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.helix.ClusterMessagingService;
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PSingleTopState.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PSingleTopState.java
index e954cfe..8827d3c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PSingleTopState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PSingleTopState.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java
index 173a80a..dfe6b19 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java
@@ -19,7 +19,6 @@ package org.apache.helix.integration.messaging;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableList;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,6 +29,8 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.CountDownLatch;
+
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.Criteria;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java
index 40df6d6..3691384 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.messaging;
 import java.io.StringWriter;
 import java.util.Set;
 import java.util.UUID;
+
 import org.apache.helix.Criteria;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java
index 2380c2d..c283301 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
+
 import org.apache.helix.Criteria;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java
index afb0180..f0068d3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.messaging;
 import java.io.StringWriter;
 import java.util.Set;
 import java.util.UUID;
+
 import org.apache.helix.Criteria;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java
index ab1c402..547f5af 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.paticipant;
  */
 
 import java.util.List;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
index 952032c..3b3d14c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.paticipant;
  */
 
 import java.util.Date;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.integration.manager.ClusterControllerManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java
index 9fa9615..cd729c1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.paticipant;
  */
 
 import java.util.UUID;
+
 import org.apache.helix.Criteria;
 import org.apache.helix.InstanceType;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java
index 93a32ef..93819fd 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.paticipant;
  */
 
 import java.util.Date;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
index 1ba1357..2cfd2fe 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.paticipant;
 
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicReference;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.ZkTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java
index 59aa61e..c2b287f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java
index c3bcf47..1d33b6c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
index fd58d7f..9fd2ee3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.controller.rebalancer.strategy.CrushEdRebalanceStrategy;
 import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
index ce4f1dd..a1baf03 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.controller.rebalancer.strategy.CrushEdRebalanceStrategy;
 import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java
index 2b89164..5d4c0a6 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.rebalancer.CrushRebalancers;
  */
 
 import java.util.Date;
+
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
index 0105a51..5ae022e 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
@@ -26,9 +26,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
-import org.apache.helix.controller.rebalancer.util.RebalanceScheduler;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
 import org.apache.helix.model.BuiltInStateModelDefinitions;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java
index 746bdf3..80141c9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java
@@ -20,8 +20,8 @@ package org.apache.helix.integration.rebalancer.DelayedAutoRebalancer;
  */
 
 import java.util.Map;
+
 import org.apache.helix.ConfigAccessor;
-import org.apache.helix.controller.rebalancer.util.RebalanceScheduler;
 import org.apache.helix.integration.manager.MockParticipantManager;
 import org.apache.helix.model.ExternalView;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
index f768684..c285449 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.rebalancer.DelayedAutoRebalancer;
  */
 
 import java.util.Date;
+
 import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java
index 83893c6..d9dc1bc 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.rebalancer.PartitionMigration;
  */
 
 import java.util.Map;
+
 import org.apache.helix.integration.manager.MockParticipantManager;
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java
index 98dcbb6..a28c4c3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java
index 7a559a5..bfc80e1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestPartitionMigrationBase.java
@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java
index 0697426..06d9654 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoIsWithEmptyMap.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.rebalancer;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java
index e7d0b71..0a4ec4b 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java
index 34e374d..91d4cb8 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.rebalancer;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalanceWithDisabledInstance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalanceWithDisabledInstance.java
index 3c5b943..02c3741 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalanceWithDisabledInstance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalanceWithDisabledInstance.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.rebalancer;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.TestHelper;
 import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
index e05f017..6a41c7b 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.rebalancer;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.common.ZkTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
index 5c68aaa..23226d4 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
@@ -23,7 +23,9 @@ import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.management.*;
+import javax.management.MBeanServerConnection;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixAdmin;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomIdealState.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomIdealState.java
index a8e1f92..cc99e6f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomIdealState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomIdealState.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.rebalancer;
  */
 
 import java.util.Date;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.integration.TestDriver;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomRebalancer.java
index 57f8e80..b3ff12a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomRebalancer.java
@@ -34,7 +34,8 @@ import org.apache.helix.model.StateModelDefinition;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class TestCustomRebalancer {
 
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomizedIdealStateRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomizedIdealStateRebalancer.java
index c6ebb46..0b3652a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomizedIdealStateRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestCustomizedIdealStateRebalancer.java
@@ -19,10 +19,11 @@ package org.apache.helix.integration.rebalancer;
  * under the License.
  */
 
-import com.beust.jcommander.internal.Lists;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.beust.jcommander.internal.Lists;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestFullAutoNodeTagging.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestFullAutoNodeTagging.java
index 25068d9..074f5b9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestFullAutoNodeTagging.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestFullAutoNodeTagging.java
@@ -19,13 +19,13 @@ package org.apache.helix.integration.rebalancer;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import java.util.Date;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
index 76560e9..fb8399c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
@@ -25,13 +25,13 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.common.ZkTestBase;
 import org.apache.helix.controller.rebalancer.strategy.CrushEdRebalanceStrategy;
 import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
-import org.apache.helix.controller.rebalancer.util.RebalanceScheduler;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
 import org.apache.helix.manager.zk.ZKHelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
index b98d75b..100250f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.common.ZkTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java
index ab4a263..941dc0a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.ExternalViewChangeListener;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java
index c8bfd34..6dc036a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProvider.java
@@ -8,6 +8,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java
index b70bae8..37c7a1f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderFromCurrentStates.java
@@ -23,6 +23,10 @@ import java.lang.management.ManagementFactory;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
@@ -47,10 +51,6 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
 public class TestRoutingTableProviderFromCurrentStates extends ZkTestBase {
   private HelixManager _manager;
   private final int NUM_NODES = 10;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java
index 2aedfdc..fdce32e 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableProviderPeriodicRefresh.java
@@ -5,6 +5,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableSnapshot.java b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableSnapshot.java
index d4461a3..8cd4bf9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableSnapshot.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/spectator/TestRoutingTableSnapshot.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.spectator;
 
 import java.util.List;
 import java.util.Set;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/MockTask.java b/helix-core/src/test/java/org/apache/helix/integration/task/MockTask.java
index 778bd10..6615062 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/MockTask.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/MockTask.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.task;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.task.Task;
 import org.apache.helix.task.TaskCallbackContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestUtil.java b/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestUtil.java
index 170c55a..9c36786 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestUtil.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TaskTestUtil.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestBatchAddJobs.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestBatchAddJobs.java
index 4645c42..8e02921 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestBatchAddJobs.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestBatchAddJobs.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestDisableJobExternalView.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestDisableJobExternalView.java
index c9dbaa7..87535d5 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestDisableJobExternalView.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestDisableJobExternalView.java
@@ -19,10 +19,11 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.ExternalViewChangeListener;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestDropOnParticipantReset.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestDropOnParticipantReset.java
index 5dbde94..0057ccb 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestDropOnParticipantReset.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestDropOnParticipantReset.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.task;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.model.InstanceConfig;
 import org.apache.helix.task.JobConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestExecutionDelay.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestExecutionDelay.java
index 8b43573..c695556 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestExecutionDelay.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestExecutionDelay.java
@@ -20,23 +20,12 @@ package org.apache.helix.integration.task;
  */
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import java.util.List;
-import org.apache.helix.HelixAdmin;
-import org.apache.helix.HelixDataAccessor;
-import org.apache.helix.HelixException;
-import org.apache.helix.PropertyKey;
-import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobContext;
-import org.apache.helix.task.JobQueue;
-import org.apache.helix.task.TaskConstants;
-import org.apache.helix.task.TaskState;
 import org.apache.helix.task.TaskUtil;
 import org.apache.helix.task.Workflow;
 import org.apache.helix.task.WorkflowContext;
-import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestForceDeleteWorkflow.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestForceDeleteWorkflow.java
index 4982f1c..6379b51 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestForceDeleteWorkflow.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestForceDeleteWorkflow.java
@@ -19,12 +19,12 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.HelixAdmin;
-import org.apache.helix.task.TaskUtil;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
@@ -39,6 +39,7 @@ import org.apache.helix.task.TaskDriver;
 import org.apache.helix.task.TaskFactory;
 import org.apache.helix.task.TaskState;
 import org.apache.helix.task.TaskStateModelFactory;
+import org.apache.helix.task.TaskUtil;
 import org.apache.helix.task.Workflow;
 import org.apache.helix.task.WorkflowConfig;
 import org.apache.helix.task.WorkflowContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericJobs.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericJobs.java
index 449dc32..818c1a6 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericJobs.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericJobs.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.task;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobQueue;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
index 788f704..dd893b2 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
@@ -19,15 +19,16 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobAndWorkflowType.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobAndWorkflowType.java
index f9c5106..babfdd3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobAndWorkflowType.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobAndWorkflowType.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.task;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.TaskState;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java
index f9ec15a..1bf4221 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java
@@ -19,13 +19,14 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.helix.TestHelper;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureDependence.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureDependence.java
index c1d49d6..7aff59a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureDependence.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureDependence.java
@@ -19,9 +19,10 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.List;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobQueue;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java
index 658d52a..9536634 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java
@@ -19,13 +19,14 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.integration.manager.ClusterControllerManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobQueueCleanUp.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobQueueCleanUp.java
index a385b53..c7274bc 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobQueueCleanUp.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobQueueCleanUp.java
@@ -19,9 +19,10 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
 import java.util.HashSet;
 import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java
index 15fb21f..1955ef1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java
@@ -19,9 +19,10 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
+import java.util.Map;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
-import java.util.Map;
 import org.apache.helix.TestHelper;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java
index 0b2bcf3..276260d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java
@@ -19,9 +19,10 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestNoDoubleAssign.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestNoDoubleAssign.java
index ad0ee9a..9d25354 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestNoDoubleAssign.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestNoDoubleAssign.java
@@ -29,6 +29,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobContext;
@@ -40,8 +41,6 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ImmutableMap;
-
 public class TestNoDoubleAssign extends TaskTestBase {
   private static final int THREAD_COUNT = 10;
   private static final long CONNECTION_DELAY = 100L;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestQuotaBasedScheduling.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestQuotaBasedScheduling.java
index 7f39331..23497a5 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestQuotaBasedScheduling.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestQuotaBasedScheduling.java
@@ -19,7 +19,6 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java
index 018821e..4473cce 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java
@@ -19,10 +19,11 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
 import java.util.HashSet;
 import java.util.Set;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.helix.TestHelper;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestRecurringJobQueue.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestRecurringJobQueue.java
index 20970a1..f5a44d8 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestRecurringJobQueue.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestRecurringJobQueue.java
@@ -19,11 +19,12 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestRetrieveWorkflows.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestRetrieveWorkflows.java
index 4267ad2..cccd953 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestRetrieveWorkflows.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestRetrieveWorkflows.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.task;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestRunJobsWithMissingTarget.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestRunJobsWithMissingTarget.java
index d9a0f4f..8436ad0 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestRunJobsWithMissingTarget.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestRunJobsWithMissingTarget.java
@@ -19,9 +19,10 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.List;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.TaskState;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestRuntimeJobDag.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestRuntimeJobDag.java
index ec61a07..b9aeb66 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestRuntimeJobDag.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestRuntimeJobDag.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import org.apache.helix.task.RuntimeJobDag;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestStopWorkflow.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestStopWorkflow.java
index 33788df..0721b88 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestStopWorkflow.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestStopWorkflow.java
@@ -19,11 +19,12 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.TestHelper;
 import org.apache.helix.integration.manager.MockParticipantManager;
 import org.apache.helix.participant.StateMachineEngine;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestStopWorkflowWithExecutionDelay.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestStopWorkflowWithExecutionDelay.java
index c7fc988..bd9ee4d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestStopWorkflowWithExecutionDelay.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestStopWorkflowWithExecutionDelay.java
@@ -19,19 +19,15 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
-import org.apache.helix.task.JobContext;
 import org.apache.helix.task.TaskState;
 import org.apache.helix.task.TaskUtil;
 import org.apache.helix.task.Workflow;
-import org.apache.helix.task.WorkflowContext;
-import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ImmutableMap;
-
 /**
  * This test checks whether workflow stop works properly with execution delay set.
  */
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskAssignment.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskAssignment.java
index 8082b36..93cef4d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskAssignment.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskAssignment.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.task;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobQueue;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskAssignmentCalculator.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskAssignmentCalculator.java
index 49c9d2b..2fa24c0 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskAssignmentCalculator.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskAssignmentCalculator.java
@@ -19,13 +19,14 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskConditionalRetry.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskConditionalRetry.java
index 0178fff..41daae1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskConditionalRetry.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskConditionalRetry.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.task;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskErrorReporting.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskErrorReporting.java
index 5d92bb0..82661ed 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskErrorReporting.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskErrorReporting.java
@@ -21,6 +21,7 @@ package org.apache.helix.integration.task;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobContext;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
index 73d9a4f..42d4f00 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
@@ -19,12 +19,13 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
+import java.util.Map;
+import java.util.Set;
+
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
-import java.util.Map;
-import java.util.Set;
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java
index b338954..ccb85ee 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java
@@ -19,8 +19,9 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.Set;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerParallel.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerParallel.java
index f81469c..fc7f893 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerParallel.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerParallel.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.task;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobQueue;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
index 4d312c3..0a10a72 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
@@ -19,10 +19,6 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -31,6 +27,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyPathBuilder;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskStopQueue.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskStopQueue.java
index 723ab93..5b85457 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskStopQueue.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskStopQueue.java
@@ -22,18 +22,18 @@ package org.apache.helix.integration.task;
 import com.google.common.collect.ImmutableMap;
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixAdmin;
-import org.apache.helix.ZkTestHelper;
-import org.apache.helix.manager.zk.ZkClient;
-import org.apache.helix.task.JobQueue;
-import org.apache.helix.task.TaskUtil;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
 import org.apache.helix.TestHelper;
+import org.apache.helix.ZkTestHelper;
 import org.apache.helix.integration.manager.ClusterControllerManager;
+import org.apache.helix.manager.zk.ZkClient;
 import org.apache.helix.task.JobConfig;
+import org.apache.helix.task.JobQueue;
 import org.apache.helix.task.TaskDriver;
 import org.apache.helix.task.TaskState;
+import org.apache.helix.task.TaskUtil;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskThreadLeak.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskThreadLeak.java
index 420c534..4e3e289 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskThreadLeak.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskThreadLeak.java
@@ -20,6 +20,7 @@ package org.apache.helix.integration.task;
  */
 
 import java.util.Set;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.model.IdealState;
 import org.apache.helix.task.JobConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskThrottling.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskThrottling.java
index cb4f897..711c9e6 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskThrottling.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskThrottling.java
@@ -19,11 +19,12 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.HelixConfigScope;
 import org.apache.helix.model.InstanceConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestUpdateWorkflow.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestUpdateWorkflow.java
index 0078428..20ae128 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestUpdateWorkflow.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestUpdateWorkflow.java
@@ -19,9 +19,10 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.TestHelper;
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.JobQueue;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java
index dcfe553..92aa819 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java
@@ -19,11 +19,12 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java
index f31f2df..3cf6933 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java
@@ -19,12 +19,13 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
 import java.lang.management.ManagementFactory;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.helix.TestHelper;
 import org.apache.helix.model.MasterSlaveSMD;
 import org.apache.helix.monitoring.mbeans.MonitorDomainNames;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java
index 3025d69..b5af0cf 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java
@@ -19,9 +19,10 @@ package org.apache.helix.integration.task;
  * under the License.
  */
 
+import java.util.Collections;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
-import java.util.Collections;
 import org.apache.helix.TestHelper;
 import org.apache.helix.model.MasterSlaveSMD;
 import org.apache.helix.task.JobConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java b/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java
index 2a12282..40e2dcf 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java
@@ -22,6 +22,7 @@ package org.apache.helix.integration.task;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
+
 import org.apache.helix.task.JobConfig;
 import org.apache.helix.task.Workflow;
 
diff --git a/helix-core/src/test/java/org/apache/helix/manager/MockListener.java b/helix-core/src/test/java/org/apache/helix/manager/MockListener.java
index 5f272d9..376481e 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/MockListener.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/MockListener.java
@@ -20,6 +20,7 @@ package org.apache.helix.manager;
  */
 
 import java.util.List;
+
 import org.apache.helix.ConfigChangeListener;
 import org.apache.helix.ControllerChangeListener;
 import org.apache.helix.CurrentStateChangeListener;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestAddBuiltInStateModelDef.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestAddBuiltInStateModelDef.java
index 6c1b8f8..3fb5fc9 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestAddBuiltInStateModelDef.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestAddBuiltInStateModelDef.java
@@ -20,6 +20,7 @@ package org.apache.helix.manager.zk;
  */
 
 import java.util.Date;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestDefaultControllerMsgHandlerFactory.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestDefaultControllerMsgHandlerFactory.java
index f7cddb2..052c8bd 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestDefaultControllerMsgHandlerFactory.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestDefaultControllerMsgHandlerFactory.java
@@ -22,6 +22,7 @@ package org.apache.helix.manager.zk;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.manager.zk.DefaultControllerMessageHandlerFactory.DefaultControllerMessageHandler;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestRawZkClient.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestRawZkClient.java
index 95a55c4..fb74e54 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestRawZkClient.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestRawZkClient.java
@@ -19,8 +19,6 @@ package org.apache.helix.manager.zk;
  * under the License.
  */
 
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -28,6 +26,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
 
 import org.I0Itec.zkclient.IZkDataListener;
 import org.I0Itec.zkclient.IZkStateListener;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheAsyncOpMultiThread.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheAsyncOpMultiThread.java
index 2c0507e..7b030ce 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheAsyncOpMultiThread.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheAsyncOpMultiThread.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.Callable;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.PropertyPathBuilder;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheAsyncOpSingleThread.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheAsyncOpSingleThread.java
index 0c2c8b5..9eea08c 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheAsyncOpSingleThread.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheAsyncOpSingleThread.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.PropertyPathBuilder;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheSyncOpSingleThread.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheSyncOpSingleThread.java
index 1e36db1..9572ae0 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheSyncOpSingleThread.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestWtCacheSyncOpSingleThread.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.helix.AccessOption;
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
index cd7d1fb..c3aace7 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
@@ -26,6 +26,7 @@ import java.util.TreeMap;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java
index 5ccaaf3..03ea8c3 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.PropertyPathBuilder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSerializer.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSerializer.java
index d248438..d3f5746 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSerializer.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSerializer.java
@@ -1,8 +1,5 @@
 package org.apache.helix.manager.zk;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -13,6 +10,10 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import org.I0Itec.zkclient.serialize.ZkSerializer;
 import org.apache.helix.ZNRecord;
 import org.testng.Assert;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSizeLimit.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSizeLimit.java
index bccb425..6130062 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSizeLimit.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSizeLimit.java
@@ -21,6 +21,7 @@ package org.apache.helix.manager.zk;
 
 import java.util.Arrays;
 import java.util.Date;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.PropertyKey.Builder;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordStreamingSerializer.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordStreamingSerializer.java
index 2aea3da..50a84e6 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordStreamingSerializer.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordStreamingSerializer.java
@@ -1,10 +1,11 @@
 package org.apache.helix.manager.zk;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.ZNRecord;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheAsyncOpSingleThread.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheAsyncOpSingleThread.java
index 48e0998..89d4f18 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheAsyncOpSingleThread.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheAsyncOpSingleThread.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.PropertyPathBuilder;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
index 76c4479..30043ef 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.AccessOption;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java
index 5ad5212..c5b3b3d 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java
@@ -21,6 +21,7 @@ package org.apache.helix.manager.zk;
 
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import org.I0Itec.zkclient.IZkStateListener;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java
index d372d67..20acef4 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java
@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkReconnect.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkReconnect.java
index 4d8ea99..45ca347 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkReconnect.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkReconnect.java
@@ -21,6 +21,7 @@ package org.apache.helix.manager.zk;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+
 import org.I0Itec.zkclient.ZkServer;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/serializer/TestJacksonPayloadSerializer.java b/helix-core/src/test/java/org/apache/helix/manager/zk/serializer/TestJacksonPayloadSerializer.java
index b3538f8..85a362f 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/serializer/TestJacksonPayloadSerializer.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/serializer/TestJacksonPayloadSerializer.java
@@ -22,6 +22,7 @@ package org.apache.helix.manager.zk.serializer;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
+
 import org.apache.helix.ZNRecord;
 import org.apache.helix.manager.zk.ZNRecordSerializer;
 import org.apache.helix.manager.zk.ZNRecordStreamingSerializer;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/TestAsyncCallback.java b/helix-core/src/test/java/org/apache/helix/messaging/TestAsyncCallback.java
index 53caa8e..dd2022d 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/TestAsyncCallback.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/TestAsyncCallback.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+
 import org.apache.helix.model.Message;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/TestAsyncCallbackSvc.java b/helix-core/src/test/java/org/apache/helix/messaging/TestAsyncCallbackSvc.java
index 5547596..45e48f8 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/TestAsyncCallbackSvc.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/TestAsyncCallbackSvc.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/TestDefaultMessagingService.java b/helix-core/src/test/java/org/apache/helix/messaging/TestDefaultMessagingService.java
index 4fbf891..f431ab6 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/TestDefaultMessagingService.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/TestDefaultMessagingService.java
@@ -19,11 +19,12 @@ package org.apache.helix.messaging;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.Criteria;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/handling/MockHelixTaskExecutor.java b/helix-core/src/test/java/org/apache/helix/messaging/handling/MockHelixTaskExecutor.java
index 207f74c..f7934d2 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/handling/MockHelixTaskExecutor.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/handling/MockHelixTaskExecutor.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestBatchMessageModeConfigs.java b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestBatchMessageModeConfigs.java
index 2654aa9..4ffe7ad 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestBatchMessageModeConfigs.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestBatchMessageModeConfigs.java
@@ -20,6 +20,7 @@ package org.apache.helix.messaging.handling;
  */
 
 import java.util.concurrent.ThreadPoolExecutor;
+
 import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
 import org.apache.helix.messaging.DefaultMessagingService;
 import org.apache.helix.model.IdealState;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestConfigThreadpoolSize.java b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestConfigThreadpoolSize.java
index 98979c1..eee40e3 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestConfigThreadpoolSize.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestConfigThreadpoolSize.java
@@ -19,10 +19,11 @@ package org.apache.helix.messaging.handling;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.ThreadPoolExecutor;
+
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestHelixTaskExecutor.java b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestHelixTaskExecutor.java
index 23bab5d..91aefeb 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestHelixTaskExecutor.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestHelixTaskExecutor.java
@@ -19,7 +19,6 @@ package org.apache.helix.messaging.handling;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,6 +26,8 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
+
+import com.google.common.collect.ImmutableList;
 import org.apache.helix.HelixConstants;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java
index 9eeb6f5..b58e7c5 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PMessages.java b/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PMessages.java
index 72f110c..f21fb83 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PMessages.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PMessages.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executors;
+
 import org.apache.helix.HelixConstants;
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PMessagesAvoidDuplicatedMessage.java b/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PMessagesAvoidDuplicatedMessage.java
index 5d8be22..3a1ea0e 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PMessagesAvoidDuplicatedMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PMessagesAvoidDuplicatedMessage.java
@@ -22,10 +22,11 @@ package org.apache.helix.messaging.p2pMessage;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executors;
+
 import org.apache.helix.HelixConstants;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
 import org.apache.helix.controller.common.ResourcesStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.Pipeline;
 import org.apache.helix.controller.stages.AttributeName;
 import org.apache.helix.controller.stages.BaseStageTest;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PStateTransitionMessages.java b/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PStateTransitionMessages.java
index 44cb640..5b9cace 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PStateTransitionMessages.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PStateTransitionMessages.java
@@ -22,9 +22,10 @@ package org.apache.helix.messaging.p2pMessage;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executors;
+
 import org.apache.helix.HelixConstants;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.pipeline.Pipeline;
 import org.apache.helix.controller.stages.AttributeName;
 import org.apache.helix.controller.stages.BaseStageTest;
diff --git a/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PWithStateCancellationMessage.java b/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PWithStateCancellationMessage.java
index aa7f780..da28e2b 100644
--- a/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PWithStateCancellationMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/messaging/p2pMessage/TestP2PWithStateCancellationMessage.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
@@ -48,7 +49,8 @@ import org.apache.helix.model.ResourceConfig;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 
 public class TestP2PWithStateCancellationMessage extends BaseStageTest {
diff --git a/helix-core/src/test/java/org/apache/helix/mock/MockBaseDataAccessor.java b/helix-core/src/test/java/org/apache/helix/mock/MockBaseDataAccessor.java
index 8403b3b..f50cd83 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/MockBaseDataAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/MockBaseDataAccessor.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.I0Itec.zkclient.IZkChildListener;
 import org.I0Itec.zkclient.IZkDataListener;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/MockClusterMessagingService.java b/helix-core/src/test/java/org/apache/helix/mock/MockClusterMessagingService.java
index eefafe9..4c5690d 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/MockClusterMessagingService.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/MockClusterMessagingService.java
@@ -21,6 +21,7 @@ package org.apache.helix.mock;
 
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.ClusterMessagingService;
 import org.apache.helix.Criteria;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/MockHelixAdmin.java b/helix-core/src/test/java/org/apache/helix/mock/MockHelixAdmin.java
index 6cb7790..b299ab1 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/MockHelixAdmin.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/MockHelixAdmin.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixAdmin;
 import org.apache.helix.HelixDataAccessor;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/MockManager.java b/helix-core/src/test/java/org/apache/helix/mock/MockManager.java
index 5753781..bbe7d7b 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/MockManager.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/MockManager.java
@@ -21,6 +21,7 @@ package org.apache.helix.mock;
 
 import java.util.Set;
 import java.util.UUID;
+
 import org.apache.helix.ClusterMessagingService;
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixAdmin;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/MockZkClient.java b/helix-core/src/test/java/org/apache/helix/mock/MockZkClient.java
index 47428c6..b65c2dc 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/MockZkClient.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/MockZkClient.java
@@ -3,6 +3,7 @@ package org.apache.helix.mock;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.manager.zk.ZNRecordSerializer;
 import org.apache.helix.manager.zk.ZkAsyncCallbacks;
 import org.apache.helix.manager.zk.ZkClient;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/MockZkHelixDataAccessor.java b/helix-core/src/test/java/org/apache/helix/mock/MockZkHelixDataAccessor.java
index 0ea33c7..9b71ff2 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/MockZkHelixDataAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/MockZkHelixDataAccessor.java
@@ -3,6 +3,7 @@ package org.apache.helix.mock;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixProperty;
 import org.apache.helix.PropertyKey;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/controller/MockControllerProcess.java b/helix-core/src/test/java/org/apache/helix/mock/controller/MockControllerProcess.java
index dd7e749..0d0aa84 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/controller/MockControllerProcess.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/controller/MockControllerProcess.java
@@ -21,6 +21,7 @@ package org.apache.helix.mock.controller;
 
 import java.io.IOException;
 import java.util.ArrayList;
+
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 
diff --git a/helix-core/src/test/java/org/apache/helix/mock/participant/ErrTransition.java b/helix-core/src/test/java/org/apache/helix/mock/participant/ErrTransition.java
index cb87b2f..301cd62 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/participant/ErrTransition.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/participant/ErrTransition.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.Message;
 
diff --git a/helix-core/src/test/java/org/apache/helix/mock/participant/MockHelixTaskExecutor.java b/helix-core/src/test/java/org/apache/helix/mock/participant/MockHelixTaskExecutor.java
index 24b2453..2fad591 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/participant/MockHelixTaskExecutor.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/participant/MockHelixTaskExecutor.java
@@ -20,6 +20,7 @@ package org.apache.helix.mock.participant;
  */
 
 import java.util.concurrent.Future;
+
 import org.apache.helix.messaging.handling.HelixTaskExecutor;
 import org.apache.helix.messaging.handling.HelixTaskResult;
 import org.apache.helix.messaging.handling.MessageTask;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/spectator/MockSpectatorProcess.java b/helix-core/src/test/java/org/apache/helix/mock/spectator/MockSpectatorProcess.java
index cc365c8..60c0003 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/spectator/MockSpectatorProcess.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/spectator/MockSpectatorProcess.java
@@ -20,6 +20,7 @@ package org.apache.helix.mock.spectator;
  */
 
 import java.util.List;
+
 import org.I0Itec.zkclient.IDefaultNameSpace;
 import org.I0Itec.zkclient.ZkServer;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/statemodel/MockTaskStateModel.java b/helix-core/src/test/java/org/apache/helix/mock/statemodel/MockTaskStateModel.java
index 4960054..574d047 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/statemodel/MockTaskStateModel.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/statemodel/MockTaskStateModel.java
@@ -21,6 +21,7 @@ package org.apache.helix.mock.statemodel;
 
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.Message;
diff --git a/helix-core/src/test/java/org/apache/helix/mock/statemodel/MockTaskStateModelFactory.java b/helix-core/src/test/java/org/apache/helix/mock/statemodel/MockTaskStateModelFactory.java
index 23de456..83d63ef 100644
--- a/helix-core/src/test/java/org/apache/helix/mock/statemodel/MockTaskStateModelFactory.java
+++ b/helix-core/src/test/java/org/apache/helix/mock/statemodel/MockTaskStateModelFactory.java
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.participant.statemachine.StateModelFactory;
 import org.apache.helix.task.TaskFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/model/TestConstraint.java b/helix-core/src/test/java/org/apache/helix/model/TestConstraint.java
index 54ffbae..78df6d3 100644
--- a/helix-core/src/test/java/org/apache/helix/model/TestConstraint.java
+++ b/helix-core/src/test/java/org/apache/helix/model/TestConstraint.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
diff --git a/helix-core/src/test/java/org/apache/helix/model/TestIdealState.java b/helix-core/src/test/java/org/apache/helix/model/TestIdealState.java
index 78f7956..2045526 100644
--- a/helix-core/src/test/java/org/apache/helix/model/TestIdealState.java
+++ b/helix-core/src/test/java/org/apache/helix/model/TestIdealState.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.model.IdealState.IdealStateModeProperty;
 import org.apache.helix.model.IdealState.RebalanceMode;
diff --git a/helix-core/src/test/java/org/apache/helix/model/TestStateModelValidity.java b/helix-core/src/test/java/org/apache/helix/model/TestStateModelValidity.java
index efaf699..c3b8beb 100644
--- a/helix-core/src/test/java/org/apache/helix/model/TestStateModelValidity.java
+++ b/helix-core/src/test/java/org/apache/helix/model/TestStateModelValidity.java
@@ -19,11 +19,12 @@ package org.apache.helix.model;
  * under the License.
  */
 
-import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.Lists;
 import org.apache.helix.HelixDefinedState;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.model.StateModelDefinition.StateModelDefinitionProperty;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterEventStatusMonitor.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterEventStatusMonitor.java
index 7966f03..81dcb8e 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterEventStatusMonitor.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterEventStatusMonitor.java
@@ -32,6 +32,7 @@ import javax.management.MalformedObjectNameException;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import javax.management.ReflectionException;
+
 import org.apache.helix.controller.stages.BestPossibleStateCalcStage;
 import org.apache.helix.controller.stages.IntermediateStateCalcStage;
 import org.apache.helix.controller.stages.ReadClusterDataStage;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
index b952a06..6821d86 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
@@ -19,14 +19,14 @@ package org.apache.helix.monitoring;
  * under the License.
  */
 
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-import javax.management.Query;
-import javax.management.QueryExp;
 import java.lang.management.ManagementFactory;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
+import javax.management.Query;
+import javax.management.QueryExp;
 
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestParticipantMonitor.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestParticipantMonitor.java
index b3de72d..30b944a 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/TestParticipantMonitor.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestParticipantMonitor.java
@@ -19,6 +19,10 @@ package org.apache.helix.monitoring;
  * under the License.
  */
 
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
@@ -27,10 +31,6 @@ import javax.management.MBeanServerNotification;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
 
 import org.apache.helix.TestHelper;
 import org.apache.helix.monitoring.mbeans.ClusterMBeanObserver;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestWorkflowMonitor.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestWorkflowMonitor.java
index 978e574..6ee47d8 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/TestWorkflowMonitor.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestWorkflowMonitor.java
@@ -28,6 +28,7 @@ import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
+
 import org.apache.helix.monitoring.mbeans.MonitorDomainNames;
 import org.apache.helix.monitoring.mbeans.WorkflowMonitor;
 import org.apache.helix.task.TaskState;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestZKPathDataDumpTask.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestZKPathDataDumpTask.java
index d2daee3..8085a93 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/TestZKPathDataDumpTask.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestZKPathDataDumpTask.java
@@ -20,6 +20,7 @@ package org.apache.helix.monitoring;
  */
 
 import java.util.Date;
+
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
index ca7aad7..cd29be9 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
@@ -32,6 +32,7 @@ import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import javax.management.Query;
 import javax.management.QueryExp;
+
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterStatusMonitor.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterStatusMonitor.java
index b2daba6..e9eb4f3 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterStatusMonitor.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterStatusMonitor.java
@@ -19,7 +19,6 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import com.beust.jcommander.internal.Maps;
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Date;
@@ -31,6 +30,8 @@ import javax.management.InstanceNotFoundException;
 import javax.management.JMException;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
+
+import com.beust.jcommander.internal.Maps;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZNRecord;
 import org.apache.helix.controller.stages.BestPossibleStateOutput;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestDisableResourceMbean.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestDisableResourceMbean.java
index 0c8ebe7..b9ef04b 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestDisableResourceMbean.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestDisableResourceMbean.java
@@ -24,6 +24,7 @@ import java.util.Date;
 import javax.management.MBeanServerConnection;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkUnitTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestDropResourceMetricsReset.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestDropResourceMetricsReset.java
index cb2c6b2..4690b53 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestDropResourceMetricsReset.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestDropResourceMetricsReset.java
@@ -19,6 +19,15 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanServerConnection;
+import javax.management.MBeanServerNotification;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkUnitTestBase;
 import org.apache.helix.integration.manager.ClusterControllerManager;
@@ -29,15 +38,6 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerNotification;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 public class TestDropResourceMetricsReset extends ZkUnitTestBase {
   private CountDownLatch _registerLatch;
   private CountDownLatch _unregisterLatch;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestHelixCallbackMonitor.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestHelixCallbackMonitor.java
index 339f754..8758205 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestHelixCallbackMonitor.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestHelixCallbackMonitor.java
@@ -7,6 +7,7 @@ import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+
 import org.apache.helix.HelixConstants;
 import org.apache.helix.InstanceType;
 import org.testng.Assert;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestRebalancerMetrics.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestRebalancerMetrics.java
index f3e1119..b9f2dd9 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestRebalancerMetrics.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestRebalancerMetrics.java
@@ -3,9 +3,10 @@ package org.apache.helix.monitoring.mbeans;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
+
 import org.apache.helix.api.config.StateTransitionThrottleConfig;
-import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.common.PartitionStateMap;
+import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.stages.AttributeName;
 import org.apache.helix.controller.stages.BaseStageTest;
 import org.apache.helix.controller.stages.BestPossibleStateCalcStage;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java
index de5f67e..9d0f8f1 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResetClusterMetrics.java
@@ -24,6 +24,7 @@ import javax.management.InstanceNotFoundException;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+
 import org.apache.helix.TestHelper;
 import org.apache.helix.ZkUnitTestBase;
 import org.apache.helix.integration.manager.ClusterControllerManager;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResourceMonitor.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResourceMonitor.java
index f1223ec..18576dd 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResourceMonitor.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestResourceMonitor.java
@@ -27,6 +27,7 @@ import java.util.Random;
 import java.util.TreeMap;
 import javax.management.JMException;
 import javax.management.ObjectName;
+
 import org.apache.helix.ZNRecord;
 import org.apache.helix.model.BuiltInStateModelDefinitions;
 import org.apache.helix.model.ExternalView;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestRoutingTableProviderMonitor.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestRoutingTableProviderMonitor.java
index 1ab8713..f2b7631 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestRoutingTableProviderMonitor.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestRoutingTableProviderMonitor.java
@@ -1,16 +1,16 @@
 package org.apache.helix.monitoring.mbeans;
 
-import org.apache.helix.PropertyType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
+import java.lang.management.ManagementFactory;
+import java.util.HashSet;
+import java.util.Set;
 import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
-import java.lang.management.ManagementFactory;
-import java.util.HashSet;
-import java.util.Set;
+
+import org.apache.helix.PropertyType;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class TestRoutingTableProviderMonitor {
 
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestTaskPerformanceMetrics.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestTaskPerformanceMetrics.java
index 9581a41..23f6c4e 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestTaskPerformanceMetrics.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestTaskPerformanceMetrics.java
@@ -19,7 +19,6 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,6 +34,7 @@ import javax.management.ObjectName;
 import javax.management.Query;
 import javax.management.QueryExp;
 
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.TestHelper;
 import org.apache.helix.integration.manager.ClusterControllerManager;
 import org.apache.helix.integration.task.MockTask;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestTopStateHandoffMetrics.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestTopStateHandoffMetrics.java
index 811de1a..c549283 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestTopStateHandoffMetrics.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestTopStateHandoffMetrics.java
@@ -19,13 +19,14 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
-import com.google.common.collect.Range;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.Range;
 import org.apache.helix.HelixConstants;
 import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider;
 import org.apache.helix.controller.stages.AttributeName;
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestZkClientMonitor.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestZkClientMonitor.java
index 6d55f5b..22be0a5 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestZkClientMonitor.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestZkClientMonitor.java
@@ -19,11 +19,11 @@ package org.apache.helix.monitoring.mbeans;
  * under the License.
  */
 
+import java.lang.management.ManagementFactory;
 import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
-import java.lang.management.ManagementFactory;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/participant/MockZKHelixManager.java b/helix-core/src/test/java/org/apache/helix/participant/MockZKHelixManager.java
index 5fcb307..f22484e 100644
--- a/helix-core/src/test/java/org/apache/helix/participant/MockZKHelixManager.java
+++ b/helix-core/src/test/java/org/apache/helix/participant/MockZKHelixManager.java
@@ -21,6 +21,7 @@ package org.apache.helix.participant;
 
 import java.util.Set;
 import java.util.UUID;
+
 import org.apache.helix.ClusterMessagingService;
 import org.apache.helix.ConfigAccessor;
 import org.apache.helix.HelixAdmin;
diff --git a/helix-core/src/test/java/org/apache/helix/participant/statemachine/TestStateModelParser.java b/helix-core/src/test/java/org/apache/helix/participant/statemachine/TestStateModelParser.java
index 43a0ea2..ea770a8 100644
--- a/helix-core/src/test/java/org/apache/helix/participant/statemachine/TestStateModelParser.java
+++ b/helix-core/src/test/java/org/apache/helix/participant/statemachine/TestStateModelParser.java
@@ -20,6 +20,7 @@ package org.apache.helix.participant.statemachine;
  */
 
 import java.lang.reflect.Method;
+
 import org.apache.helix.NotificationContext;
 import org.apache.helix.model.Message;
 import org.slf4j.Logger;
diff --git a/helix-core/src/test/java/org/apache/helix/store/TestJsonComparator.java b/helix-core/src/test/java/org/apache/helix/store/TestJsonComparator.java
index 15a3ecd..5af3d55 100644
--- a/helix-core/src/test/java/org/apache/helix/store/TestJsonComparator.java
+++ b/helix-core/src/test/java/org/apache/helix/store/TestJsonComparator.java
@@ -20,6 +20,7 @@ package org.apache.helix.store;
  */
 
 import java.util.Date;
+
 import org.apache.helix.ZNRecord;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
diff --git a/helix-core/src/test/java/org/apache/helix/store/zk/TestAutoFallbackPropertyStore.java b/helix-core/src/test/java/org/apache/helix/store/zk/TestAutoFallbackPropertyStore.java
index 19aa70c..4b44cb1 100644
--- a/helix-core/src/test/java/org/apache/helix/store/zk/TestAutoFallbackPropertyStore.java
+++ b/helix-core/src/test/java/org/apache/helix/store/zk/TestAutoFallbackPropertyStore.java
@@ -22,6 +22,7 @@ package org.apache.helix.store.zk;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 import org.I0Itec.zkclient.DataUpdater;
 import org.apache.helix.AccessOption;
 import org.apache.helix.PropertyType;
diff --git a/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java b/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java
index 4a4ced9..8b882a7 100644
--- a/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java
+++ b/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java
@@ -30,6 +30,7 @@ import java.util.TreeMap;
 import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+
 import org.I0Itec.zkclient.exception.ZkNoNodeException;
 import org.I0Itec.zkclient.serialize.SerializableSerializer;
 import org.apache.helix.AccessOption;
diff --git a/helix-core/src/test/java/org/apache/helix/store/zk/TestZkManagerWithAutoFallbackStore.java b/helix-core/src/test/java/org/apache/helix/store/zk/TestZkManagerWithAutoFallbackStore.java
index eb2ead1..ed22835 100644
--- a/helix-core/src/test/java/org/apache/helix/store/zk/TestZkManagerWithAutoFallbackStore.java
+++ b/helix-core/src/test/java/org/apache/helix/store/zk/TestZkManagerWithAutoFallbackStore.java
@@ -20,6 +20,7 @@ package org.apache.helix.store.zk;
  */
 
 import java.util.Date;
+
 import org.apache.helix.AccessOption;
 import org.apache.helix.BaseDataAccessor;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java b/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java
index 39fe9f7..f90dd34 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestAssignableInstanceManager.java b/helix-core/src/test/java/org/apache/helix/task/TestAssignableInstanceManager.java
index b13b0fb..76197f7 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestAssignableInstanceManager.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestAssignableInstanceManager.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.helix.ZNRecord;
 import org.apache.helix.common.caches.TaskDataCache;
 import org.apache.helix.model.ClusterConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestAssignableInstanceManagerControllerSwitch.java b/helix-core/src/test/java/org/apache/helix/task/TestAssignableInstanceManagerControllerSwitch.java
index 1e8d17f..90dfe30 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestAssignableInstanceManagerControllerSwitch.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestAssignableInstanceManagerControllerSwitch.java
@@ -19,12 +19,13 @@ package org.apache.helix.task;
  * under the License.
  */
 
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.TestHelper;
 import org.apache.helix.common.caches.TaskDataCache;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestCleanExpiredJobs.java b/helix-core/src/test/java/org/apache/helix/task/TestCleanExpiredJobs.java
index 86f4467..17ef4fc 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestCleanExpiredJobs.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestCleanExpiredJobs.java
@@ -21,6 +21,7 @@ package org.apache.helix.task;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.TestHelper;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestDropTerminalTasksUponReset.java b/helix-core/src/test/java/org/apache/helix/task/TestDropTerminalTasksUponReset.java
index eff51d1..14ec6e7 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestDropTerminalTasksUponReset.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestDropTerminalTasksUponReset.java
@@ -25,13 +25,15 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+
 import org.apache.helix.controller.stages.CurrentStateOutput;
 import org.apache.helix.model.Partition;
 import org.apache.helix.model.ResourceAssignment;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class TestDropTerminalTasksUponReset {
 
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestGetLastScheduledTaskExecInfo.java b/helix-core/src/test/java/org/apache/helix/task/TestGetLastScheduledTaskExecInfo.java
index acbb7b8..4be4545 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestGetLastScheduledTaskExecInfo.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestGetLastScheduledTaskExecInfo.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+
 import org.apache.helix.integration.task.MockTask;
 import org.apache.helix.integration.task.TaskTestBase;
 import org.apache.helix.integration.task.TaskTestUtil;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestGetSetUserContentStore.java b/helix-core/src/test/java/org/apache/helix/task/TestGetSetUserContentStore.java
index 4a60a13..c8e0ce1 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestGetSetUserContentStore.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestGetSetUserContentStore.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
+
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
 import org.apache.helix.TestHelper;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestJobStateOnCreation.java b/helix-core/src/test/java/org/apache/helix/task/TestJobStateOnCreation.java
index c277afc..6d805f2 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestJobStateOnCreation.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestJobStateOnCreation.java
@@ -19,8 +19,9 @@ package org.apache.helix.task;
  * under the License.
  */
 
-import com.google.common.collect.Sets;
 import java.util.Map;
+
+import com.google.common.collect.Sets;
 import org.apache.helix.controller.dataproviders.WorkflowControllerDataProvider;
 import org.apache.helix.controller.stages.CurrentStateOutput;
 import org.apache.helix.integration.manager.MockParticipantManager;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java b/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java
index fffe1fd..69d3495 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java
@@ -20,6 +20,7 @@ package org.apache.helix.task;
  */
 
 import java.util.Map;
+
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.integration.manager.ClusterControllerManager;
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestTaskCreateThrottling.java b/helix-core/src/test/java/org/apache/helix/task/TestTaskCreateThrottling.java
index a107cce..3debc3e 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestTaskCreateThrottling.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestTaskCreateThrottling.java
@@ -21,6 +21,7 @@ package org.apache.helix.task;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.helix.HelixException;
 import org.apache.helix.integration.task.MockTask;
 import org.apache.helix.integration.task.TaskTestBase;
diff --git a/helix-core/src/test/java/org/apache/helix/task/assigner/AssignerTestBase.java b/helix-core/src/test/java/org/apache/helix/task/assigner/AssignerTestBase.java
index 7571bf8..4ac0b13 100644
--- a/helix-core/src/test/java/org/apache/helix/task/assigner/AssignerTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/task/assigner/AssignerTestBase.java
@@ -21,6 +21,7 @@ package org.apache.helix.task.assigner;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.LiveInstance;
 
diff --git a/helix-core/src/test/java/org/apache/helix/task/assigner/TestAssignableInstance.java b/helix-core/src/test/java/org/apache/helix/task/assigner/TestAssignableInstance.java
index ce2e1ad..0e8b1d0 100644
--- a/helix-core/src/test/java/org/apache/helix/task/assigner/TestAssignableInstance.java
+++ b/helix-core/src/test/java/org/apache/helix/task/assigner/TestAssignableInstance.java
@@ -21,6 +21,7 @@ package org.apache.helix.task.assigner;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.InstanceConfig;
 import org.apache.helix.model.LiveInstance;
diff --git a/helix-core/src/test/java/org/apache/helix/task/assigner/TestThreadCountBasedTaskAssigner.java b/helix-core/src/test/java/org/apache/helix/task/assigner/TestThreadCountBasedTaskAssigner.java
index 1a9065f..9fcba9f 100644
--- a/helix-core/src/test/java/org/apache/helix/task/assigner/TestThreadCountBasedTaskAssigner.java
+++ b/helix-core/src/test/java/org/apache/helix/task/assigner/TestThreadCountBasedTaskAssigner.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+
 import org.apache.helix.common.caches.TaskDataCache;
 import org.apache.helix.model.ClusterConfig;
 import org.apache.helix.model.InstanceConfig;
diff --git a/helix-core/src/test/java/org/apache/helix/tools/ClusterVerifiers/TestStrictMatchExternalViewVerifier.java b/helix-core/src/test/java/org/apache/helix/tools/ClusterVerifiers/TestStrictMatchExternalViewVerifier.java
index e88bb22..7a90504 100644
--- a/helix-core/src/test/java/org/apache/helix/tools/ClusterVerifiers/TestStrictMatchExternalViewVerifier.java
+++ b/helix-core/src/test/java/org/apache/helix/tools/ClusterVerifiers/TestStrictMatchExternalViewVerifier.java
@@ -22,6 +22,7 @@ package org.apache.helix.tools.ClusterVerifiers;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.helix.model.BuiltInStateModelDefinitions;
 import org.apache.helix.util.HelixUtil;
 import org.apache.helix.util.TestInputLoader;
diff --git a/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java b/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java
index 84d5f51..df3f341 100644
--- a/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java
+++ b/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java
@@ -21,6 +21,7 @@ package org.apache.helix.tools;
 
 import java.util.Arrays;
 import java.util.Date;
+
... 1151 lines suppressed ...


Mime
View raw message