You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by zz...@apache.org on 2013/08/21 22:43:18 UTC

[05/51] [partial] [HELIX-198] Unify helix code style, rb=13710

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-core/src/test/java/org/apache/helix/manager/zk/TestZNRecordSizeLimit.java
----------------------------------------------------------------------
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 158a705..286593a 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
@@ -40,14 +40,11 @@ import org.apache.log4j.Logger;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
-public class TestZNRecordSizeLimit extends ZkUnitTestBase
-{
+public class TestZNRecordSizeLimit extends ZkUnitTestBase {
   private static Logger LOG = Logger.getLogger(TestZNRecordSizeLimit.class);
 
   @Test
-  public void testZNRecordSizeLimitUseZNRecordSerializer()
-  {
+  public void testZNRecordSizeLimitUseZNRecordSerializer() {
     String className = getShortClassName();
     System.out.println("START testZNRecordSizeLimitUseZNRecordSerializer at "
         + new Date(System.currentTimeMillis()));
@@ -57,8 +54,7 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     zkClient.setZkSerializer(serializer);
     String root = className;
     byte[] buf = new byte[1024];
-    for (int i = 0; i < 1024; i++)
-    {
+    for (int i = 0; i < 1024; i++) {
       buf[i] = 'a';
     }
     String bufStr = new String(buf);
@@ -68,8 +64,7 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     // write a znode of size less than 1m
     final ZNRecord smallRecord = new ZNRecord("normalsize");
     smallRecord.getSimpleFields().clear();
-    for (int i = 0; i < 900; i++)
-    {
+    for (int i = 0; i < 900; i++) {
       smallRecord.setSimpleField(i + "", bufStr);
     }
 
@@ -84,19 +79,15 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     // prepare a znode of size larger than 1m
     final ZNRecord largeRecord = new ZNRecord("oversize");
     largeRecord.getSimpleFields().clear();
-    for (int i = 0; i < 1024; i++)
-    {
+    for (int i = 0; i < 1024; i++) {
       largeRecord.setSimpleField(i + "", bufStr);
     }
     String path2 = "/" + root + "/test2";
     zkClient.createPersistent(path2, true);
-    try
-    {
+    try {
       zkClient.writeData(path2, largeRecord);
       Assert.fail("Should fail because data size is larger than 1M");
-    }
-    catch (HelixException e)
-    {
+    } catch (HelixException e) {
       // OK
     }
     record = zkClient.readData(path2);
@@ -104,13 +95,10 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
 
     // oversized write doesn't overwrite existing data on zk
     record = zkClient.readData(path1);
-    try
-    {
+    try {
       zkClient.writeData(path1, largeRecord);
       Assert.fail("Should fail because data size is larger than 1M");
-    }
-    catch (HelixException e)
-    {
+    } catch (HelixException e) {
       // OK
     }
     ZNRecord recordNew = zkClient.readData(path1);
@@ -134,16 +122,14 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     idealState.setRebalanceMode(RebalanceMode.SEMI_AUTO);
     idealState.setNumPartitions(10);
 
-    for (int i = 0; i < 1024; i++)
-    {
+    for (int i = 0; i < 1024; i++) {
       idealState.getRecord().setSimpleField(i + "", bufStr);
     }
     boolean succeed = accessor.setProperty(keyBuilder.idealStates("TestDB0"), idealState);
     Assert.assertFalse(succeed);
     HelixProperty property =
-        accessor.getProperty(keyBuilder.stateTransitionStatus("localhost_12918",
-                                                              "session_1",
-                                                              "partition_1"));
+        accessor.getProperty(keyBuilder.stateTransitionStatus("localhost_12918", "session_1",
+            "partition_1"));
     Assert.assertNull(property);
 
     // legal sized data gets written to zk
@@ -152,14 +138,12 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     idealState.setRebalanceMode(RebalanceMode.SEMI_AUTO);
     idealState.setNumPartitions(10);
 
-    for (int i = 0; i < 900; i++)
-    {
+    for (int i = 0; i < 900; i++) {
       idealState.getRecord().setSimpleField(i + "", bufStr);
     }
     succeed = accessor.setProperty(keyBuilder.idealStates("TestDB1"), idealState);
     Assert.assertTrue(succeed);
-    record =
-        accessor.getProperty(keyBuilder.idealStates("TestDB1")).getRecord();
+    record = accessor.getProperty(keyBuilder.idealStates("TestDB1")).getRecord();
     Assert.assertTrue(serializer.serialize(record).length > 900 * 1024);
 
     // oversized data should not update existing data on zk
@@ -167,16 +151,13 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     idealState.setStateModelDefRef("MasterSlave");
     idealState.setRebalanceMode(RebalanceMode.SEMI_AUTO);
     idealState.setNumPartitions(10);
-    for (int i = 900; i < 1024; i++)
-    {
+    for (int i = 900; i < 1024; i++) {
       idealState.getRecord().setSimpleField(i + "", bufStr);
     }
     // System.out.println("record: " + idealState.getRecord());
-    succeed =
-        accessor.updateProperty(keyBuilder.idealStates("TestDB1"), idealState);
+    succeed = accessor.updateProperty(keyBuilder.idealStates("TestDB1"), idealState);
     Assert.assertFalse(succeed);
-    recordNew =
-        accessor.getProperty(keyBuilder.idealStates("TestDB1")).getRecord();
+    recordNew = accessor.getProperty(keyBuilder.idealStates("TestDB1")).getRecord();
     arr = serializer.serialize(record);
     arrNew = serializer.serialize(recordNew);
     Assert.assertTrue(Arrays.equals(arr, arrNew));
@@ -186,8 +167,7 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
   }
 
   @Test
-  public void testZNRecordSizeLimitUseZNRecordStreamingSerializer()
-  {
+  public void testZNRecordSizeLimitUseZNRecordStreamingSerializer() {
     String className = getShortClassName();
     System.out.println("START testZNRecordSizeLimitUseZNRecordStreamingSerializer at "
         + new Date(System.currentTimeMillis()));
@@ -197,8 +177,7 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     zkClient.setZkSerializer(serializer);
     String root = className;
     byte[] buf = new byte[1024];
-    for (int i = 0; i < 1024; i++)
-    {
+    for (int i = 0; i < 1024; i++) {
       buf[i] = 'a';
     }
     String bufStr = new String(buf);
@@ -208,8 +187,7 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     // write a znode of size less than 1m
     final ZNRecord smallRecord = new ZNRecord("normalsize");
     smallRecord.getSimpleFields().clear();
-    for (int i = 0; i < 900; i++)
-    {
+    for (int i = 0; i < 900; i++) {
       smallRecord.setSimpleField(i + "", bufStr);
     }
 
@@ -224,19 +202,15 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     // prepare a znode of size larger than 1m
     final ZNRecord largeRecord = new ZNRecord("oversize");
     largeRecord.getSimpleFields().clear();
-    for (int i = 0; i < 1024; i++)
-    {
+    for (int i = 0; i < 1024; i++) {
       largeRecord.setSimpleField(i + "", bufStr);
     }
     String path2 = "/" + root + "/test2";
     zkClient.createPersistent(path2, true);
-    try
-    {
+    try {
       zkClient.writeData(path2, largeRecord);
       Assert.fail("Should fail because data size is larger than 1M");
-    }
-    catch (HelixException e)
-    {
+    } catch (HelixException e) {
       // OK
     }
     record = zkClient.readData(path2);
@@ -244,13 +218,10 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
 
     // oversized write doesn't overwrite existing data on zk
     record = zkClient.readData(path1);
-    try
-    {
+    try {
       zkClient.writeData(path1, largeRecord);
       Assert.fail("Should fail because data size is larger than 1M");
-    }
-    catch (HelixException e)
-    {
+    } catch (HelixException e) {
       // OK
     }
     ZNRecord recordNew = zkClient.readData(path1);
@@ -269,22 +240,18 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
         new ZKHelixDataAccessor(className, new ZkBaseDataAccessor(zkClient));
     Builder keyBuilder = accessor.keyBuilder();
 
-//    ZNRecord statusUpdates = new ZNRecord("statusUpdates");
+    // ZNRecord statusUpdates = new ZNRecord("statusUpdates");
     IdealState idealState = new IdealState("currentState");
     idealState.setStateModelDefRef("MasterSlave");
     idealState.setRebalanceMode(RebalanceMode.SEMI_AUTO);
     idealState.setNumPartitions(10);
 
-    for (int i = 0; i < 1024; i++)
-    {
+    for (int i = 0; i < 1024; i++) {
       idealState.getRecord().setSimpleField(i + "", bufStr);
     }
-    boolean succeed =
-        accessor.setProperty(keyBuilder.idealStates("TestDB_1"),
-                                                              idealState);
+    boolean succeed = accessor.setProperty(keyBuilder.idealStates("TestDB_1"), idealState);
     Assert.assertFalse(succeed);
-    HelixProperty property =
-        accessor.getProperty(keyBuilder.idealStates("TestDB_1"));
+    HelixProperty property = accessor.getProperty(keyBuilder.idealStates("TestDB_1"));
     Assert.assertNull(property);
 
     // legal sized data gets written to zk
@@ -293,16 +260,12 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     idealState.setRebalanceMode(RebalanceMode.SEMI_AUTO);
     idealState.setNumPartitions(10);
 
-    for (int i = 0; i < 900; i++)
-    {
+    for (int i = 0; i < 900; i++) {
       idealState.getRecord().setSimpleField(i + "", bufStr);
     }
-    succeed =
-        accessor.setProperty(keyBuilder.idealStates("TestDB_2"),
-                                                              idealState);
+    succeed = accessor.setProperty(keyBuilder.idealStates("TestDB_2"), idealState);
     Assert.assertTrue(succeed);
-    record =
-        accessor.getProperty(keyBuilder.idealStates("TestDB_2")).getRecord();
+    record = accessor.getProperty(keyBuilder.idealStates("TestDB_2")).getRecord();
     Assert.assertTrue(serializer.serialize(record).length > 900 * 1024);
 
     // oversized data should not update existing data on zk
@@ -311,17 +274,13 @@ public class TestZNRecordSizeLimit extends ZkUnitTestBase
     idealState.setRebalanceMode(RebalanceMode.SEMI_AUTO);
     idealState.setNumPartitions(10);
 
-    for (int i = 900; i < 1024; i++)
-    {
+    for (int i = 900; i < 1024; i++) {
       idealState.getRecord().setSimpleField(i + "", bufStr);
     }
     // System.out.println("record: " + idealState.getRecord());
-    succeed =
-        accessor.updateProperty(keyBuilder.idealStates("TestDB_2"),
-                                                                 idealState);
+    succeed = accessor.updateProperty(keyBuilder.idealStates("TestDB_2"), idealState);
     Assert.assertFalse(succeed);
-    recordNew =
-        accessor.getProperty(keyBuilder.idealStates("TestDB_2")).getRecord();
+    recordNew = accessor.getProperty(keyBuilder.idealStates("TestDB_2")).getRecord();
     arr = serializer.serialize(record);
     arrNew = serializer.serialize(recordNew);
     Assert.assertTrue(Arrays.equals(arr, arrNew));

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java
index b120105..133fb4e 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java
@@ -41,63 +41,58 @@ import org.apache.zookeeper.data.Stat;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
-public class TestZkBaseDataAccessor extends ZkUnitTestBase
-{
+public class TestZkBaseDataAccessor extends ZkUnitTestBase {
 
   @Test
-  public void testSyncSet()
-  {
+  public void testSyncSet() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s", testName, "msg_0");
     ZNRecord record = new ZNRecord("msg_0");
     BaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
-    
+
     boolean success = accessor.set(path, record, AccessOption.PERSISTENT);
     Assert.assertTrue(success);
     ZNRecord getRecord = _gZkClient.readData(path);
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(getRecord.getId(), "msg_0");
-    
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
 
   }
-  
+
   @Test
-  public void testSyncSetWithVersion()
-  {
+  public void testSyncSetWithVersion() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s", testName, "msg_0");
     ZNRecord record = new ZNRecord("msg_0");
     BaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
-    
+
     // set persistent
     boolean success = accessor.set(path, record, 0, AccessOption.PERSISTENT);
     Assert.assertFalse(success, "Should fail since version not match");
     try {
       _gZkClient.readData(path, false);
       Assert.fail("Should get no node exception");
-    } catch (Exception e)
-    {
+    } catch (Exception e) {
       // OK
     }
-    
+
     success = accessor.set(path, record, -1, AccessOption.PERSISTENT);
     Assert.assertTrue(success);
     ZNRecord getRecord = _gZkClient.readData(path);
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(getRecord.getId(), "msg_0");
-    
+
     // set ephemeral
     path = String.format("/%s/%s", testName, "msg_1");
     record = new ZNRecord("msg_1");
@@ -106,18 +101,16 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     try {
       _gZkClient.readData(path, false);
       Assert.fail("Should get no node exception");
-    } catch (Exception e)
-    {
+    } catch (Exception e) {
       // OK
     }
-    
+
     success = accessor.set(path, record, -1, AccessOption.EPHEMERAL);
     Assert.assertTrue(success);
     getRecord = _gZkClient.readData(path);
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(getRecord.getId(), "msg_1");
-    
-    
+
     record.setSimpleField("key0", "value0");
     success = accessor.set(path, record, 0, AccessOption.PERSISTENT);
     Assert.assertTrue(success, "Should pass. AccessOption.PERSISTENT is ignored");
@@ -126,19 +119,18 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     Assert.assertEquals(getRecord.getSimpleFields().size(), 1);
     Assert.assertNotNull(getRecord.getSimpleField("key0"));
     Assert.assertEquals(getRecord.getSimpleField("key0"), "value0");
-    
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
   }
-  
+
   @Test
-  public void testSyncDoSet()
-  {
+  public void testSyncDoSet() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s/%s", testName, "msg_0", "submsg_0");
     ZNRecord record = new ZNRecord("submsg_0");
     ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
@@ -149,29 +141,28 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     Assert.assertTrue(result._pathCreated.contains(String.format("/%s", testName)));
     Assert.assertTrue(result._pathCreated.contains(String.format("/%s/%s", testName, "msg_0")));
     Assert.assertTrue(result._pathCreated.contains(path));
-    
+
     Assert.assertTrue(_gZkClient.exists(String.format("/%s", testName)));
     Assert.assertTrue(_gZkClient.exists(String.format("/%s/%s", testName, "msg_0")));
     ZNRecord getRecord = _gZkClient.readData(path);
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(getRecord.getId(), "submsg_0");
-    
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
   }
-  
+
   @Test
-  public void testSyncCreate()
-  {
+  public void testSyncCreate() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s", testName, "msg_0");
     ZNRecord record = new ZNRecord("msg_0");
     ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
-    
+
     boolean success = accessor.create(path, record, AccessOption.PERSISTENT);
     Assert.assertTrue(success);
     ZNRecord getRecord = _gZkClient.readData(path);
@@ -184,23 +175,22 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     getRecord = _gZkClient.readData(path);
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(getRecord.getSimpleFields().size(), 0);
-    
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
   }
-  
+
   @Test
-  public void testSyncUpdate()
-  {
+  public void testSyncUpdate() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s", testName, "msg_0");
     ZNRecord record = new ZNRecord("msg_0");
     ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
-    
+
     boolean success = accessor.update(path, new ZNRecordUpdater(record), AccessOption.PERSISTENT);
     Assert.assertTrue(success);
     ZNRecord getRecord = _gZkClient.readData(path);
@@ -215,14 +205,12 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     Assert.assertEquals(getRecord.getSimpleFields().size(), 1);
     Assert.assertNotNull(getRecord.getSimpleField("key0"));
     Assert.assertEquals(getRecord.getSimpleField("key0"), "value0");
-    
+
     // test throw exception from updater
-    success = accessor.update(path, new DataUpdater<ZNRecord>()
-    {
+    success = accessor.update(path, new DataUpdater<ZNRecord>() {
 
       @Override
-      public ZNRecord update(ZNRecord currentData)
-      {
+      public ZNRecord update(ZNRecord currentData) {
         throw new RuntimeException("IGNORABLE: test throw exception from updater");
       }
     }, AccessOption.PERSISTENT);
@@ -230,26 +218,25 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     getRecord = _gZkClient.readData(path);
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(getRecord.getSimpleFields().size(), 1);
-    
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
   }
-  
+
   @Test
-  public void testSyncRemove()
-  {
+  public void testSyncRemove() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s", testName, "msg_0");
     ZNRecord record = new ZNRecord("msg_0");
     ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
-    
+
     boolean success = accessor.remove(path, 0);
     Assert.assertFalse(success);
-    
+
     success = accessor.create(path, record, AccessOption.PERSISTENT);
     Assert.assertTrue(success);
     ZNRecord getRecord = _gZkClient.readData(path);
@@ -259,35 +246,33 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     success = accessor.remove(path, 0);
     Assert.assertTrue(success);
     Assert.assertFalse(_gZkClient.exists(path));
-    
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
   }
-  
+
   @Test
-  public void testSyncGet()
-  {
+  public void testSyncGet() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s", testName, "msg_0");
     ZNRecord record = new ZNRecord("msg_0");
     ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
-    
+
     Stat stat = new Stat();
     ZNRecord getRecord = accessor.get(path, stat, 0);
     Assert.assertNull(getRecord);
-    
+
     try {
       accessor.get(path, stat, AccessOption.THROW_EXCEPTION_IFNOTEXIST);
       Assert.fail("Should throw exception if not exist");
-    } catch (Exception e)
-    {
+    } catch (Exception e) {
       // OK
     }
-    
+
     boolean success = accessor.create(path, record, AccessOption.PERSISTENT);
     Assert.assertTrue(success);
 
@@ -295,23 +280,23 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(getRecord.getId(), "msg_0");
     Assert.assertEquals(stat.getVersion(), 0);
-    
+
     record.setSimpleField("key0", "value0");
     success = accessor.set(path, record, AccessOption.PERSISTENT);
     Assert.assertTrue(success);
-    
+
     getRecord = accessor.get(path, stat, 0);
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(record.getSimpleFields().size(), 1);
     Assert.assertNotNull(getRecord.getSimpleField("key0"));
     Assert.assertEquals(getRecord.getSimpleField("key0"), "value0");
     Assert.assertEquals(stat.getVersion(), 1);
-    
+
     ZNRecord newRecord = new ZNRecord("msg_0");
     newRecord.setSimpleField("key1", "value1");
     success = accessor.update(path, new ZNRecordUpdater(newRecord), AccessOption.PERSISTENT);
     Assert.assertTrue(success);
-    
+
     getRecord = accessor.get(path, stat, 0);
     Assert.assertNotNull(getRecord);
     Assert.assertEquals(getRecord.getSimpleFields().size(), 2);
@@ -320,68 +305,66 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     Assert.assertNotNull(getRecord.getSimpleField("key1"));
     Assert.assertEquals(getRecord.getSimpleField("key1"), "value1");
     Assert.assertEquals(stat.getVersion(), 2);
-    
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
   }
-  
+
   @Test
-  public void testSyncExist()
-  {
+  public void testSyncExist() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s", testName, "msg_0");
     ZNRecord record = new ZNRecord("msg_0");
     ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
-    
+
     boolean success = accessor.exists(path, 0);
     Assert.assertFalse(success);
-    
+
     success = accessor.create(path, record, AccessOption.EPHEMERAL);
     Assert.assertTrue(success);
-    
+
     success = accessor.exists(path, 0);
     Assert.assertTrue(success);
-    
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
 
   }
-  
+
   @Test
-  public void testSyncGetStat()
-  {
+  public void testSyncGetStat() {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String testName = className + "_" + methodName;
 
     System.out.println("START " + testName + " at " + new Date(System.currentTimeMillis()));
-    
+
     String path = String.format("/%s/%s", testName, "msg_0");
     ZNRecord record = new ZNRecord("msg_0");
     ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
-    
+
     Stat stat = accessor.getStat(path, 0);
     Assert.assertNull(stat);
-    
+
     boolean success = accessor.create(path, record, AccessOption.EPHEMERAL);
     Assert.assertTrue(success);
-    
+
     stat = accessor.getStat(path, 0);
     Assert.assertNotNull(stat);
     Assert.assertEquals(stat.getVersion(), 0);
     Assert.assertNotSame(stat.getEphemeralOwner(), 0);
-   
+
     System.out.println("END " + testName + " at " + new Date(System.currentTimeMillis()));
 
   }
-  
+
   @Test
-  public void testAsyncZkBaseDataAccessor()
-  {
-    System.out.println("START TestZkBaseDataAccessor.async at " + new Date(System.currentTimeMillis()));
+  public void testAsyncZkBaseDataAccessor() {
+    System.out.println("START TestZkBaseDataAccessor.async at "
+        + new Date(System.currentTimeMillis()));
 
     String root = "TestZkBaseDataAccessor_asyn";
     ZkClient zkClient = new ZkClient(ZK_ADDR);
@@ -389,27 +372,24 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     zkClient.deleteRecursive("/" + root);
 
     ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(zkClient);
-    
+
     // test async createChildren
     String parentPath = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1");
     List<ZNRecord> records = new ArrayList<ZNRecord>();
-    List<String> paths = new  ArrayList<String>();
-    for (int i = 0; i < 10; i++)
-    {
+    List<String> paths = new ArrayList<String>();
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
-      paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1",msgId));
+      paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId));
       records.add(new ZNRecord(msgId));
     }
     boolean[] success = accessor.createChildren(paths, records, AccessOption.PERSISTENT);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       Assert.assertTrue(success[i], "Should succeed in create " + msgId);
     }
 
     // test get what we created
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       String path = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId);
       ZNRecord record = zkClient.readData(path);
@@ -419,56 +399,50 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     // test async setChildren
     parentPath = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1");
     records = new ArrayList<ZNRecord>();
-    paths = new  ArrayList<String>();
-    for (int i = 0; i < 10; i++)
-    {
+    paths = new ArrayList<String>();
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
-      paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1",msgId));
+      paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId));
       ZNRecord newRecord = new ZNRecord(msgId);
       newRecord.setSimpleField("key1", "value1");
       records.add(newRecord);
     }
     success = accessor.setChildren(paths, records, AccessOption.PERSISTENT);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       Assert.assertTrue(success[i], "Should succeed in set " + msgId);
     }
 
     // test get what we set
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       String path = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId);
       ZNRecord record = zkClient.readData(path);
       Assert.assertEquals(record.getSimpleFields().size(), 1, "Should have 1 simple field set");
       Assert.assertEquals(record.getSimpleField("key1"), "value1", "Should have value1 set");
     }
-    
+
     // test async updateChildren
     parentPath = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1");
-//    records = new ArrayList<ZNRecord>();
+    // records = new ArrayList<ZNRecord>();
     List<DataUpdater<ZNRecord>> znrecordUpdaters = new ArrayList<DataUpdater<ZNRecord>>();
     paths = new ArrayList<String>();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
-      paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1",msgId));
+      paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId));
       ZNRecord newRecord = new ZNRecord(msgId);
       newRecord.setSimpleField("key2", "value2");
-//      records.add(newRecord);
+      // records.add(newRecord);
       znrecordUpdaters.add(new ZNRecordUpdater(newRecord));
     }
     success = accessor.updateChildren(paths, znrecordUpdaters, AccessOption.PERSISTENT);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       Assert.assertTrue(success[i], "Should succeed in update " + msgId);
     }
 
     // test get what we updated
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       String path = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId);
       ZNRecord record = zkClient.readData(path);
@@ -479,8 +453,7 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     // test async getChildren
     parentPath = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1");
     records = accessor.getChildren(parentPath, null, 0);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       ZNRecord record = records.get(i);
       Assert.assertEquals(record.getId(), msgId, "Should get what we updated");
@@ -491,14 +464,12 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     // test async exists
     parentPath = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1");
     paths = new ArrayList<String>();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId));
     }
     boolean[] exists = accessor.exists(paths, 0);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       Assert.assertTrue(exists[i], "Should exist " + msgId);
     }
@@ -506,37 +477,33 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     // test async getStats
     parentPath = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1");
     paths = new ArrayList<String>();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId));
     }
     Stat[] stats = accessor.getStats(paths, 0);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       Assert.assertNotNull(stats[i], "Stat should exist for " + msgId);
-      Assert.assertEquals(stats[i].getVersion(), 2, "DataVersion should be 2, since we set 1 and update 1 for " + msgId);
+      Assert.assertEquals(stats[i].getVersion(), 2,
+          "DataVersion should be 2, since we set 1 and update 1 for " + msgId);
     }
 
     // test async remove
     parentPath = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1");
     paths = new ArrayList<String>();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       paths.add(PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId));
     }
     success = accessor.remove(paths, 0);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       Assert.assertTrue(success[i], "Should succeed in remove " + msgId);
     }
-    
+
     // test get what we removed
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String msgId = "msg_" + i;
       String path = PropertyPathConfig.getPath(PropertyType.MESSAGES, root, "host_1", msgId);
       boolean pathExists = zkClient.exists(path);
@@ -544,7 +511,8 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase
     }
 
     zkClient.close();
-    System.out.println("END TestZkBaseDataAccessor.async at " + new Date(System.currentTimeMillis()));
+    System.out.println("END TestZkBaseDataAccessor.async at "
+        + new Date(System.currentTimeMillis()));
   }
- 
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheAsyncOpSingleThread.java
----------------------------------------------------------------------
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 9205282..e2c503b 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
@@ -39,34 +39,25 @@ import org.apache.helix.manager.zk.ZkClient;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
-public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
-{
+public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase {
   @Test
-  public void testHappyPathExtOpZkCacheBaseDataAccessor() throws Exception
-  {
+  public void testHappyPathExtOpZkCacheBaseDataAccessor() throws Exception {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String clusterName = className + "_" + methodName;
-    System.out.println("START " + clusterName + " at "
-        + new Date(System.currentTimeMillis()));
+    System.out.println("START " + clusterName + " at " + new Date(System.currentTimeMillis()));
 
     // init external base data accessor
     ZkClient extZkclient = new ZkClient(ZK_ADDR);
     extZkclient.setZkSerializer(new ZNRecordSerializer());
-    ZkBaseDataAccessor<ZNRecord> extBaseAccessor =
-        new ZkBaseDataAccessor<ZNRecord>(extZkclient);
+    ZkBaseDataAccessor<ZNRecord> extBaseAccessor = new ZkBaseDataAccessor<ZNRecord>(extZkclient);
 
     // init zkCacheBaseDataAccessor
     String curStatePath =
-        PropertyPathConfig.getPath(PropertyType.CURRENTSTATES,
-                                   clusterName,
-                                   "localhost_8901");
-    String extViewPath =
-        PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName);
+        PropertyPathConfig.getPath(PropertyType.CURRENTSTATES, clusterName, "localhost_8901");
+    String extViewPath = PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName);
 
-    ZkBaseDataAccessor<ZNRecord> baseAccessor =
-        new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
+    ZkBaseDataAccessor<ZNRecord> baseAccessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
 
     extBaseAccessor.create(curStatePath, null, AccessOption.PERSISTENT);
 
@@ -76,23 +67,16 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
 
     // TestHelper.printCache(accessor._zkCache);
     boolean ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 true);
+        TestHelper.verifyZkCache(zkCacheInitPaths, accessor._zkCache._cache, _gZkClient, true);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
 
     // create 10 current states using external base accessor
     List<String> paths = new ArrayList<String>();
     List<ZNRecord> records = new ArrayList<ZNRecord>();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path =
-          PropertyPathConfig.getPath(PropertyType.CURRENTSTATES,
-                                     clusterName,
-                                     "localhost_8901",
-                                     "session_0",
-                                     "TestDB" + i);
+          PropertyPathConfig.getPath(PropertyType.CURRENTSTATES, clusterName, "localhost_8901",
+              "session_0", "TestDB" + i);
       ZNRecord record = new ZNRecord("TestDB" + i);
 
       paths.add(path);
@@ -100,37 +84,29 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
     }
 
     boolean[] success = extBaseAccessor.createChildren(paths, records, AccessOption.PERSISTENT);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       Assert.assertTrue(success[i], "Should succeed in create: " + paths.get(i));
     }
 
     // wait zkEventThread update zkCache
     // verify wtCache
-    for (int i = 0; i < 10; i++)
-    {
-        // TestHelper.printCache(accessor._zkCache);
-    	ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 true);
-    	if (ret == true)
-    		break;
-        Thread.sleep(100);
+    for (int i = 0; i < 10; i++) {
+      // TestHelper.printCache(accessor._zkCache);
+      ret = TestHelper.verifyZkCache(zkCacheInitPaths, accessor._zkCache._cache, _gZkClient, true);
+      if (ret == true)
+        break;
+      Thread.sleep(100);
     }
-    
+
     // System.out.println("ret: " + ret);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
 
     // update each current state 10 times by external base accessor
     List<DataUpdater<ZNRecord>> updaters = new ArrayList<DataUpdater<ZNRecord>>();
-    for (int j = 0; j < 10; j++)
-    {
+    for (int j = 0; j < 10; j++) {
       paths.clear();
       updaters.clear();
-      for (int i = 0; i < 10; i++)
-      {
+      for (int i = 0; i < 10; i++) {
         String path = curStatePath + "/session_0/TestDB" + i;
         ZNRecord newRecord = new ZNRecord("TestDB" + i);
         newRecord.setSimpleField("" + j, "" + j);
@@ -140,8 +116,7 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
       }
       success = extBaseAccessor.updateChildren(paths, updaters, AccessOption.PERSISTENT);
 
-      for (int i = 0; i < 10; i++)
-      {
+      for (int i = 0; i < 10; i++) {
         Assert.assertTrue(success[i], "Should succeed in update: " + paths.get(i));
       }
     }
@@ -151,18 +126,13 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
 
     // verify cache
     // TestHelper.printCache(accessor._zkCache);
-    ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 true);
+    ret = TestHelper.verifyZkCache(zkCacheInitPaths, accessor._zkCache._cache, _gZkClient, true);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
 
     // set 10 external views by external accessor
     paths.clear();
     records.clear();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path =
           PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName, "TestDB" + i);
       ZNRecord record = new ZNRecord("TestDB" + i);
@@ -171,8 +141,7 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
       records.add(record);
     }
     success = extBaseAccessor.setChildren(paths, records, AccessOption.PERSISTENT);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       Assert.assertTrue(success[i], "Should succeed in set: " + paths.get(i));
     }
 
@@ -181,25 +150,19 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
 
     // verify cache
     // TestHelper.printCache(accessor._zkCache._cache);
-    ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 true);
+    ret = TestHelper.verifyZkCache(zkCacheInitPaths, accessor._zkCache._cache, _gZkClient, true);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
 
     // remove 10 external views by external accessor
     paths.clear();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path =
           PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName, "TestDB" + i);
 
       paths.add(path);
     }
     success = extBaseAccessor.remove(paths, 0);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       Assert.assertTrue(success[i], "Should succeed in remove: " + paths.get(i));
     }
 
@@ -208,39 +171,28 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
 
     // verify cache
     // TestHelper.printCache(accessor._zkCache._cache);
-    ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 true);
+    ret = TestHelper.verifyZkCache(zkCacheInitPaths, accessor._zkCache._cache, _gZkClient, true);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
 
     // clean up
     extZkclient.close();
-    System.out.println("END " + clusterName + " at "
-        + new Date(System.currentTimeMillis()));
+    System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
 
   }
 
   @Test
-  public void testHappyPathSelfOpZkCacheBaseDataAccessor() throws Exception
-  {
+  public void testHappyPathSelfOpZkCacheBaseDataAccessor() throws Exception {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String clusterName = className + "_" + methodName;
-    System.out.println("START " + clusterName + " at "
-        + new Date(System.currentTimeMillis()));
+    System.out.println("START " + clusterName + " at " + new Date(System.currentTimeMillis()));
 
     // init zkCacheDataAccessor
     String curStatePath =
-        PropertyPathConfig.getPath(PropertyType.CURRENTSTATES,
-                                   clusterName,
-                                   "localhost_8901");
-    String extViewPath =
-        PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName);
+        PropertyPathConfig.getPath(PropertyType.CURRENTSTATES, clusterName, "localhost_8901");
+    String extViewPath = PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName);
 
-    ZkBaseDataAccessor<ZNRecord> baseAccessor =
-        new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
+    ZkBaseDataAccessor<ZNRecord> baseAccessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
 
     baseAccessor.create(curStatePath, null, AccessOption.PERSISTENT);
 
@@ -250,23 +202,16 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
 
     // TestHelper.printCache(accessor._zkCache._cache);
     boolean ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 true);
+        TestHelper.verifyZkCache(zkCacheInitPaths, accessor._zkCache._cache, _gZkClient, true);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
 
     // create 10 current states using this accessor
     List<String> paths = new ArrayList<String>();
     List<ZNRecord> records = new ArrayList<ZNRecord>();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path =
-          PropertyPathConfig.getPath(PropertyType.CURRENTSTATES,
-                                     clusterName,
-                                     "localhost_8901",
-                                     "session_0",
-                                     "TestDB" + i);
+          PropertyPathConfig.getPath(PropertyType.CURRENTSTATES, clusterName, "localhost_8901",
+              "session_0", "TestDB" + i);
       ZNRecord record = new ZNRecord("TestDB" + i);
 
       paths.add(path);
@@ -274,28 +219,21 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
     }
 
     boolean[] success = accessor.createChildren(paths, records, AccessOption.PERSISTENT);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       Assert.assertTrue(success[i], "Should succeed in create: " + paths.get(i));
     }
 
     // verify cache
-//    TestHelper.printCache(accessor._zkCache._cache);
-    ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 false);
+    // TestHelper.printCache(accessor._zkCache._cache);
+    ret = TestHelper.verifyZkCache(zkCacheInitPaths, accessor._zkCache._cache, _gZkClient, false);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
 
     // update each current state 10 times by this accessor
     List<DataUpdater<ZNRecord>> updaters = new ArrayList<DataUpdater<ZNRecord>>();
-    for (int j = 0; j < 10; j++)
-    {
+    for (int j = 0; j < 10; j++) {
       paths.clear();
       updaters.clear();
-      for (int i = 0; i < 10; i++)
-      {
+      for (int i = 0; i < 10; i++) {
         String path = curStatePath + "/session_0/TestDB" + i;
         ZNRecord newRecord = new ZNRecord("TestDB" + i);
         newRecord.setSimpleField("" + j, "" + j);
@@ -305,8 +243,7 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
       }
       success = accessor.updateChildren(paths, updaters, AccessOption.PERSISTENT);
 
-      for (int i = 0; i < 10; i++)
-      {
+      for (int i = 0; i < 10; i++) {
         Assert.assertTrue(success[i], "Should succeed in update: " + paths.get(i));
       }
     }
@@ -314,11 +251,8 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
     // verify cache
     // TestHelper.printCache(accessor._zkCache._cache);
     ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 true);
+        TestHelper.verifyZkCache(zkCacheInitPaths, zkCacheInitPaths, accessor._zkCache._cache,
+            _gZkClient, true);
     // ret = TestHelper.verifyZkCache(zkCacheInitPaths, accessor, _gZkClient, true);
     // System.out.println("ret: " + ret);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
@@ -326,13 +260,10 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
     // set 10 external views 10 times by this accessor
     paths.clear();
     records.clear();
-    for (int j = 0; j < 10; j++)
-    {
-      for (int i = 0; i < 10; i++)
-      {
+    for (int j = 0; j < 10; j++) {
+      for (int i = 0; i < 10; i++) {
         String path =
-            PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName, "TestDB"
-                + i);
+            PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName, "TestDB" + i);
         ZNRecord record = new ZNRecord("TestDB" + i);
         record.setSimpleField("setKey", "" + j);
 
@@ -340,49 +271,40 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
         records.add(record);
       }
       success = accessor.setChildren(paths, records, AccessOption.PERSISTENT);
-      for (int i = 0; i < 10; i++)
-      {
+      for (int i = 0; i < 10; i++) {
         Assert.assertTrue(success[i], "Should succeed in set: " + paths.get(i));
       }
     }
 
     // verify cache
     // TestHelper.printCache(accessor._zkCache._cache);
-    ret =
-        TestHelper.verifyZkCache(zkCacheInitPaths,
-                                 accessor._zkCache._cache,
-                                 _gZkClient,
-                                 true);
+    ret = TestHelper.verifyZkCache(zkCacheInitPaths, accessor._zkCache._cache, _gZkClient, true);
     // System.out.println("ret: " + ret);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
 
     // get 10 external views
     paths.clear();
     records.clear();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path = extViewPath + "/TestDB" + i;
       paths.add(path);
     }
 
     records = accessor.get(paths, null, 0);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       Assert.assertEquals(records.get(i).getId(), "TestDB" + i);
     }
 
     // getChildren
     records.clear();
     records = accessor.getChildren(extViewPath, null, 0);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       Assert.assertEquals(records.get(i).getId(), "TestDB" + i);
     }
 
     // // exists
     paths.clear();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path = curStatePath + "/session_0/TestDB" + i;
       // // PropertyPathConfig.getPath(PropertyType.CURRENTSTATES,
       // // clusterName,
@@ -392,13 +314,11 @@ public class TestZkCacheAsyncOpSingleThread extends ZkUnitTestBase
       paths.add(path);
     }
     success = accessor.exists(paths, 0);
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       Assert.assertTrue(success[i], "Should exits: " + paths.get(i));
     }
 
-    System.out.println("END " + clusterName + " at "
-        + new Date(System.currentTimeMillis()));
+    System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
 
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheSyncOpSingleThread.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheSyncOpSingleThread.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheSyncOpSingleThread.java
index 975446b..251234f 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheSyncOpSingleThread.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkCacheSyncOpSingleThread.java
@@ -44,38 +44,31 @@ import org.apache.helix.store.HelixPropertyListener;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
-public class TestZkCacheSyncOpSingleThread extends ZkUnitTestBase
-{
-  class TestListener implements HelixPropertyListener
-  {
+public class TestZkCacheSyncOpSingleThread extends ZkUnitTestBase {
+  class TestListener implements HelixPropertyListener {
     ConcurrentLinkedQueue<String> _deletePathQueue = new ConcurrentLinkedQueue<String>();
     ConcurrentLinkedQueue<String> _createPathQueue = new ConcurrentLinkedQueue<String>();
     ConcurrentLinkedQueue<String> _changePathQueue = new ConcurrentLinkedQueue<String>();
 
     @Override
-    public void onDataDelete(String path)
-    {
+    public void onDataDelete(String path) {
       // System.out.println(Thread.currentThread().getName() + ", onDelete: " + path);
-    	_deletePathQueue.add(path);
+      _deletePathQueue.add(path);
     }
 
     @Override
-    public void onDataCreate(String path)
-    {
+    public void onDataCreate(String path) {
       // System.out.println(Thread.currentThread().getName() + ", onCreate: " + path);
-    	_createPathQueue.add(path);
+      _createPathQueue.add(path);
     }
 
     @Override
-    public void onDataChange(String path)
-    {
+    public void onDataChange(String path) {
       // System.out.println(Thread.currentThread().getName() + ", onChange: " + path);
-    	_changePathQueue.add(path);
+      _changePathQueue.add(path);
     }
 
-    public void reset()
-    {
+    public void reset() {
       _deletePathQueue.clear();
       _createPathQueue.clear();
       _changePathQueue.clear();
@@ -83,30 +76,23 @@ public class TestZkCacheSyncOpSingleThread extends ZkUnitTestBase
   }
 
   @Test
-  public void testZkCacheCallbackExternalOpNoChroot() throws Exception
-  {
+  public void testZkCacheCallbackExternalOpNoChroot() throws Exception {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     String clusterName = className + "_" + methodName;
-    System.out.println("START " + clusterName + " at "
-        + new Date(System.currentTimeMillis()));
+    System.out.println("START " + clusterName + " at " + new Date(System.currentTimeMillis()));
 
     // init external base data accessor
     ZkClient zkclient = new ZkClient(ZK_ADDR);
     zkclient.setZkSerializer(new ZNRecordSerializer());
-    ZkBaseDataAccessor<ZNRecord> extBaseAccessor =
-        new ZkBaseDataAccessor<ZNRecord>(zkclient);
+    ZkBaseDataAccessor<ZNRecord> extBaseAccessor = new ZkBaseDataAccessor<ZNRecord>(zkclient);
 
     // init zkCacheDataAccessor
     String curStatePath =
-        PropertyPathConfig.getPath(PropertyType.CURRENTSTATES,
-                                   clusterName,
-                                   "localhost_8901");
-    String extViewPath =
-        PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName);
+        PropertyPathConfig.getPath(PropertyType.CURRENTSTATES, clusterName, "localhost_8901");
+    String extViewPath = PropertyPathConfig.getPath(PropertyType.EXTERNALVIEW, clusterName);
 
-    ZkBaseDataAccessor<ZNRecord> baseAccessor =
-        new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
+    ZkBaseDataAccessor<ZNRecord> baseAccessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
 
     extBaseAccessor.create(curStatePath, null, AccessOption.PERSISTENT);
 
@@ -120,14 +106,11 @@ public class TestZkCacheSyncOpSingleThread extends ZkUnitTestBase
 
     // create 10 current states
     List<String> createPaths = new ArrayList<String>();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path = curStatePath + "/session_0/TestDB" + i;
       createPaths.add(path);
       boolean success =
-          extBaseAccessor.create(path,
-                                 new ZNRecord("TestDB" + i),
-                                 AccessOption.PERSISTENT);
+          extBaseAccessor.create(path, new ZNRecord("TestDB" + i), AccessOption.PERSISTENT);
       Assert.assertTrue(success, "Should succeed in create: " + path);
     }
 
@@ -135,14 +118,11 @@ public class TestZkCacheSyncOpSingleThread extends ZkUnitTestBase
 
     // verify cache
     // TestHelper.printCache(accessor._zkCache._cache);
-    boolean ret =
-        TestHelper.verifyZkCache(cachePaths, accessor._zkCache._cache, _gZkClient, true);
+    boolean ret = TestHelper.verifyZkCache(cachePaths, accessor._zkCache._cache, _gZkClient, true);
     // System.out.println("ret: " + ret);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
     System.out.println("createCnt: " + listener._createPathQueue.size());
-    Assert.assertEquals(listener._createPathQueue.size(),
-                        11,
-                        "Shall get 11 onCreate callbacks.");
+    Assert.assertEquals(listener._createPathQueue.size(), 11, "Shall get 11 onCreate callbacks.");
 
     // verify each callback path
     createPaths.add(curStatePath + "/session_0");
@@ -150,19 +130,15 @@ public class TestZkCacheSyncOpSingleThread extends ZkUnitTestBase
     Collections.sort(createPaths);
     Collections.sort(createCallbackPaths);
     // System.out.println("createCallbackPaths: " + createCallbackPaths);
-    Assert.assertEquals(createCallbackPaths,
-                        createPaths,
-                        "Should get create callbacks at " + createPaths + ", but was "
-                            + createCallbackPaths);
+    Assert.assertEquals(createCallbackPaths, createPaths, "Should get create callbacks at "
+        + createPaths + ", but was " + createCallbackPaths);
 
     // update each current state, single thread
     List<String> updatePaths = new ArrayList<String>();
     listener.reset();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path = curStatePath + "/session_0/TestDB" + i;
-      for (int j = 0; j < 10; j++)
-      {
+      for (int j = 0; j < 10; j++) {
         updatePaths.add(path);
         ZNRecord newRecord = new ZNRecord("TestDB" + i);
         newRecord.setSimpleField("" + j, "" + j);
@@ -175,29 +151,23 @@ public class TestZkCacheSyncOpSingleThread extends ZkUnitTestBase
 
     // verify cache
     // TestHelper.printCache(accessor._zkCache._cache);
-    ret =
-        TestHelper.verifyZkCache(cachePaths, accessor._zkCache._cache, _gZkClient, true);
+    ret = TestHelper.verifyZkCache(cachePaths, accessor._zkCache._cache, _gZkClient, true);
     // System.out.println("ret: " + ret);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
     System.out.println("changeCnt: " + listener._changePathQueue.size());
-    Assert.assertEquals(listener._changePathQueue.size(),
-                        100,
-                        "Shall get 100 onChange callbacks.");
+    Assert.assertEquals(listener._changePathQueue.size(), 100, "Shall get 100 onChange callbacks.");
 
     // verify each callback path
     List<String> updateCallbackPaths = new ArrayList<String>(listener._changePathQueue);
     Collections.sort(updatePaths);
     Collections.sort(updateCallbackPaths);
-    Assert.assertEquals(updateCallbackPaths,
-                        updatePaths,
-                        "Should get change callbacks at " + updatePaths + ", but was "
-                            + updateCallbackPaths);
+    Assert.assertEquals(updateCallbackPaths, updatePaths, "Should get change callbacks at "
+        + updatePaths + ", but was " + updateCallbackPaths);
 
     // remove 10 current states
     TreeSet<String> removePaths = new TreeSet<String>();
     listener.reset();
-    for (int i = 0; i < 10; i++)
-    {
+    for (int i = 0; i < 10; i++) {
       String path = curStatePath + "/session_0/TestDB" + i;
       removePaths.add(path);
       boolean success = accessor.remove(path, AccessOption.PERSISTENT);
@@ -207,22 +177,18 @@ public class TestZkCacheSyncOpSingleThread extends ZkUnitTestBase
 
     // verify cache
     // TestHelper.printCache(accessor._zkCache._cache);
-    ret =
-        TestHelper.verifyZkCache(cachePaths, accessor._zkCache._cache, _gZkClient, true);
+    ret = TestHelper.verifyZkCache(cachePaths, accessor._zkCache._cache, _gZkClient, true);
     // System.out.println("ret: " + ret);
     Assert.assertTrue(ret, "zkCache doesn't match data on Zk");
     System.out.println("deleteCnt: " + listener._deletePathQueue.size());
     Assert.assertTrue(listener._deletePathQueue.size() >= 10,
-                        "Shall get at least 10 onDelete callbacks.");
+        "Shall get at least 10 onDelete callbacks.");
 
     // verify each callback path
     Set<String> removeCallbackPaths = new TreeSet<String>(listener._deletePathQueue);
-    Assert.assertEquals(removeCallbackPaths,
-                        removePaths,
-                        "Should get remove callbacks at " + removePaths + ", but was "
-                            + removeCallbackPaths);
+    Assert.assertEquals(removeCallbackPaths, removePaths, "Should get remove callbacks at "
+        + removePaths + ", but was " + removeCallbackPaths);
 
-    System.out.println("END " + clusterName + " at "
-        + new Date(System.currentTimeMillis()));
+    System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/f414aad4/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
----------------------------------------------------------------------
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 1de664f..7809711 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
@@ -52,32 +52,26 @@ import org.testng.Assert;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
-
-public class TestZkClusterManager extends ZkUnitTestBase
-{
+public class TestZkClusterManager extends ZkUnitTestBase {
   final String className = getShortClassName();
 
   @Test()
-  public void testController() throws Exception
-  {
-    System.out.println("START " + className + ".testController() at " + new Date(System.currentTimeMillis()));
+  public void testController() throws Exception {
+    System.out.println("START " + className + ".testController() at "
+        + new Date(System.currentTimeMillis()));
     final String clusterName = CLUSTER_PREFIX + "_" + className + "_controller";
 
     // basic test
-    if (_gZkClient.exists("/" + clusterName))
-    {
+    if (_gZkClient.exists("/" + clusterName)) {
       _gZkClient.deleteRecursive("/" + clusterName);
     }
 
-    ZKHelixManager controller = new ZKHelixManager(clusterName, null,
-                                                   InstanceType.CONTROLLER,
-                                                   ZK_ADDR);
-    try
-    {
+    ZKHelixManager controller =
+        new ZKHelixManager(clusterName, null, InstanceType.CONTROLLER, ZK_ADDR);
+    try {
       controller.connect();
       Assert.fail("Should throw HelixException if initial cluster structure is not setup");
-    } catch (HelixException e)
-    {
+    } catch (HelixException e) {
       // OK
     }
 
@@ -91,12 +85,10 @@ public class TestZkClusterManager extends ZkUnitTestBase
     MockListener listener = new MockListener();
     listener.reset();
 
-    try
-    {
+    try {
       controller.addControllerListener(null);
       Assert.fail("Should throw HelixException");
-    } catch (HelixException e)
-    {
+    } catch (HelixException e) {
       // OK
     }
 
@@ -110,7 +102,7 @@ public class TestZkClusterManager extends ZkUnitTestBase
     int options = 0;
     store.set("/node_1", record, AccessOption.PERSISTENT);
     Stat stat = new Stat();
-    record = store.get("/node_1",stat, options);
+    record = store.get("/node_1", stat, options);
     AssertJUnit.assertEquals("node_1", record.getId());
 
     controller.getMessagingService();
@@ -121,24 +113,24 @@ public class TestZkClusterManager extends ZkUnitTestBase
     controller.disconnect();
     AssertJUnit.assertFalse(controller.isConnected());
 
-    System.out.println("END " + className + ".testController() at " + new Date(System.currentTimeMillis()));
+    System.out.println("END " + className + ".testController() at "
+        + new Date(System.currentTimeMillis()));
   }
-  
+
   @Test
-  public void testLiveInstanceInfoProvider() throws Exception
-  {
-    System.out.println("START " + className + ".testLiveInstanceInfoProvider() at " + new Date(System.currentTimeMillis()));
+  public void testLiveInstanceInfoProvider() throws Exception {
+    System.out.println("START " + className + ".testLiveInstanceInfoProvider() at "
+        + new Date(System.currentTimeMillis()));
     final String clusterName = CLUSTER_PREFIX + "_" + className + "_liveInstanceInfoProvider";
-    class provider implements LiveInstanceInfoProvider
-    {
+    class provider implements LiveInstanceInfoProvider {
       boolean _flag = false;
-      public provider(boolean genSessionId)
-      {
+
+      public provider(boolean genSessionId) {
         _flag = genSessionId;
       }
+
       @Override
-      public ZNRecord getAdditionalLiveInstanceInfo()
-      {
+      public ZNRecord getAdditionalLiveInstanceInfo() {
         ZNRecord record = new ZNRecord("info");
         record.setSimpleField("simple", "value");
         List<String> listFieldVal = new ArrayList<String>();
@@ -146,13 +138,12 @@ public class TestZkClusterManager extends ZkUnitTestBase
         listFieldVal.add("val2");
         listFieldVal.add("val3");
         record.setListField("list", listFieldVal);
-        Map<String,String> mapFieldVal = new HashMap<String, String>();
+        Map<String, String> mapFieldVal = new HashMap<String, String>();
         mapFieldVal.put("k1", "val1");
-        mapFieldVal.put("k2","val2");
-        mapFieldVal.put("k3","val3");
+        mapFieldVal.put("k2", "val2");
+        mapFieldVal.put("k3", "val3");
         record.setMapField("map", mapFieldVal);
-        if(_flag)
-        {
+        if (_flag) {
           record.setSimpleField("SESSION_ID", "value");
           record.setSimpleField("LIVE_INSTANCE", "value");
           record.setSimpleField("Others", "value");
@@ -160,62 +151,58 @@ public class TestZkClusterManager extends ZkUnitTestBase
         return record;
       }
     }
-    
-    
+
     TestHelper.setupEmptyCluster(_gZkClient, clusterName);
-    int[] ids = {0,1,2,3, 4, 5};
+    int[] ids = {
+        0, 1, 2, 3, 4, 5
+    };
     setupInstances(clusterName, ids);
 
-    /////////////////////
-    ZKHelixManager manager = new ZKHelixManager(clusterName, "localhost_0",
-        InstanceType.PARTICIPANT,
-        ZK_ADDR);
+    // ///////////////////
+    ZKHelixManager manager =
+        new ZKHelixManager(clusterName, "localhost_0", InstanceType.PARTICIPANT, ZK_ADDR);
     manager.connect();
     HelixDataAccessor accessor = manager.getHelixDataAccessor();
-    
-    LiveInstance liveInstance = accessor.getProperty(accessor.keyBuilder().liveInstance("localhost_0"));
+
+    LiveInstance liveInstance =
+        accessor.getProperty(accessor.keyBuilder().liveInstance("localhost_0"));
     Assert.assertTrue(liveInstance.getRecord().getListFields().size() == 0);
     Assert.assertTrue(liveInstance.getRecord().getMapFields().size() == 0);
     Assert.assertTrue(liveInstance.getRecord().getSimpleFields().size() == 3);
-    
-    manager = new ZKHelixManager(clusterName, "localhost_1",
-        InstanceType.PARTICIPANT,
-        ZK_ADDR);
+
+    manager = new ZKHelixManager(clusterName, "localhost_1", InstanceType.PARTICIPANT, ZK_ADDR);
     manager.setLiveInstanceInfoProvider(new provider(false));
-    
+
     manager.connect();
     accessor = manager.getHelixDataAccessor();
-    
+
     liveInstance = accessor.getProperty(accessor.keyBuilder().liveInstance("localhost_1"));
     Assert.assertTrue(liveInstance.getRecord().getListFields().size() == 1);
     Assert.assertTrue(liveInstance.getRecord().getMapFields().size() == 1);
     Assert.assertTrue(liveInstance.getRecord().getSimpleFields().size() == 4);
-    
-    manager = new ZKHelixManager(clusterName, "localhost_2",
-        InstanceType.PARTICIPANT,
-        ZK_ADDR);
+
+    manager = new ZKHelixManager(clusterName, "localhost_2", InstanceType.PARTICIPANT, ZK_ADDR);
     manager.setLiveInstanceInfoProvider(new provider(true));
-    
+
     manager.connect();
     accessor = manager.getHelixDataAccessor();
-    
+
     liveInstance = accessor.getProperty(accessor.keyBuilder().liveInstance("localhost_2"));
     Assert.assertTrue(liveInstance.getRecord().getListFields().size() == 1);
     Assert.assertTrue(liveInstance.getRecord().getMapFields().size() == 1);
     Assert.assertTrue(liveInstance.getRecord().getSimpleFields().size() == 5);
     Assert.assertFalse(liveInstance.getSessionId().equals("value"));
     Assert.assertFalse(liveInstance.getLiveInstance().equals("value"));
-    
-    ////////////////////////////////////
-    
-    ZkHelixTestManager manager2 = new ZkHelixTestManager(clusterName, "localhost_3",
-        InstanceType.PARTICIPANT,
-        ZK_ADDR);
+
+    // //////////////////////////////////
+
+    ZkHelixTestManager manager2 =
+        new ZkHelixTestManager(clusterName, "localhost_3", InstanceType.PARTICIPANT, ZK_ADDR);
     manager2.setLiveInstanceInfoProvider(new provider(true));
-    
+
     manager2.connect();
     accessor = manager2.getHelixDataAccessor();
-    
+
     liveInstance = accessor.getProperty(accessor.keyBuilder().liveInstance("localhost_3"));
     Assert.assertTrue(liveInstance.getRecord().getListFields().size() == 1);
     Assert.assertTrue(liveInstance.getRecord().getMapFields().size() == 1);
@@ -223,10 +210,10 @@ public class TestZkClusterManager extends ZkUnitTestBase
     Assert.assertFalse(liveInstance.getSessionId().equals("value"));
     Assert.assertFalse(liveInstance.getLiveInstance().equals("value"));
     String sessionId = liveInstance.getSessionId();
-    
+
     ZkTestHelper.expireSession(manager2.getZkClient());
     Thread.sleep(1000);
-    
+
     liveInstance = accessor.getProperty(accessor.keyBuilder().liveInstance("localhost_3"));
     Assert.assertTrue(liveInstance.getRecord().getListFields().size() == 1);
     Assert.assertTrue(liveInstance.getRecord().getMapFields().size() == 1);
@@ -235,24 +222,23 @@ public class TestZkClusterManager extends ZkUnitTestBase
     Assert.assertFalse(liveInstance.getLiveInstance().equals("value"));
     Assert.assertFalse(sessionId.equals(liveInstance.getSessionId()));
 
-    System.out.println("END " + className + ".testLiveInstanceInfoProvider() at " + new Date(System.currentTimeMillis()));
+    System.out.println("END " + className + ".testLiveInstanceInfoProvider() at "
+        + new Date(System.currentTimeMillis()));
   }
 
   @Test()
-  public void testAdministrator() throws Exception
-  {
-    System.out.println("START " + className + ".testAdministrator() at " + new Date(System.currentTimeMillis()));
+  public void testAdministrator() throws Exception {
+    System.out.println("START " + className + ".testAdministrator() at "
+        + new Date(System.currentTimeMillis()));
     final String clusterName = CLUSTER_PREFIX + "_" + className + "_admin";
 
     // basic test
-    if (_gZkClient.exists("/" + clusterName))
-    {
+    if (_gZkClient.exists("/" + clusterName)) {
       _gZkClient.deleteRecursive("/" + clusterName);
     }
 
-    ZKHelixManager admin = new ZKHelixManager(clusterName, null,
-                                              InstanceType.ADMINISTRATOR,
-                                              ZK_ADDR);
+    ZKHelixManager admin =
+        new ZKHelixManager(clusterName, null, InstanceType.ADMINISTRATOR, ZK_ADDR);
 
     TestHelper.setupEmptyCluster(_gZkClient, clusterName);
 
@@ -260,13 +246,11 @@ public class TestZkClusterManager extends ZkUnitTestBase
     AssertJUnit.assertTrue(admin.isConnected());
 
     HelixAdmin adminTool = admin.getClusterManagmentTool();
-//    ConfigScope scope = new ConfigScopeBuilder().forCluster(clusterName)
-//        .forResource("testResource").forPartition("testPartition").build();
-    HelixConfigScope scope = new HelixConfigScopeBuilder(ConfigScopeProperty.PARTITION)
-                                      .forCluster(clusterName)
-                                      .forResource("testResource")
-                                      .forPartition("testPartition")
-                                      .build();
+    // ConfigScope scope = new ConfigScopeBuilder().forCluster(clusterName)
+    // .forResource("testResource").forPartition("testPartition").build();
+    HelixConfigScope scope =
+        new HelixConfigScopeBuilder(ConfigScopeProperty.PARTITION).forCluster(clusterName)
+            .forResource("testResource").forPartition("testPartition").build();
 
     Map<String, String> properties = new HashMap<String, String>();
     properties.put("pKey1", "pValue1");
@@ -281,6 +265,7 @@ public class TestZkClusterManager extends ZkUnitTestBase
     admin.disconnect();
     AssertJUnit.assertFalse(admin.isConnected());
 
-    System.out.println("END " + className + ".testAdministrator() at " + new Date(System.currentTimeMillis()));
+    System.out.println("END " + className + ".testAdministrator() at "
+        + new Date(System.currentTimeMillis()));
   }
 }