Fix author tag. Remove unused class

7 files changed, 6 insertions, 76 deletions

diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/ChunkReader.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/ChunkReader.java
index a550a013a3b..67572169a82 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/ChunkReader.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/ChunkReader.java
@@ -9,7 +9,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public class ChunkReader {
 
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/FilterTestDriver.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/FilterTestDriver.java
deleted file mode 100644
index 1532bc65bdf..00000000000
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/FilterTestDriver.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.test;
-
-import com.yahoo.jdisc.Request;
-import com.yahoo.jdisc.Response;
-import com.yahoo.jdisc.application.BindingRepository;
-import com.yahoo.jdisc.handler.AbstractRequestHandler;
-import com.yahoo.jdisc.handler.ContentChannel;
-import com.yahoo.jdisc.handler.ResponseDispatch;
-import com.yahoo.jdisc.handler.ResponseHandler;
-import com.yahoo.jdisc.http.HttpRequest;
-import com.yahoo.jdisc.http.filter.RequestFilter;
-import com.yahoo.jdisc.http.filter.ResponseFilter;
-
-import java.io.IOException;
-import java.util.concurrent.Exchanger;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static com.yahoo.jdisc.http.test.ServerTestDriver.newFilterModule;
-
-/**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
- *
- * TODO: dead code?
- */
-public class FilterTestDriver {
-
-    private final ServerTestDriver driver;
-    private final MyRequestHandler requestHandler;
-
-    private FilterTestDriver(ServerTestDriver driver, MyRequestHandler requestHandler) {
-        this.driver = driver;
-        this.requestHandler = requestHandler;
-    }
-
-    public boolean close() throws IOException {
-        return driver.close();
-    }
-
-    public HttpRequest filterRequest(String request) throws IOException, TimeoutException, InterruptedException {
-        driver.client().writeRequest(request);
-        return (HttpRequest)requestHandler.exchanger.exchange(null, 60, TimeUnit.SECONDS);
-    }
-
-    public static FilterTestDriver newInstance(final BindingRepository<RequestFilter> requestFilters,
-                                               final BindingRepository<ResponseFilter> responseFilters)
-            throws IOException {
-        MyRequestHandler handler = new MyRequestHandler();
-        return new FilterTestDriver(ServerTestDriver.newInstance(handler,
-                                                                 newFilterModule(requestFilters, responseFilters)),
-                                    handler);
-    }
-
-    private static class MyRequestHandler extends AbstractRequestHandler {
-
-        final Exchanger<Request> exchanger = new Exchanger<>();
-
-        @Override
-        public ContentChannel handleRequest(Request request, ResponseHandler handler) {
-            ResponseDispatch.newInstance(Response.Status.OK).dispatch(handler);
-            try {
-                exchanger.exchange(request);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-}
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java
index 80603faeaad..12d2f735f63 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java
@@ -10,7 +10,7 @@ import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a>
+ * @author Simon Thoresen Hult
  */
 public class RemoteClient extends ChunkReader {
 
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteServer.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteServer.java
index 62b4bb306ed..2897d0e2911 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteServer.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteServer.java
@@ -12,7 +12,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public class RemoteServer implements Runnable {
 
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteServerTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteServerTestCase.java
index 67b3edacc51..b6b9d984e7e 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteServerTestCase.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteServerTestCase.java
@@ -13,7 +13,7 @@ import static org.testng.AssertJUnit.assertTrue;
 import static org.testng.AssertJUnit.fail;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public class RemoteServerTestCase {
 
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/ServerTestDriver.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/ServerTestDriver.java
index 03e2257ce70..324d73e5701 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/ServerTestDriver.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/ServerTestDriver.java
@@ -23,7 +23,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a>
+ * @author Simon Thoresen Hult
  */
 public class ServerTestDriver {
 
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/SslContextFactory.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/SslContextFactory.java
index e1163b90dfa..7e0e2ad1371 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/SslContextFactory.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/SslContextFactory.java
@@ -15,7 +15,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * @author <a href="mailto:charlesk@yahoo-inc.com">Charles Kim</a>
+ * @author Charles Kim
  */
 public class SslContextFactory {