ZOOKEEPER-1200. Remove obsolete DataTreeBuilder (Thomas Koch via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1190043 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -83,6 +83,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1252. remove unused method o.a.z.test.AxyncTest.restart()
   (Thomas Koch via phunt)
 
+  ZOOKEEPER-1200. Remove obsolete DataTreeBuilder
+  (Thomas Koch via phunt)
+
 Release 3.4.0 - 
 
 Non-backward compatible changes:

src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java

@@ -79,20 +79,6 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
     protected ZooKeeperServerBean jmxServerBean;
     protected DataTreeBean jmxDataTreeBean;
 
-
-    /**
-     * The server delegates loading of the tree to an instance of the interface
-     */
-    public interface DataTreeBuilder {
-        public DataTree build();
-    }
-
-    static public class BasicDataTreeBuilder implements DataTreeBuilder {
-        public DataTree build() {
-            return new DataTree();
-        }
-    }
-
     public static final int DEFAULT_TICK_TIME = 3000;
     protected int tickTime = DEFAULT_TICK_TIME;
     /** value of -1 indicates unset, use default */
@@ -146,8 +132,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
      * @param dataDir the directory to put the data
      */
     public ZooKeeperServer(FileTxnSnapLog txnLogFactory, int tickTime,
-            int minSessionTimeout, int maxSessionTimeout,
-            DataTreeBuilder treeBuilder, ZKDatabase zkDb) {
+            int minSessionTimeout, int maxSessionTimeout, ZKDatabase zkDb) {
         serverStats = new ServerStats(this);
         this.txnLogFactory = txnLogFactory;
         this.zkDb = zkDb;
@@ -169,10 +154,8 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
      * @param treeBuilder the datatree builder
      * @throws IOException
      */
-    public ZooKeeperServer(FileTxnSnapLog txnLogFactory, int tickTime,
-            DataTreeBuilder treeBuilder) throws IOException {
-        this(txnLogFactory, tickTime, -1, -1, treeBuilder,
-                new ZKDatabase(txnLogFactory));
+    public ZooKeeperServer(FileTxnSnapLog txnLogFactory, int tickTime) throws IOException {
+        this(txnLogFactory, tickTime, -1, -1, new ZKDatabase(txnLogFactory));
     }
 
     public ServerStats serverStats() {
@@ -207,7 +190,7 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
     public ZooKeeperServer(File snapDir, File logDir, int tickTime)
             throws IOException {
         this( new FileTxnSnapLog(snapDir, logDir),
-                tickTime, new BasicDataTreeBuilder());
+                tickTime);
     }
 
     /**
@@ -215,12 +198,10 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
      *
      * @throws IOException
      */
-    public ZooKeeperServer(FileTxnSnapLog txnLogFactory,
-            DataTreeBuilder treeBuilder)
+    public ZooKeeperServer(FileTxnSnapLog txnLogFactory)
         throws IOException
     {
-        this(txnLogFactory, DEFAULT_TICK_TIME, -1, -1, treeBuilder,
-                new ZKDatabase(txnLogFactory));
+        this(txnLogFactory, DEFAULT_TICK_TIME, -1, -1, new ZKDatabase(txnLogFactory));
     }
 
     /**

src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java

@@ -97,13 +97,9 @@ public class ZooKeeperServerMain {
             // so rather than spawning another thread, we will just call
             // run() in this thread.
             // create a file logger url from the command line args
-            ZooKeeperServer zkServer = new ZooKeeperServer();
+            ZooKeeperServer zkServer = new ZooKeeperServer( new FileTxnSnapLog(config.dataLogDir, config.dataDir),
+                    config.tickTime, config.minSessionTimeout, config.maxSessionTimeout, null);
 
-            FileTxnSnapLog ftxn = new FileTxnSnapLog(config.dataLogDir, config.dataDir);
-            zkServer.setTxnLogFactory(ftxn);
-            zkServer.setTickTime(config.tickTime);
-            zkServer.setMinSessionTimeout(config.minSessionTimeout);
-            zkServer.setMaxSessionTimeout(config.maxSessionTimeout);
             cnxnFactory = ServerCnxnFactory.createFactory();
             cnxnFactory.configure(config.getClientPortAddress(),
                     config.getMaxClientCnxns());

src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java

@@ -59,9 +59,9 @@ public class FollowerZooKeeperServer extends LearnerZooKeeperServer {
      * @throws IOException
      */
     FollowerZooKeeperServer(FileTxnSnapLog logFactory,QuorumPeer self,
-            DataTreeBuilder treeBuilder, ZKDatabase zkDb) throws IOException {
+            ZKDatabase zkDb) throws IOException {
         super(logFactory, self.tickTime, self.minSessionTimeout,
-                self.maxSessionTimeout, treeBuilder, zkDb, self);
+                self.maxSessionTimeout, zkDb, self);
         this.pendingSyncs = new ConcurrentLinkedQueue<Request>();
     }
 

src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java

@@ -46,10 +46,8 @@ public class LeaderZooKeeperServer extends QuorumZooKeeperServer {
      * @param dataDir
      * @throws IOException
      */
-    LeaderZooKeeperServer(FileTxnSnapLog logFactory, QuorumPeer self,
-            DataTreeBuilder treeBuilder, ZKDatabase zkDb) throws IOException {
-        super(logFactory, self.tickTime, self.minSessionTimeout,
-                self.maxSessionTimeout, treeBuilder, zkDb, self);
+    LeaderZooKeeperServer(FileTxnSnapLog logFactory, QuorumPeer self, ZKDatabase zkDb) throws IOException {
+        super(logFactory, self.tickTime, self.minSessionTimeout, self.maxSessionTimeout, zkDb, self);
     }
 
     public Leader getLeader(){

src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java

@@ -33,11 +33,10 @@ import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
 public abstract class LearnerZooKeeperServer extends QuorumZooKeeperServer {    
     public LearnerZooKeeperServer(FileTxnSnapLog logFactory, int tickTime,
             int minSessionTimeout, int maxSessionTimeout,
-            DataTreeBuilder treeBuilder, ZKDatabase zkDb, QuorumPeer self)
+            ZKDatabase zkDb, QuorumPeer self)
         throws IOException
     {
-        super(logFactory, tickTime, minSessionTimeout, maxSessionTimeout,
-                treeBuilder, zkDb, self);
+        super(logFactory, tickTime, minSessionTimeout, maxSessionTimeout, zkDb, self);
     }
 
     /**

src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java

@@ -49,11 +49,9 @@ public class ObserverZooKeeperServer extends LearnerZooKeeperServer {
      */
     ConcurrentLinkedQueue<Request> pendingSyncs = 
         new ConcurrentLinkedQueue<Request>();
-        
-    ObserverZooKeeperServer(FileTxnSnapLog logFactory, QuorumPeer self,
-            DataTreeBuilder treeBuilder, ZKDatabase zkDb) throws IOException {
-        super(logFactory, self.tickTime, self.minSessionTimeout,
-                self.maxSessionTimeout, treeBuilder, zkDb, self);
+
+    ObserverZooKeeperServer(FileTxnSnapLog logFactory, QuorumPeer self, ZKDatabase zkDb) throws IOException {
+        super(logFactory, self.tickTime, self.minSessionTimeout, self.maxSessionTimeout, zkDb, self);
     }
     
     public Observer getObserver() {

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

@@ -549,18 +549,15 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
     public Observer observer;
 
     protected Follower makeFollower(FileTxnSnapLog logFactory) throws IOException {
-        return new Follower(this, new FollowerZooKeeperServer(logFactory,
-                this,new ZooKeeperServer.BasicDataTreeBuilder(), this.zkDb));
+        return new Follower(this, new FollowerZooKeeperServer(logFactory, this, this.zkDb));
     }
 
     protected Leader makeLeader(FileTxnSnapLog logFactory) throws IOException {
-        return new Leader(this, new LeaderZooKeeperServer(logFactory,
-                this,new ZooKeeperServer.BasicDataTreeBuilder(), this.zkDb));
+        return new Leader(this, new LeaderZooKeeperServer(logFactory, this, this.zkDb));
     }
 
     protected Observer makeObserver(FileTxnSnapLog logFactory) throws IOException {
-        return new Observer(this, new ObserverZooKeeperServer(logFactory,
-                this, new ZooKeeperServer.BasicDataTreeBuilder(), this.zkDb));
+        return new Observer(this, new ObserverZooKeeperServer(logFactory, this, this.zkDb));
     }
 
     @SuppressWarnings("deprecation")
@@ -668,10 +665,7 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
                     LOG.info("LOOKING");
 
                     // Create read-only server but don't start it immediately
-                    final ReadOnlyZooKeeperServer roZk = new ReadOnlyZooKeeperServer(
-                            logFactory, this,
-                            new ZooKeeperServer.BasicDataTreeBuilder(),
-                            this.zkDb);
+                    final ReadOnlyZooKeeperServer roZk = new ReadOnlyZooKeeperServer(logFactory, this, this.zkDb);
 
                     // Instead of starting roZk immediately, wait some grace
                     // period before we decide we're partitioned.

src/java/main/org/apache/zookeeper/server/quorum/QuorumZooKeeperServer.java

@@ -32,10 +32,9 @@ public abstract class QuorumZooKeeperServer extends ZooKeeperServer {
 
     protected QuorumZooKeeperServer(FileTxnSnapLog logFactory, int tickTime,
             int minSessionTimeout, int maxSessionTimeout,
-            DataTreeBuilder treeBuilder, ZKDatabase zkDb, QuorumPeer self)
+            ZKDatabase zkDb, QuorumPeer self)
     {
-        super(logFactory, tickTime, minSessionTimeout, maxSessionTimeout,
-                treeBuilder, zkDb);
+        super(logFactory, tickTime, minSessionTimeout, maxSessionTimeout, zkDb);
         this.self = self;
     }
 

src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java

@@ -39,10 +39,8 @@ import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
 public class ReadOnlyZooKeeperServer extends QuorumZooKeeperServer {
 
     private volatile boolean shutdown = false;
-    ReadOnlyZooKeeperServer(FileTxnSnapLog logFactory, QuorumPeer self,
-            DataTreeBuilder treeBuilder, ZKDatabase zkDb) {
-        super(logFactory, self.tickTime, self.minSessionTimeout, self.maxSessionTimeout,
-                treeBuilder, zkDb, self);
+    ReadOnlyZooKeeperServer(FileTxnSnapLog logFactory, QuorumPeer self, ZKDatabase zkDb) {
+        super(logFactory, self.tickTime, self.minSessionTimeout, self.maxSessionTimeout, zkDb, self);
     }
 
     @Override

src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java

@@ -45,7 +45,7 @@ public class LearnerTest extends ZKTestCase {
         Learner learner;
 
         public SimpleLearnerZooKeeperServer(FileTxnSnapLog ftsl) throws IOException {
-            super(ftsl, 2000, 2000, 2000, null, new ZKDatabase(ftsl), null);
+            super(ftsl, 2000, 2000, 2000, new ZKDatabase(ftsl), null);
         }
 
         @Override

src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java

@@ -39,7 +39,6 @@ import org.apache.zookeeper.server.ServerCnxn;
 import org.apache.zookeeper.server.ServerCnxnFactory;
 import org.apache.zookeeper.server.ZKDatabase;
 import org.apache.zookeeper.server.ZooKeeperServer;
-import org.apache.zookeeper.server.ZooKeeperServer.DataTreeBuilder;
 import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
 import org.apache.zookeeper.server.quorum.Leader;
 import org.apache.zookeeper.server.quorum.LearnerInfo;
@@ -100,13 +99,6 @@ public class Zab1_0Test {
         public void closeAll() {
         }
     }
-    static class MockDataTreeBuilder implements DataTreeBuilder {
-        @Override
-        public DataTree build() {
-            return new DataTree();
-        }
-        
-    }
     static Socket[] getSocketPair() throws IOException {
         ServerSocket ss = new ServerSocket();
         ss.bind(null);
@@ -291,8 +283,7 @@ public class Zab1_0Test {
         addrField.setAccessible(true);
         addrField.set(peer, new InetSocketAddress(33556));
         ZKDatabase zkDb = new ZKDatabase(logFactory);
-        DataTreeBuilder treeBuilder = new MockDataTreeBuilder();
-        LeaderZooKeeperServer zk = new LeaderZooKeeperServer(logFactory, peer, treeBuilder, zkDb);
+        LeaderZooKeeperServer zk = new LeaderZooKeeperServer(logFactory, peer, zkDb);
         return new Leader(peer, zk);
     }
     private QuorumPeer createQuorumPeer(File tmpDir) throws IOException,