/*
 * Licensed to the University of California, Berkeley under one or more contributor license
 * agreements. See the NOTICE file distributed with this work for additional information regarding
 * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance with the License. You may obtain a
 * copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software distributed under the License
 * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 * or implied. See the License for the specific language governing permissions and limitations under
 * the License.
 */

package tachyon.worker;

import java.io.Closeable;
import java.net.InetSocketAddress;

import com.google.common.base.Throwables;

import tachyon.Constants;
import tachyon.conf.TachyonConf;
import tachyon.util.CommonUtils;
import tachyon.worker.block.BlockDataManager;
import tachyon.worker.netty.NettyDataServer;

/**
 * Defines how to interact with a server running the data protocol.
 */
public interface DataServer extends Closeable {

  class Factory {
    public static DataServer createDataServer(final InetSocketAddress dataAddress,
        final BlockDataManager blockDataManager, TachyonConf conf) {
      try {
        return CommonUtils.createNewClassInstance(
            conf.getClass(Constants.WORKER_DATA_SERVER, NettyDataServer.class),
            new Class[] { InetSocketAddress.class, BlockDataManager.class, TachyonConf.class },
            new Object[] { dataAddress, blockDataManager, conf });
      } catch (Exception e) {
        throw Throwables.propagate(e);
      }
    }
  }

  /**
   * Gets the port the DataServer is listening on.
   *
   * @return the port number
   */
  int getPort();

  /**
   * Check if the DataServer is closed.
   *
   * @return true if the DataServer is closed, false otherwise
   */
  boolean isClosed();
}

@@ -1475,16 +1475,28 @@
    conf.
+%3CDataServer%3E
 getClass
@@ -1528,31 +1528,8 @@
 RVER
-, NettyDataServer.class
 ),%0A 

Update DataServer Factory to use new getClass method