diff options
46 files changed, 46 insertions, 46 deletions
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java index 2e31898fe03..887628ec43d 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java @@ -31,7 +31,7 @@ import static java.util.stream.Collectors.toMap; * This class is thread-safe, but the inner class {@link AdInfo} is not. * * @author tonytv - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class AccessLogEntry { public enum CookieType { diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/VespaAccessLog.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/VespaAccessLog.java index 566cf17f89f..762ad255ab4 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/VespaAccessLog.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/VespaAccessLog.java @@ -12,7 +12,7 @@ import java.util.logging.Level; /** * @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a> - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public final class VespaAccessLog implements AccessLogInterface { 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 4df202c05ff..c533cc7814c 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 @@ -8,7 +8,7 @@ import java.net.URI; import java.util.List; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class AccessLogUtil { public static String getHttpMethod(final HttpRequest httpRequest) { diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/FilterBindingsProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/FilterBindingsProvider.java index 838593ab28a..722d61def55 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/FilterBindingsProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/FilterBindingsProvider.java @@ -18,7 +18,7 @@ import java.util.List; /** * Provides filter bindings based on vespa config. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class FilterBindingsProvider implements Provider<FilterBindings> { final BindingRepository<RequestFilter> requestFilters = new BindingRepository<>(); diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/FilterUtil.java b/container-disc/src/main/java/com/yahoo/container/jdisc/FilterUtil.java index 7254d438ac0..fabe4a48da0 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/FilterUtil.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/FilterUtil.java @@ -17,7 +17,7 @@ import java.util.List; /** * Helper class to set up filter binding repositories based on config. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ class FilterUtil { private static final ComponentId SEARCH_SERVER_COMPONENT_ID = ComponentId.fromString("SearchServer"); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java index 061d357310f..592240db07a 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java @@ -32,7 +32,7 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class FilterBindingsProviderTest { final ServerConfig.Builder configBuilder = new ServerConfig.Builder(); diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/dispatchprototype/DispatchClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/dispatchprototype/DispatchClusterSearcher.java index d47a5a82023..0c4c81c5fc9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/dispatchprototype/DispatchClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/dispatchprototype/DispatchClusterSearcher.java @@ -29,7 +29,7 @@ import static com.yahoo.container.QrSearchersConfig.Searchcluster; * This means that queries are sent to a single search node only. Obviously, this will not give correct * results - it is just a single step towards eliminating top-level dispatch as a separate process. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ @Beta @After("*") diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategy.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategy.java index 50b81418d00..f01e641ffcf 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategy.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategy.java @@ -7,7 +7,7 @@ import java.util.function.Function; /** * This interface allows different strategies for accessing server-side JAX-RS APIs programmatically. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public interface JaxRsStrategy<T> { <R> R apply(final Function<T, R> function) throws IOException; diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategyFactory.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategyFactory.java index 0352483dd08..87860239c03 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategyFactory.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/JaxRsStrategyFactory.java @@ -29,7 +29,7 @@ import java.util.Set; * </li> * </ol> * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class JaxRsStrategyFactory { private final Set<HostName> hostNames; diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LocalPassThroughJaxRsStrategy.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LocalPassThroughJaxRsStrategy.java index 280842ae4db..5beaa049ee5 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LocalPassThroughJaxRsStrategy.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/LocalPassThroughJaxRsStrategy.java @@ -7,7 +7,7 @@ import java.util.function.Function; /** * A {@link JaxRsStrategy} that does not use the network, only forwards calls to a local object. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class LocalPassThroughJaxRsStrategy<T> implements JaxRsStrategy<T> { private final T api; diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/NoRetryJaxRsStrategy.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/NoRetryJaxRsStrategy.java index eab1ff79220..27a8438ea11 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/NoRetryJaxRsStrategy.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/NoRetryJaxRsStrategy.java @@ -11,7 +11,7 @@ import java.util.function.Function; /** * A {@link JaxRsStrategy} that will try API calls once against a single server, giving up immediately on failure. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class NoRetryJaxRsStrategy<T> implements JaxRsStrategy<T> { private final HostName hostName; diff --git a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java index 71a9aab36b4..a9269b99015 100644 --- a/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java +++ b/jaxrs_client_utils/src/main/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategy.java @@ -14,7 +14,7 @@ import java.util.logging.Logger; /** * A {@link JaxRsStrategy} that will retry on failures, looping twice over all available server hosts before giving up. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class RetryingJaxRsStrategy<T> implements JaxRsStrategy<T> { private static final Logger logger = Logger.getLogger(RetryingJaxRsStrategy.class.getName()); diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/NoopSharedResource.java b/jdisc_core/src/main/java/com/yahoo/jdisc/NoopSharedResource.java index fe4990dbd60..9829b81e7f6 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/NoopSharedResource.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/NoopSharedResource.java @@ -5,7 +5,7 @@ package com.yahoo.jdisc; * An implementation of {@link SharedResource} that does not do anything. * Useful base class for e.g. mocks of SharedResource sub-interfaces, where reference counting is not the focus. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class NoopSharedResource implements SharedResource { @Override diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/ProxyRequestHandler.java b/jdisc_core/src/main/java/com/yahoo/jdisc/ProxyRequestHandler.java index 6f3d342705c..322f2a008bf 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/ProxyRequestHandler.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/ProxyRequestHandler.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** -* @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> +* @author bakksjo */ class ProxyRequestHandler implements RequestHandler { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/ReferencedResource.java b/jdisc_core/src/main/java/com/yahoo/jdisc/ReferencedResource.java index f55a46f1a05..e2b38216e1e 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/ReferencedResource.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/ReferencedResource.java @@ -32,7 +32,7 @@ package com.yahoo.jdisc; * } * </pre> * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class ReferencedResource<T extends SharedResource> implements AutoCloseable { private final T resource; diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/References.java b/jdisc_core/src/main/java/com/yahoo/jdisc/References.java index 868ae6ac720..d0adf8ead61 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/References.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/References.java @@ -4,7 +4,7 @@ package com.yahoo.jdisc; /** * Utility class for working with {@link SharedResource}s and {@link ResourceReference}s. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class References { // Prevents instantiation. diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/ResourceReference.java b/jdisc_core/src/main/java/com/yahoo/jdisc/ResourceReference.java index d004846d5b8..3e25a56096b 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/ResourceReference.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/ResourceReference.java @@ -14,7 +14,7 @@ package com.yahoo.jdisc; * } * </pre> * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public interface ResourceReference extends AutoCloseable { diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/ReferencedResourceTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/ReferencedResourceTestCase.java index 4337d8b8c6c..c1a8a86cdb0 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/ReferencedResourceTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/ReferencedResourceTestCase.java @@ -11,7 +11,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class ReferencedResourceTestCase { @Test diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/ReferencesTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/ReferencesTestCase.java index d8cbe36c04f..c9a9683f48e 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/ReferencesTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/ReferencesTestCase.java @@ -8,7 +8,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class ReferencesTestCase { @Test diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/FilterBindings.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/FilterBindings.java index cc3c4efc913..b05c360b7cd 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/FilterBindings.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/FilterBindings.java @@ -6,7 +6,7 @@ import com.yahoo.jdisc.http.filter.RequestFilter; import com.yahoo.jdisc.http.filter.ResponseFilter; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class FilterBindings { diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java index 1049c2eed61..9c3669fc3c7 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; * This class is a bridge between Jetty's {@link org.eclipse.jetty.server.handler.RequestLogHandler} * and our own configurable access logging in different formats provided by {@link AccessLog}. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class AccessLogRequestLog extends AbstractLifeCycle implements RequestLog { diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java index 2d9e0558455..8838b80c12d 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java @@ -22,7 +22,7 @@ import java.util.Optional; * * Does not otherwise interfere with the request processing of the delegate request handler. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo * $Id$ */ public class AccessLoggingRequestHandler extends AbstractRequestHandler { diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java index b8073bc6ab5..190408c88b8 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * Request handler that invokes request and response filters in addition to the bound request handler. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo * $Id$ */ class FilteringRequestHandler extends AbstractRequestHandler { diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java index b0f336e876c..694226d0479 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java @@ -34,7 +34,7 @@ import static com.yahoo.jdisc.Response.Status.UNSUPPORTED_MEDIA_TYPE; * The wrapper defers invocation of the "real" request handler until it has read the request content (body), * parsed the form parameters and merged them into the request's parameters. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo * $Id$ */ class FormPostRequestHandler extends AbstractRequestHandler implements ContentChannel { diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java index d8012880694..74bef1b91f8 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; * hence the current container) will be referenced until the end of the request handling - even with async handling in * non-framework threads - without requiring the application to handle this tedious work. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ class ReferenceCountingRequestHandler implements RequestHandler { diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestException.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestException.java index cbcbd278bf8..b1fac1b652a 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestException.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestException.java @@ -5,7 +5,7 @@ package com.yahoo.jdisc.http.server.jetty; * This exception may be thrown from a request handler to fail a request with a given response code and message. * It is given some special treatment in {@link ServletResponseController}. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ class RequestException extends RuntimeException { diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java index 7509598cbe2..0fdf45397c4 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLogTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class AccessLogRequestLogTest { @Test diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AlternativeTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AlternativeTest.java index 0e666e826ae..ddec7f0663e 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AlternativeTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/AlternativeTest.java @@ -15,7 +15,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class AlternativeTest { private static final String MAN = "man"; diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java index e9866a18d7c..04a9dd50a3a 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java @@ -45,7 +45,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class FilterTestCase { @Test diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java index 5ef0f7db742..a0c50a1db7a 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java @@ -63,7 +63,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> */ public class HttpServerTest { diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java index 2f17d76a145..2670bd5b222 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java @@ -21,7 +21,7 @@ import static com.google.inject.name.Names.named; * It provides functionality for setting up a jdisc container with an HTTP server and handlers. * * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class TestDriver { diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java index 1aede0e9850..38a09d2bfeb 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class ServletAccessLoggingTest extends ServletTestBase { private static final int MAX_LOG_WAIT_TIME_MILLIS = (int) TimeUnit.SECONDS.toMillis(60); diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletTestBase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletTestBase.java index d427842c30e..18eac3b3763 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletTestBase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletTestBase.java @@ -30,7 +30,7 @@ import java.io.PrintWriter; /** * @author tonytv - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class ServletTestBase { private ImmutableMap<Pair<ComponentId, String>, HttpServlet> servlets = ImmutableMap.of( diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java index b5929653458..ddcf2ef4242 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; /** * Various utilities for interacting with node-admin's environment. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class Environment { private Environment() {} // Prevents instantiation. diff --git a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java index bdcc4fe51d0..a71db5b2749 100644 --- a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java +++ b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java @@ -18,7 +18,7 @@ import javax.ws.rs.core.MediaType; * Implementing classes must not put any JAX-RS annotation on the overridden methods. Doing so will cause all * method annotations in this interface to be ignored by the JAX-RS container (see section 3.6 of JSR-339). * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public interface HostApi { /** diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorUtil.java index fff69cfd17b..adfdb7bde5d 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorUtil.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorUtil.java @@ -31,7 +31,7 @@ import static java.util.stream.Collectors.toSet; /** * Utility methods for working with service monitor model entity objects. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class OrchestratorUtil { // Utility class, not to be instantiated. diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java index a421db2732c..ea64add77b1 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; /** * Uses slobrok data (a.k.a. heartbeat) to implement {@link InstanceLookupService}. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class ServiceMonitorInstanceLookupService implements InstanceLookupService { private final SlobrokAndConfigIntersector slobrokAndConfigIntersector; diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java index 5352c81a7a1..01ce05d5a51 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClient.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.orchestrator.controller; import java.io.IOException; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public interface ClusterControllerClient { diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientFactory.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientFactory.java index b30a3daab31..22033daa72d 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientFactory.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientFactory.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.applicationmodel.ServiceInstance; import java.util.Collection; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public interface ClusterControllerClientFactory { ClusterControllerClient createClient(Collection<? extends ServiceInstance<?>> clusterControllers, String clusterName); diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java index 2c432f00a28..1f01765b485 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.stream.Collectors; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class RetryingClusterControllerClientFactory implements ClusterControllerClientFactory { // TODO: Figure this port out dynamically. diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/SingleInstanceClusterControllerClientFactory.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/SingleInstanceClusterControllerClientFactory.java index 711d819e348..a4688a19134 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/SingleInstanceClusterControllerClientFactory.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/SingleInstanceClusterControllerClientFactory.java @@ -15,7 +15,7 @@ import java.util.logging.Logger; import static com.yahoo.vespa.orchestrator.VespaModelUtil.getClusterControllerIndex; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class SingleInstanceClusterControllerClientFactory implements ClusterControllerClientFactory { public static final int CLUSTERCONTROLLER_HARDCODED_PORT = 19050; diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostStateChangeDeniedException.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostStateChangeDeniedException.java index 6e12de9bfe7..91ea4c70663 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostStateChangeDeniedException.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostStateChangeDeniedException.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.applicationmodel.ServiceType; import com.yahoo.vespa.orchestrator.OrchestrationException; /** - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class HostStateChangeDeniedException extends OrchestrationException { private final String constraintName; diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestUtil.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestUtil.java index 244ddfc858d..c91b629f111 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestUtil.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestUtil.java @@ -12,7 +12,7 @@ import java.util.Set; /** * Utility methods for creating test setups. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class TestUtil { @SafeVarargs diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/JavaSlobrokMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/JavaSlobrokMonitor.java index 70b4f05f45d..c6041d1cffb 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/JavaSlobrokMonitor.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/JavaSlobrokMonitor.java @@ -14,7 +14,7 @@ import java.util.stream.Stream; /** * Thin wrapper around {@link Mirror} class, that is a bit nicer to work with. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class JavaSlobrokMonitor { private final Mirror mirror; diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceNameUtil.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceNameUtil.java index 2fc63a24ba5..200bda20270 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceNameUtil.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceNameUtil.java @@ -12,7 +12,7 @@ import java.util.stream.Stream; /** * This class provides utilities for working with slobrok-registered service names. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class ServiceNameUtil { // Utility class; prevents instantiation. diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SingleClusterServiceMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SingleClusterServiceMonitor.java index 4c73d13dcfd..879be6aa189 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SingleClusterServiceMonitor.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SingleClusterServiceMonitor.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * * It is quite noisy and not useful for anything but testing. * - * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a> + * @author bakksjo */ public class SingleClusterServiceMonitor extends AbstractComponent { private static final Logger logger = Logger.getLogger(SingleClusterServiceMonitor.class.getName()); |