summaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/container/jdisc
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-08-22 13:25:34 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-08-22 13:25:34 +0200
commit293bd00797bf0b46900b4f42bc71c6755739f78e (patch)
tree5981e4cb4e9b9b9e7d6f00106764773ad23c0e92 /container-core/src/main/java/com/yahoo/container/jdisc
parent55326aa9f686c6cb2a54d4a03c25f1b113bd10a3 (diff)
Nonfunctional changes only
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/jdisc')
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java6
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java5
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java1
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java6
8 files changed, 14 insertions, 12 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java
index 4b915e59c23..592cbff8440 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java
@@ -12,7 +12,7 @@ import com.yahoo.jdisc.handler.ContentChannel;
* HTTP response which supports async response rendering.
*
* @author bratseth
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public abstract class AsyncHttpResponse extends HttpResponse {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java b/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java
index 582577164ff..dc3bd6fe8a8 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java
@@ -18,7 +18,7 @@ import java.util.logging.Logger;
/**
* A buffered stream wrapping a ContentChannel.
*
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public class ContentChannelOutputStream extends OutputStream implements WritableByteTransmitter {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java
index 7725f09573a..88c6291fb26 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java
@@ -8,7 +8,7 @@ import java.io.OutputStream;
* Placeholder response when no content, only headers and status is to be
* returned.
*
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public class EmptyResponse extends HttpResponse {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java
index 71d8f82b47d..9b6837a9dcb 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java
@@ -14,7 +14,7 @@ import com.yahoo.jdisc.handler.ContentChannel;
* An HTTP response supporting async rendering and extended information for
* logging.
*
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public abstract class ExtendedResponse extends AsyncHttpResponse {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java
index bc1fa134f5d..09824dca77c 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java
@@ -7,14 +7,16 @@ import com.yahoo.jdisc.handler.CompletionHandler;
* A completion handler which does access logging.
*
* @see ThreadedHttpRequestHandler#createLoggingCompletionHandler(long, long, HttpResponse, HttpRequest, ContentChannelOutputStream)
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public interface LoggingCompletionHandler extends CompletionHandler {
+
/**
* Set the commit start time to the current time. Commit start is only well
* defined for synchronous renderers, it is the point in time when rendering
* has finished, but there may still be I/O operations to transfer the data
* to the client pending.
*/
- public void markCommitStart();
+ void markCommitStart();
+
}
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java b/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
index 127d69a0ce3..50052bbf70c 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
@@ -7,9 +7,10 @@ import com.yahoo.jdisc.application.MetricConsumer;
* <p>This is the interface to implement if one wishes to configure a non-default <tt>MetricConsumer</tt>. Simply
* add the implementing class as a component in your services.xml file.</p>
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a>
+ * @author Simon Thoresen Hult
*/
public interface MetricConsumerFactory {
- public MetricConsumer newInstance();
+ MetricConsumer newInstance();
+
}
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java
index 3070a617226..132b1153fc5 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java
@@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
* A helper for making tests creating jDisc requests and checking their responses.
*
* @author bratseth
- * @since 5.21
*/
@Beta
public class RequestHandlerTestDriver implements AutoCloseable {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java b/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
index 7cd671d307c..ecb36ade5eb 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
@@ -29,9 +29,9 @@ import com.yahoo.processing.request.ErrorMessage;
* Static helper methods which implement the mapping between the ErrorMessage
* API and HTTP headers and return codes.
*
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Einar M R Rosenvinge
+ * @author Steinar Knutsen
+ * @author Simon Thoresen
* @author bratseth
*/
public final class VespaHeaders {