From 293bd00797bf0b46900b4f42bc71c6755739f78e Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 22 Aug 2017 13:25:34 +0200 Subject: Nonfunctional changes only --- container-core/src/main/java/com/yahoo/container/ConfigHack.java | 2 +- .../main/java/com/yahoo/container/core/config/BundleLoader.java | 2 +- .../com/yahoo/container/core/config/HandlersConfigurerDi.java | 9 ++------- .../src/main/java/com/yahoo/container/handler/Coverage.java | 2 +- .../src/main/java/com/yahoo/container/handler/Prefix.java | 2 +- .../src/main/java/com/yahoo/container/handler/Timing.java | 2 +- .../src/main/java/com/yahoo/container/handler/VipStatus.java | 2 +- .../src/main/java/com/yahoo/container/http/AccessLogUtil.java | 2 ++ .../main/java/com/yahoo/container/http/BenchmarkingHeaders.java | 2 +- .../com/yahoo/container/http/filter/FilterChainRepository.java | 2 +- .../main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java | 2 +- .../com/yahoo/container/jdisc/ContentChannelOutputStream.java | 2 +- .../src/main/java/com/yahoo/container/jdisc/EmptyResponse.java | 2 +- .../main/java/com/yahoo/container/jdisc/ExtendedResponse.java | 2 +- .../java/com/yahoo/container/jdisc/LoggingCompletionHandler.java | 6 ++++-- .../java/com/yahoo/container/jdisc/MetricConsumerFactory.java | 5 +++-- .../java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java | 1 - .../src/main/java/com/yahoo/container/jdisc/VespaHeaders.java | 6 +++--- .../main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java | 2 +- .../src/main/java/com/yahoo/container/protect/Error.java | 2 +- .../main/java/com/yahoo/container/protect/FreezeDetector.java | 2 +- 21 files changed, 29 insertions(+), 30 deletions(-) (limited to 'container-core/src/main/java/com/yahoo') diff --git a/container-core/src/main/java/com/yahoo/container/ConfigHack.java b/container-core/src/main/java/com/yahoo/container/ConfigHack.java index 10af4be554e..55cf208e163 100644 --- a/container-core/src/main/java/com/yahoo/container/ConfigHack.java +++ b/container-core/src/main/java/com/yahoo/container/ConfigHack.java @@ -11,7 +11,7 @@ import com.yahoo.container.config.StatisticsEmitter; *

* This class should not reach a final release. * - * @author Steinar Knutsen + * @author Steinar Knutsen */ public final class ConfigHack { diff --git a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java index bcfa6aaf420..293771cb0bd 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java @@ -25,7 +25,7 @@ import static com.yahoo.container.core.BundleLoaderProperties.DISK_BUNDLE_PREFIX /** * Manages the set of installed 3rd-party component bundles. * - * @author tonytv + * @author Tony Vaagenes */ public class BundleLoader { diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 66fb4c73560..49cacb3a09b 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -42,7 +42,7 @@ import static com.yahoo.container.util.Util.quote; /** * For internal use only. * - * @author tonytv + * @author Tony Vaagenes * @author gjoranv */ //TODO: rename @@ -84,12 +84,7 @@ public class HandlersConfigurerDi { this.vespaContainer = vespaContainer; osgiWrapper = new OsgiWrapper(osgiFramework, vespaContainer.getBundleLoader()); - container = new Container( - subscriberFactory, - configId, - deconstructor, - osgiWrapper - ); + container = new Container(subscriberFactory, configId, deconstructor, osgiWrapper); try { runOnceAndEnsureRegistryHackRun(discInjector); } catch (InterruptedException e) { diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java index 6ac2c40b3fc..d714d0211ab 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java @@ -7,7 +7,7 @@ import com.google.common.annotations.Beta; /** * The coverage report for a result set. * - * @author Steinar Knutsen + * @author Steinar Knutsen * @author baldersheim */ public class Coverage { diff --git a/container-core/src/main/java/com/yahoo/container/handler/Prefix.java b/container-core/src/main/java/com/yahoo/container/handler/Prefix.java index 19aa819ce47..076e0b32a58 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Prefix.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Prefix.java @@ -4,7 +4,7 @@ package com.yahoo.container.handler; /** * Wrapper to maintain indirections between prefixes and Handler instances. * - * @author Steinar Knutsen + * @author Steinar Knutsen */ public final class Prefix implements Comparable { diff --git a/container-core/src/main/java/com/yahoo/container/handler/Timing.java b/container-core/src/main/java/com/yahoo/container/handler/Timing.java index 48248863a88..e52928404be 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Timing.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Timing.java @@ -13,7 +13,7 @@ package com.yahoo.container.handler; *

If you do not understand the fields, just avoid creating this object * in you handler.

* - * @author Steinar Knutsen + * @author Steinar Knutsen */ public class Timing { diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java index 7332ce46836..bcd6e930ee3 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java +++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java @@ -10,7 +10,7 @@ import com.yahoo.container.QrSearchersConfig; /** * API for programmatically removing the container from VIP rotation. * - * @author steinar + * @author Steinar Knutsen */ public class VipStatus { diff --git a/container-core/src/main/java/com/yahoo/container/http/AccessLogUtil.java b/container-core/src/main/java/com/yahoo/container/http/AccessLogUtil.java index 3c688ab0c4d..da419837f63 100644 --- a/container-core/src/main/java/com/yahoo/container/http/AccessLogUtil.java +++ b/container-core/src/main/java/com/yahoo/container/http/AccessLogUtil.java @@ -11,6 +11,7 @@ import java.util.List; * @author bakksjo */ public class AccessLogUtil { + public static String getHttpMethod(final HttpRequest httpRequest) { return httpRequest.getMethod().toString(); } @@ -40,4 +41,5 @@ public class AccessLogUtil { final List headerValues = httpRequest.headers().get(headerName); return (headerValues == null || headerValues.isEmpty()) ? "" : headerValues.get(0); } + } diff --git a/container-core/src/main/java/com/yahoo/container/http/BenchmarkingHeaders.java b/container-core/src/main/java/com/yahoo/container/http/BenchmarkingHeaders.java index d6665e90416..da548c6adee 100644 --- a/container-core/src/main/java/com/yahoo/container/http/BenchmarkingHeaders.java +++ b/container-core/src/main/java/com/yahoo/container/http/BenchmarkingHeaders.java @@ -4,7 +4,7 @@ package com.yahoo.container.http; /** * Class containing the names of all benchmarking getHeaders in request and response * - * @author Mathias Mølster Lidal + * @author Mathias Mølster Lidal */ public class BenchmarkingHeaders { diff --git a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java index fb07d025044..e4ec09e3948 100644 --- a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java +++ b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java @@ -33,7 +33,7 @@ import static java.util.stream.Collectors.toSet; /** * Creates JDisc request/response filter chains. * - * @author tonytv + * @author Tony Vaagenes * @author bjorncs */ public class FilterChainRepository extends AbstractComponent { 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 Steinar Knutsen + * @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 Steinar Knutsen + * @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 Steinar Knutsen + * @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 Steinar Knutsen + * @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 Steinar Knutsen + * @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; *

This is the interface to implement if one wishes to configure a non-default MetricConsumer. Simply * add the implementing class as a component in your services.xml file.

* - * @author Simon Thoresen Hult + * @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 Einar M R Rosenvinge - * @author Steinar Knutsen - * @author Simon Thoresen + * @author Einar M R Rosenvinge + * @author Steinar Knutsen + * @author Simon Thoresen * @author bratseth */ public final class VespaHeaders { diff --git a/container-core/src/main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java b/container-core/src/main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java index 507111ce29c..9486fe367f9 100644 --- a/container-core/src/main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java +++ b/container-core/src/main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java @@ -6,7 +6,7 @@ import com.yahoo.jrt.Supervisor; /** * Helper class for optional RPC adaptors in the Container. * - * @author Steinar Knutsen + * @author Steinar Knutsen */ public abstract class AbstractRpcAdaptor { diff --git a/container-core/src/main/java/com/yahoo/container/protect/Error.java b/container-core/src/main/java/com/yahoo/container/protect/Error.java index 14b955d9fbe..46b49b1623a 100644 --- a/container-core/src/main/java/com/yahoo/container/protect/Error.java +++ b/container-core/src/main/java/com/yahoo/container/protect/Error.java @@ -4,7 +4,7 @@ package com.yahoo.container.protect; /** * Error codes to use in ErrorMessage instances for container applications. * - * @author Steinar Knutsen + * @author Steinar Knutsen */ public enum Error { diff --git a/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java b/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java index 0afac635311..6a8a3239c17 100644 --- a/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java +++ b/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java @@ -10,7 +10,7 @@ import com.yahoo.container.core.DiagnosticsConfig; /** * Runs and initializes a {@link Watchdog} instance. * - * @author Steinar Knutsen + * @author Steinar Knutsen * @deprecated this is not in use and will be removed in the next major release */ @Deprecated -- cgit v1.2.3