diff options
85 files changed, 162 insertions, 91 deletions
diff --git a/application-deploy-plugin/src/main/java/com/yahoo/cloud/config/deploy/plugin/mojo/ApplicationDeployMojo.java b/application-deploy-plugin/src/main/java/com/yahoo/cloud/config/deploy/plugin/mojo/ApplicationDeployMojo.java index c001a935f5e..dc72f99eafd 100644 --- a/application-deploy-plugin/src/main/java/com/yahoo/cloud/config/deploy/plugin/mojo/ApplicationDeployMojo.java +++ b/application-deploy-plugin/src/main/java/com/yahoo/cloud/config/deploy/plugin/mojo/ApplicationDeployMojo.java @@ -17,7 +17,6 @@ import org.json.*; /** * @author hmusum - * @since 5.1.22 */ @org.apache.maven.plugins.annotations.Mojo(name = "deploy", defaultPhase = LifecyclePhase.GENERATE_SOURCES) public class ApplicationDeployMojo extends AbstractMojo { diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java index aa8f551d5b8..d2796f600c6 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java @@ -10,6 +10,7 @@ import java.util.Set; * @author bjorncs */ public class ApplicationInstance<STATUS> { + private final TenantId tenantId; private final ApplicationInstanceId applicationInstanceId; private final Set<ServiceCluster<STATUS>> serviceClusters; @@ -63,4 +64,5 @@ public class ApplicationInstance<STATUS> { ", serviceClusters=" + serviceClusters + '}'; } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java index b468b3dbd8c..df19f6cf275 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java @@ -10,6 +10,7 @@ import java.util.Objects; */ // TODO: Remove this and use ApplicationName/InstanceName instead (if you need it for the JSON stuff move it to that layer and don't let it leak) public class ApplicationInstanceId { + private final String id; public ApplicationInstanceId(String id) { @@ -41,4 +42,5 @@ public class ApplicationInstanceId { public int hashCode() { return Objects.hash(id); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java index d86bcb66014..e761e14caa4 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java @@ -11,6 +11,7 @@ import java.util.Objects; */ // TODO: Remove this and use ApplicationId instead (if you need it for the JSON stuff move it to that layer and don't let it leak) public class ApplicationInstanceReference { + private final TenantId tenantId; private final ApplicationInstanceId applicationInstanceId; @@ -54,4 +55,5 @@ public class ApplicationInstanceReference { public int hashCode() { return Objects.hash(tenantId, applicationInstanceId); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java index 91b326b1787..da5ea7f975d 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java @@ -41,4 +41,5 @@ public class ClusterId { public int hashCode() { return Objects.hash(id); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java index c4eb531de73..3a9db7b84c0 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java @@ -40,4 +40,5 @@ public class ConfigId { public int hashCode() { return Objects.hash(id); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java index b5cb1518f3a..66e79917ccf 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java @@ -46,4 +46,5 @@ public class HostName implements Comparable<HostName> { public int compareTo(HostName o) { return id.compareTo(o.id); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java index ee9ed11f9a4..84d1b44bbf2 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java @@ -12,6 +12,7 @@ import java.util.Set; * @author bjorncs */ public class ServiceCluster<STATUS> { + private final ClusterId clusterId; private final ServiceType serviceType; private final Set<ServiceInstance<STATUS>> serviceInstances; @@ -60,4 +61,5 @@ public class ServiceCluster<STATUS> { public int hashCode() { return Objects.hash(clusterId, serviceType, serviceInstances); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java index 09208fab82c..843cbdd775b 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java @@ -50,4 +50,5 @@ public class ServiceClusterKey { public int hashCode() { return Objects.hash(clusterId, serviceType); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java index 73e09476abc..cb3e6f5e077 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java @@ -9,6 +9,7 @@ import java.util.Objects; * @author bjorncs */ public class ServiceInstance<STATUS> { + private final ConfigId configId; private final HostName hostName; private final STATUS serviceStatus; @@ -57,4 +58,5 @@ public class ServiceInstance<STATUS> { public int hashCode() { return Objects.hash(configId, hostName, serviceStatus); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java index cf867a893e6..784ff9d1e38 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java @@ -41,4 +41,5 @@ public class ServiceType { public int hashCode() { return Objects.hash(id); } + } diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java index 31a34dc9d1b..ba9d6251569 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java @@ -10,6 +10,7 @@ import java.util.Objects; */ // TODO: Remove this and use TenantName instead (if you need it for the JSON stuff move it to that layer and don't let it leak) public class TenantId { + private final String id; public TenantId(String id) { @@ -41,4 +42,5 @@ public class TenantId { public int hashCode() { return Objects.hash(id); } + } diff --git a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java index 5689b6ab1bc..e879acef3bb 100644 --- a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java +++ b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java @@ -18,10 +18,10 @@ import java.util.Optional; /** * Main entry for preprocessing an application package. * - * @author lulf - * @since 5.25 + * @author Ulf Lilleengen */ public class ApplicationPreprocessor { + private final File applicationDir; private final Optional<File> outputDir; private final Optional<Environment> environment; @@ -65,4 +65,5 @@ public class ApplicationPreprocessor { System.exit(1); } } + } diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java index bb29ff05fb8..88140873b7b 100644 --- a/application/src/main/java/com/yahoo/application/Application.java +++ b/application/src/main/java/com/yahoo/application/Application.java @@ -35,10 +35,10 @@ import java.util.*; /** * Contains one or more containers built from services.xml. * Other services present in the services.xml file might be mocked in future versions. - * <p> + * * Currently, only a single top level JDisc Container is allowed. Other clusters are ignored. * - * @author tonytv + * @author Tony Vaagenes */ @Beta public final class Application implements AutoCloseable { @@ -666,4 +666,5 @@ public final class Application implements AutoCloseable { } } } + } diff --git a/application/src/main/java/com/yahoo/application/ApplicationBuilder.java b/application/src/main/java/com/yahoo/application/ApplicationBuilder.java index 1d288759d23..9d7cf2c8673 100644 --- a/application/src/main/java/com/yahoo/application/ApplicationBuilder.java +++ b/application/src/main/java/com/yahoo/application/ApplicationBuilder.java @@ -15,10 +15,11 @@ import static java.nio.file.Files.createTempDirectory; /** * Builds an application package on disk and returns a path to the result. * - * @author tonytv + * @author Tony Vaagenes */ @Beta public class ApplicationBuilder { + private Path applicationDir = createTempDirectory("application"); private Networking networking = Networking.disable; @@ -93,4 +94,5 @@ public class ApplicationBuilder { Path getPath() { return applicationDir; } + } diff --git a/application/src/main/java/com/yahoo/application/Networking.java b/application/src/main/java/com/yahoo/application/Networking.java index b23d2e58456..8dd77c6b0f6 100644 --- a/application/src/main/java/com/yahoo/application/Networking.java +++ b/application/src/main/java/com/yahoo/application/Networking.java @@ -1,12 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.application; -import com.google.common.annotations.Beta; - /** - * @author tonytv + * @author Tony Vaagenes */ public enum Networking { + enable, disable + } diff --git a/application/src/main/java/com/yahoo/application/container/ApplicationException.java b/application/src/main/java/com/yahoo/application/container/ApplicationException.java index d3e4100cfef..424c66313a7 100644 --- a/application/src/main/java/com/yahoo/application/container/ApplicationException.java +++ b/application/src/main/java/com/yahoo/application/container/ApplicationException.java @@ -5,10 +5,11 @@ package com.yahoo.application.container; * Wraps an Exception in a RuntimeException, for user convenience. * * @author gjoranv - * @since 5.1.15 */ class ApplicationException extends RuntimeException { + ApplicationException(Exception e) { super(e); } + } diff --git a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java index 2cf46c43d06..8e9180f00c7 100644 --- a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java +++ b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java @@ -20,10 +20,11 @@ import java.util.Map; /** * For doing document processing with {@link JDisc}. * - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ @Beta public final class DocumentProcessing { + private final DocumentProcessingHandler handler; private final Map<String, DocumentType> documentTypes; diff --git a/application/src/main/java/com/yahoo/application/container/JDisc.java b/application/src/main/java/com/yahoo/application/container/JDisc.java index 6cf98072232..ed0c29a3917 100644 --- a/application/src/main/java/com/yahoo/application/container/JDisc.java +++ b/application/src/main/java/com/yahoo/application/container/JDisc.java @@ -28,10 +28,9 @@ import java.nio.file.Path; /** * A JDisc Container configured from XML. * - * @author tonytv - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Tony Vaagenes + * @author Einar M R Rosenvinge * @author gjoranv - * @since 5.1.15 */ @Beta public final class JDisc implements AutoCloseable { diff --git a/application/src/main/java/com/yahoo/application/container/Processing.java b/application/src/main/java/com/yahoo/application/container/Processing.java index 5fc9abce8fe..f0ee3cdd1b9 100644 --- a/application/src/main/java/com/yahoo/application/container/Processing.java +++ b/application/src/main/java/com/yahoo/application/container/Processing.java @@ -17,7 +17,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge * @author gjoranv */ @Beta diff --git a/application/src/main/java/com/yahoo/application/container/ProcessingBase.java b/application/src/main/java/com/yahoo/application/container/ProcessingBase.java index 14ba6eb394e..f1505e4429a 100644 --- a/application/src/main/java/com/yahoo/application/container/ProcessingBase.java +++ b/application/src/main/java/com/yahoo/application/container/ProcessingBase.java @@ -19,7 +19,6 @@ import java.util.concurrent.Executors; /** * @author gjoranv - * @since 5.1.15 */ @Beta public abstract class ProcessingBase< @@ -27,6 +26,7 @@ public abstract class ProcessingBase< RESPONSE extends Response, PROCESSOR extends Processor> { + /** * Returns a registry of configured chains. * diff --git a/application/src/main/java/com/yahoo/application/container/Search.java b/application/src/main/java/com/yahoo/application/container/Search.java index ba241c70b5b..9503ce4fb50 100644 --- a/application/src/main/java/com/yahoo/application/container/Search.java +++ b/application/src/main/java/com/yahoo/application/container/Search.java @@ -18,7 +18,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge * @author gjoranv */ @Beta diff --git a/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java b/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java index 1d64d2df2a9..c5ca67d4428 100644 --- a/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java +++ b/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ @ThreadSafe @Beta @@ -156,6 +156,7 @@ final class SynchronousRequestResponseHandler { } private static class BlockingCompletionHandler implements CompletionHandler { + private volatile Throwable throwable; private CountDownLatch doneLatch = new CountDownLatch(1); @@ -184,5 +185,7 @@ final class SynchronousRequestResponseHandler { } } } + } + } diff --git a/application/src/main/java/com/yahoo/application/container/handler/Headers.java b/application/src/main/java/com/yahoo/application/container/handler/Headers.java index 8c49d36c078..cb4ebc3d8b9 100644 --- a/application/src/main/java/com/yahoo/application/container/handler/Headers.java +++ b/application/src/main/java/com/yahoo/application/container/handler/Headers.java @@ -15,8 +15,8 @@ import java.util.Set; * * @see Request * @see Response - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Einar M R Rosenvinge + * @author Simon Thoresen */ @NotThreadSafe @Beta @@ -99,10 +99,6 @@ public class Headers implements Map<String, List<String>> { } - /* - CONVENIENCE METHODS: - */ - /** * <p>Convenience method for checking whether or not a named header contains a specific value. If the named header * is not set, or if the given value is not contained within that header's value list, this method returns @@ -223,4 +219,5 @@ public class Headers implements Map<String, List<String>> { public List<Entry<String, String>> entries() { return h.entries(); } + } diff --git a/application/src/main/java/com/yahoo/application/container/handler/Response.java b/application/src/main/java/com/yahoo/application/container/handler/Response.java index 6502cfe6da2..35d42e3e147 100644 --- a/application/src/main/java/com/yahoo/application/container/handler/Response.java +++ b/application/src/main/java/com/yahoo/application/container/handler/Response.java @@ -17,13 +17,13 @@ import java.util.regex.Pattern; /** * A response for use with {@link com.yahoo.application.container.JDisc#handleRequest(Request)}. * - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> - * @since 5.1.15 + * @author Einar M R Rosenvinge * @see Request */ @Immutable @Beta public class Response { + private final static Pattern charsetPattern = Pattern.compile("charset=([^\\s\\;]+)", Pattern.CASE_INSENSITIVE); private final int status; private final Headers headers = new Headers(); @@ -122,4 +122,5 @@ public class Response { } return Utf8.getCharset(); } + } diff --git a/application/src/main/java/com/yahoo/application/content/ContentCluster.java b/application/src/main/java/com/yahoo/application/content/ContentCluster.java index f68e329c12f..93c83f3b323 100644 --- a/application/src/main/java/com/yahoo/application/content/ContentCluster.java +++ b/application/src/main/java/com/yahoo/application/content/ContentCluster.java @@ -1,6 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.application.content; +import com.google.common.annotations.Beta; + import java.nio.file.Path; import java.util.Collections; import java.util.List; @@ -8,6 +10,7 @@ import java.util.List; /** * @author bratseth */ +@Beta public class ContentCluster { /** diff --git a/application/src/test/java/com/yahoo/application/ApplicationFacade.java b/application/src/test/java/com/yahoo/application/ApplicationFacade.java index 65f36b0804f..744ebb138c9 100644 --- a/application/src/test/java/com/yahoo/application/ApplicationFacade.java +++ b/application/src/test/java/com/yahoo/application/ApplicationFacade.java @@ -158,4 +158,5 @@ public class ApplicationFacade implements AutoCloseable { public void close() { application.close(); } + } diff --git a/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java b/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java index 2ce11335894..2a363916fa3 100644 --- a/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java +++ b/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java @@ -150,4 +150,5 @@ public class JDiscContainerDocprocTest { } } + } diff --git a/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java b/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java index 134d7d64f20..4c8c7f1ce06 100644 --- a/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java +++ b/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java @@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class JDiscContainerProcessingTest { diff --git a/application/src/test/java/com/yahoo/application/container/MockClient.java b/application/src/test/java/com/yahoo/application/container/MockClient.java index 5479f4db58e..6909b1059ff 100644 --- a/application/src/test/java/com/yahoo/application/container/MockClient.java +++ b/application/src/test/java/com/yahoo/application/container/MockClient.java @@ -11,10 +11,10 @@ import com.yahoo.jdisc.service.AbstractClientProvider; import java.util.concurrent.atomic.AtomicInteger; /** - * * @author Christian Andersen */ public class MockClient extends AbstractClientProvider { + private final AtomicInteger counter = new AtomicInteger(); @Override @@ -40,4 +40,5 @@ public class MockClient extends AbstractClientProvider { // Ignored } }; + } diff --git a/application/src/test/java/com/yahoo/application/container/MockServer.java b/application/src/test/java/com/yahoo/application/container/MockServer.java index d8d7d927f7d..cdb320fd69e 100644 --- a/application/src/test/java/com/yahoo/application/container/MockServer.java +++ b/application/src/test/java/com/yahoo/application/container/MockServer.java @@ -5,10 +5,10 @@ import com.yahoo.jdisc.service.AbstractServerProvider; import com.yahoo.jdisc.service.CurrentContainer; /** - * * @author Christian Andersen */ public class MockServer extends AbstractServerProvider { + private boolean started = false; public MockServer(CurrentContainer container) { @@ -28,4 +28,5 @@ public class MockServer extends AbstractServerProvider { public boolean isStarted() { return started; } + } diff --git a/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java b/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java index 57e69e4d1b4..ca221fa5199 100644 --- a/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java +++ b/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java @@ -11,7 +11,7 @@ import com.yahoo.document.datatypes.StringFieldValue; import java.util.concurrent.atomic.AtomicInteger; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class Rot13DocumentProcessor extends DocumentProcessor { private static final String FIELD_NAME = "title"; diff --git a/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java index 2638bcfdfef..d99fc0c2b9a 100644 --- a/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java +++ b/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java @@ -13,8 +13,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; /** -* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> -*/ + * @author Einar M R Rosenvinge + */ public class DelayedThrowingInWriteRequestHandler extends AbstractRequestHandler { private ExecutorService responseExecutor = Executors.newSingleThreadExecutor(); diff --git a/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java b/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java index 01cebc3a3e9..054a63fef66 100644 --- a/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java +++ b/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java @@ -2,7 +2,7 @@ package com.yahoo.application.container.handlers; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class DelayedWriteException extends RuntimeException { } diff --git a/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java index 7749902f25a..c47d0afdd02 100644 --- a/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java +++ b/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java @@ -12,8 +12,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; /** -* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> -*/ + * @author Einar M R Rosenvinge + */ public class HeaderEchoRequestHandler extends AbstractRequestHandler { private ExecutorService responseExecutor = Executors.newSingleThreadExecutor(); diff --git a/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java index 3e2d5eab559..643205e9c57 100644 --- a/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java +++ b/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java @@ -11,10 +11,10 @@ import java.io.PrintStream; import java.util.concurrent.Executor; /** - * * @author Christian Andersen */ public class MockHttpHandler extends ThreadedHttpRequestHandler { + public MockHttpHandler(Executor executor) { super(executor); } @@ -30,4 +30,5 @@ public class MockHttpHandler extends ThreadedHttpRequestHandler { } }; } + } diff --git a/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java index 535dcca16dc..b1f0480adc7 100644 --- a/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java +++ b/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java @@ -11,9 +11,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; /** -* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> +* @author Einar M R Rosenvinge */ public class ThrowingInWriteRequestHandler extends AbstractRequestHandler { + private ExecutorService responseExecutor = Executors.newSingleThreadExecutor(); @Override @@ -50,4 +51,5 @@ public class ThrowingInWriteRequestHandler extends AbstractRequestHandler { handler.completed(); } } + } diff --git a/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java b/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java index 3ec0eb63a48..22ce6652c87 100644 --- a/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java +++ b/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java @@ -2,7 +2,7 @@ package com.yahoo.application.container.handlers; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class WriteException extends RuntimeException { } diff --git a/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java b/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java index 8191fe4a2ee..99bb6c7b067 100644 --- a/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java +++ b/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java @@ -8,10 +8,10 @@ import java.io.IOException; import java.io.Writer; /** - * * @author Christian Andersen */ public class MockRenderer extends Renderer { + public MockRenderer() { } @@ -29,4 +29,5 @@ public class MockRenderer extends Renderer { protected void render(Writer writer, Result result) throws IOException { writer.write("<mock hits=\"" + result.hits().size() + "\" />"); } + } diff --git a/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java b/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java index 867f3e52015..34913a1beb5 100644 --- a/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java +++ b/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java @@ -9,7 +9,6 @@ import com.yahoo.search.result.HitGroup; import com.yahoo.search.searchchain.Execution; /** - * * @author Christian Andersen */ public class MockSearcher extends Searcher { diff --git a/chain/src/main/java/com/yahoo/component/chain/Chain.java b/chain/src/main/java/com/yahoo/component/chain/Chain.java index 48ed39ba5da..1c628f3dfa4 100644 --- a/chain/src/main/java/com/yahoo/component/chain/Chain.java +++ b/chain/src/main/java/com/yahoo/component/chain/Chain.java @@ -13,7 +13,7 @@ import java.util.List; /** * An immutable ordered list of components * - * @author tonytv + * @author Tony Vaagenes */ public class Chain<COMPONENT extends ChainedComponent> { diff --git a/chain/src/main/java/com/yahoo/component/chain/ChainedComponent.java b/chain/src/main/java/com/yahoo/component/chain/ChainedComponent.java index c381cc6d591..7e0eb8b72ec 100644 --- a/chain/src/main/java/com/yahoo/component/chain/ChainedComponent.java +++ b/chain/src/main/java/com/yahoo/component/chain/ChainedComponent.java @@ -19,7 +19,7 @@ import java.util.List; /** * Component with dependencies. * - * @author tonytv + * @author Tony Vaagenes */ public abstract class ChainedComponent extends AbstractComponent { diff --git a/chain/src/main/java/com/yahoo/component/chain/ChainsConfigurer.java b/chain/src/main/java/com/yahoo/component/chain/ChainsConfigurer.java index c73dc7c16f2..969c1c7d66a 100644 --- a/chain/src/main/java/com/yahoo/component/chain/ChainsConfigurer.java +++ b/chain/src/main/java/com/yahoo/component/chain/ChainsConfigurer.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.component.chain; -import com.yahoo.component.AbstractComponent; import com.yahoo.component.ComponentSpecification; import com.yahoo.component.chain.model.ChainSpecification; import com.yahoo.component.chain.model.ChainedComponentModel; diff --git a/chain/src/main/java/com/yahoo/component/chain/Phase.java b/chain/src/main/java/com/yahoo/component/chain/Phase.java index a291f471737..4148bdc6258 100644 --- a/chain/src/main/java/com/yahoo/component/chain/Phase.java +++ b/chain/src/main/java/com/yahoo/component/chain/Phase.java @@ -10,10 +10,11 @@ import java.util.TreeSet; /** * Used for many to many constraints on searcher ordering. * - * @author tonytv + * @author Tony Vaagenes */ @Immutable public class Phase { + public final Dependencies dependencies; public Phase(String name, Set<String> before, Set<String> after) { @@ -49,4 +50,5 @@ public class Phase { Dependencies union = dependencies.union(phase.dependencies); return new Phase(getName(), union.before(), union.after()); } + } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/After.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/After.java index f510e8f4c8b..be10c82d2e1 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/After.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/After.java @@ -10,11 +10,13 @@ import java.lang.annotation.*; * See {@link com.yahoo.component.chain.dependencies.ordering.ChainBuilder} * for dependency handling information. * - * @author tonytv + * @author Tony Vaagenes */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Inherited public @interface After { - public abstract String[] value() default {}; + + String[] value() default {}; + } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/Before.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/Before.java index 01ad8f6e563..4542140c574 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/Before.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/Before.java @@ -10,11 +10,13 @@ import java.lang.annotation.*; * See {@link com.yahoo.component.chain.dependencies.ordering.ChainBuilder} * for dependency handling information. * - * @author tonytv + * @author Tony Vaagenes */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Inherited public @interface Before { - public abstract String[] value() default {}; + + String[] value() default {}; + } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/Dependencies.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/Dependencies.java index a817bbb5116..46ea3518656 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/Dependencies.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/Dependencies.java @@ -9,7 +9,7 @@ import net.jcip.annotations.Immutable; /** * Constraints for ordering ChainedComponents in chains. * - * @author tonytv + * @author Tony Vaagenes */ @Immutable public class Dependencies { diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/Provides.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/Provides.java index 23becf6b4a7..b014681c469 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/Provides.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/Provides.java @@ -8,11 +8,13 @@ import java.lang.annotation.*; * Other components can then mark themselves as "before" and "after" the string provided here, * to impose constraints on ordering. * - * @author tonytv + * @author Tony Vaagenes */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Inherited public @interface Provides { - public abstract String[] value() default {}; + + String[] value() default {}; + } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java index 637cacf2bb6..beafe7d2b98 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilder.java @@ -31,9 +31,10 @@ import com.yahoo.component.chain.Phase; * A warning will be logged if multiple components of different types provides the * same name. A component can not provide the same name as a phase. * - * @author tonytv + * @author Tony Vaagenes */ public class ChainBuilder<T extends ChainedComponent> { + private final ComponentId id; private int numComponents = 0; private int priority = 1; @@ -166,4 +167,5 @@ public class ChainBuilder<T extends ChainedComponent> { } return readyNodes; } + } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java index 4c1eeff3c61..b9e8f56d15c 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java @@ -11,7 +11,7 @@ import com.yahoo.component.chain.ChainedComponent; /** * A set of components providing a given name. * - * @author tonytv + * @author Tony Vaagenes */ class ComponentNameProvider extends NameProvider { diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNode.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNode.java index e6a8b982ad8..2bc81542d52 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNode.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNode.java @@ -7,9 +7,10 @@ import com.yahoo.component.chain.ChainedComponent; * A node representing a given component. * * @see Node - * @author tonytv + * @author Tony Vaagenes */ class ComponentNode<T extends ChainedComponent> extends Node { + private T component; public ComponentNode(T component, int priority) { @@ -31,5 +32,6 @@ class ComponentNode<T extends ChainedComponent> extends Node { int classPriority() { return 2; } + } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ConflictingNodeTypeException.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ConflictingNodeTypeException.java index a233f0cd79f..edf4a119e5c 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ConflictingNodeTypeException.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ConflictingNodeTypeException.java @@ -4,7 +4,7 @@ package com.yahoo.component.chain.dependencies.ordering; /** * Thrown if a searcher provides the same name as a phase. * - * @author tonytv + * @author Tony Vaagenes */ @SuppressWarnings("serial") public class ConflictingNodeTypeException extends RuntimeException { diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/CycleDependenciesException.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/CycleDependenciesException.java index fd05ab20b02..40a78030c41 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/CycleDependenciesException.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/CycleDependenciesException.java @@ -10,10 +10,11 @@ import java.util.Set; * representation of the cycle is available to help solve the problem (<a * href="http://graphviz.org/">GraphViz</a>). * - * @author tonytv + * @author Tony Vaagenes */ @SuppressWarnings("serial") public class CycleDependenciesException extends RuntimeException { + public Map<String, NameProvider> cycleNodes; CycleDependenciesException(Map<String, NameProvider> cycleNodes) { @@ -41,5 +42,4 @@ public class CycleDependenciesException extends RuntimeException { return createDotString(cycleNodes); } - } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/NameProvider.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/NameProvider.java index 526e65146d9..773b6d07035 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/NameProvider.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/NameProvider.java @@ -4,9 +4,10 @@ package com.yahoo.component.chain.dependencies.ordering; /** * A node containing nodes providing a given name. * - * @author tonytv + * @author Tony Vaagenes */ abstract class NameProvider extends Node { + final String name; public NameProvider(String name, int priority) { @@ -24,6 +25,7 @@ abstract class NameProvider extends Node { protected String dotName() { return name; } + } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/Node.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/Node.java index cb5b6a1cbff..da652fde614 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/Node.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/Node.java @@ -17,7 +17,7 @@ import java.util.Set; * * Where name designates a NameProvider( either a phase or a set of searchers). * - * @author tonytv + * @author Tony Vaagenes */ abstract class Node { //How this node should be prioritized if its compared with a node of the same class, see class priority. diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java index a9650fe751b..7af863a37c3 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java @@ -8,9 +8,10 @@ import java.util.PriorityQueue; /** * Ensures that Searchers are ordered deterministically. * - * @author tonytv + * @author Tony Vaagenes */ class OrderedReadyNodes { + private class PriorityComparator implements Comparator<Node> { @Override public int compare(Node lhs, Node rhs) { @@ -22,8 +23,7 @@ class OrderedReadyNodes { } } - final private PriorityQueue<Node> nodes = - new PriorityQueue<>(10, new PriorityComparator()); + final private PriorityQueue<Node> nodes = new PriorityQueue<>(10, new PriorityComparator()); public void add(Node node) { nodes.add(node); @@ -36,4 +36,5 @@ class OrderedReadyNodes { public boolean isEmpty() { return nodes.isEmpty(); } + } diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/PhaseNameProvider.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/PhaseNameProvider.java index a44cbad4b2f..f99a9191150 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/PhaseNameProvider.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/PhaseNameProvider.java @@ -4,9 +4,10 @@ package com.yahoo.component.chain.dependencies.ordering; /** * A phase providing a given name. * - * @author tonytv + * @author Tony Vaagenes */ class PhaseNameProvider extends NameProvider { + public PhaseNameProvider(String name, int priority) { super(name,priority); } @@ -25,4 +26,5 @@ class PhaseNameProvider extends NameProvider { int classPriority() { return 0; } + } diff --git a/chain/src/main/java/com/yahoo/component/chain/model/ChainSpecification.java b/chain/src/main/java/com/yahoo/component/chain/model/ChainSpecification.java index 2f6a03cbb87..eac76afa275 100644 --- a/chain/src/main/java/com/yahoo/component/chain/model/ChainSpecification.java +++ b/chain/src/main/java/com/yahoo/component/chain/model/ChainSpecification.java @@ -12,10 +12,11 @@ import java.util.*; /** * Specifies how the components should be selected to create a chain. * - * @author tonytv + * @author Tony Vaagenes */ @Immutable public class ChainSpecification { + public static class Inheritance { public final Set<ComponentSpecification> chainSpecifications; public final Set<ComponentSpecification> excludedComponents; diff --git a/chain/src/main/java/com/yahoo/component/chain/model/ChainedComponentModel.java b/chain/src/main/java/com/yahoo/component/chain/model/ChainedComponentModel.java index bc728f0fdd1..cce51824942 100644 --- a/chain/src/main/java/com/yahoo/component/chain/model/ChainedComponentModel.java +++ b/chain/src/main/java/com/yahoo/component/chain/model/ChainedComponentModel.java @@ -9,8 +9,8 @@ import net.jcip.annotations.Immutable; /** * Describes how a chained component should be created. * - * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a> - * @author tonytv + * @author Arne Bergene Fossaa + * @author Tony Vaagenes */ @Immutable public class ChainedComponentModel extends ComponentModel { diff --git a/chain/src/main/java/com/yahoo/component/chain/model/ChainsModel.java b/chain/src/main/java/com/yahoo/component/chain/model/ChainsModel.java index be0b124c383..08cb6b7ccfd 100644 --- a/chain/src/main/java/com/yahoo/component/chain/model/ChainsModel.java +++ b/chain/src/main/java/com/yahoo/component/chain/model/ChainsModel.java @@ -12,7 +12,7 @@ import com.yahoo.component.provider.ComponentRegistry; /** * A model of how the chains and components should be created. * - * @author tonytv + * @author Tony Vaagenes */ public class ChainsModel { diff --git a/chain/src/main/java/com/yahoo/component/chain/model/ChainsModelBuilder.java b/chain/src/main/java/com/yahoo/component/chain/model/ChainsModelBuilder.java index f7c771c1e60..5f9f2daa177 100644 --- a/chain/src/main/java/com/yahoo/component/chain/model/ChainsModelBuilder.java +++ b/chain/src/main/java/com/yahoo/component/chain/model/ChainsModelBuilder.java @@ -14,7 +14,7 @@ import com.yahoo.container.core.ChainsConfig; /** * Builds a chains model from config. * - * @author tonytv + * @author Tony Vaagenes */ public class ChainsModelBuilder { diff --git a/chain/src/main/java/com/yahoo/component/chain/model/ComponentAdaptor.java b/chain/src/main/java/com/yahoo/component/chain/model/ComponentAdaptor.java index 142af91f0fd..2961768a7de 100644 --- a/chain/src/main/java/com/yahoo/component/chain/model/ComponentAdaptor.java +++ b/chain/src/main/java/com/yahoo/component/chain/model/ComponentAdaptor.java @@ -7,7 +7,7 @@ import com.yahoo.component.ComponentId; /** * For using non-component model classes with ComponentRegistry. * - * @author tonytv + * @author Tony Vaagenes */ public final class ComponentAdaptor<T> extends AbstractComponent { diff --git a/chain/src/main/java/com/yahoo/component/chain/model/Resolver.java b/chain/src/main/java/com/yahoo/component/chain/model/Resolver.java index 5f6b3ce7905..15acff0db0b 100644 --- a/chain/src/main/java/com/yahoo/component/chain/model/Resolver.java +++ b/chain/src/main/java/com/yahoo/component/chain/model/Resolver.java @@ -6,8 +6,10 @@ import com.yahoo.component.ComponentSpecification; /** * Maps component specifications to matching instances. * - * @author tonytv + * @author Tony Vaagenes */ public interface Resolver<T> { + T resolve(ComponentSpecification componentSpecification); + } diff --git a/chain/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java b/chain/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java index 9d302174a47..7e74a732893 100644 --- a/chain/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java +++ b/chain/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java @@ -22,8 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** - * @author tonytv - * @since 5.1.10 + * @author Tony Vaagenes */ @SuppressWarnings({"rawtypes", "unchecked"}) public class ChainBuilderTest { diff --git a/chain/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java b/chain/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java index 8dde4ac3ea5..77729a99012 100644 --- a/chain/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java +++ b/chain/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java @@ -16,10 +16,12 @@ import com.yahoo.component.ComponentId; /** * Test for OrderedReadyNodes. - * @author tonytv + * + * @author Tony Vaagenes */ @SuppressWarnings("rawtypes") public class OrderedReadyNodesTest { + class ComponentA extends ChainedComponent { public ComponentA(ComponentId id) { super(id); @@ -101,4 +103,5 @@ public class OrderedReadyNodesTest { private Node pop() { return readyNodes.pop(); } + } diff --git a/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java b/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java index a946d568704..2a22b5afbf7 100644 --- a/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java +++ b/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java @@ -17,7 +17,6 @@ import static org.junit.Assert.assertTrue; /** * @author gjoranv - * @since 5.1.10 */ public class ChainsModelBuilderTest { @@ -69,4 +68,5 @@ public class ChainsModelBuilderTest { getComponentsByName(Set<ComponentSpecification> componentSpecifications) { return ChainSpecification.componentsByName(componentSpecifications); } + } diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java index 06f3ecbf5e3..4bc09898361 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java @@ -104,4 +104,5 @@ public class ClusterController extends AbstractComponent void shutdownController(FleetController controller) throws Exception { controller.shutdown(); } + } diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java index 98c09bdd61a..0936f9d781a 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java @@ -98,4 +98,5 @@ public class ClusterControllerClusterConfigurer { } } } + } diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java index 320020ef6d4..f961297643e 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java @@ -4,8 +4,7 @@ package com.yahoo.vespa.clustercontroller.apps.clustercontroller; /** * A dummy zookeeper provider when we do not run our own zookeeper instance. * - * @author lulf - * @since 5.26 + * @author Ulf Lilleengen */ public class DummyZooKeeperProvider implements ZooKeeperProvider { } diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java index 1cc8155657f..cbb1eb41eac 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java @@ -6,10 +6,11 @@ import com.yahoo.vespa.zookeeper.ZooKeeperServer; /** * ZooKeeper provider that ensures we are running our own instance of zookeeper. * - * @author lulf - * @since 5.26 + * @author Ulf Lilleengen */ public class StandaloneZooKeeperProvider implements ZooKeeperProvider { + public StandaloneZooKeeperProvider(ZooKeeperServer server) { } + } diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java index cb0132c18d6..431fc797df6 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java @@ -62,4 +62,5 @@ public class StateRestApiV2Handler extends JDiscHttpRequestHandler { } return set; } + } diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandler.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandler.java index 16ac6bfcbe7..ae7c32e0f95 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandler.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandler.java @@ -8,6 +8,7 @@ import com.yahoo.vespa.clustercontroller.apputil.communication.http.JDiscHttpReq import java.util.concurrent.Executor; public class StatusHandler extends JDiscHttpRequestHandler { + private final com.yahoo.vespa.clustercontroller.core.status.StatusHandler statusHandler; @Inject @@ -19,4 +20,5 @@ public class StatusHandler extends JDiscHttpRequestHandler { super(handler, executor, accessLog); this.statusHandler = handler; } + } diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java index 68baa5f0480..bb18bcc65d6 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java @@ -4,8 +4,7 @@ package com.yahoo.vespa.clustercontroller.apps.clustercontroller; /** * Abstraction we can depend on providing us with a zookeeper server being up. * - * @author lulf - * @since 5.25 + * @author Ulf Lilleengen */ public interface ZooKeeperProvider { } diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurerTest.java index 3316f05ce60..f437e6aa67d 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurerTest.java @@ -79,4 +79,5 @@ public class ClusterControllerClusterConfigurerTest extends TestCase { assertEquals("Must set zookeeper server with multiple fleetcontrollers", e.getMessage()); } } + } diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerTest.java index f026aa3f0ef..fcef483e7d7 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerTest.java @@ -13,6 +13,7 @@ import junit.framework.TestCase; import java.util.Map; public class ClusterControllerTest extends TestCase { + private FleetControllerOptions options = new FleetControllerOptions("storage"); private Metric metric = new Metric() { @Override diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java index 25d6e1846da..524aba1398b 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java @@ -48,4 +48,5 @@ public class StateRestApiV2HandlerTest extends TestCase { assertEquals(expected, mapping); } + } diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java index a904f46c2ae..66cb477e793 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java @@ -16,4 +16,5 @@ public class StatusHandlerTest extends TestCase { StatusHandler handler = new StatusHandler(controller, executor, AccessLog.voidAccessLog()); executor.shutdown(); } + } diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java index 89127b99d7c..11d746ef3ce 100644 --- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java +++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheAsyncHttpClient.java @@ -21,10 +21,13 @@ import java.util.logging.Logger; * This class gets around these issues by creating one instance per unique setting, and ensuring only one request use a given instance at a time. */ public class ApacheAsyncHttpClient implements AsyncHttpClient<HttpResult> { + private static final Logger log = Logger.getLogger(ApacheAsyncHttpClient.class.getName()); + public interface SyncHttpClientFactory { SyncHttpClient createInstance(String proxyHost, int proxyPort, long timeoutMs); } + public static class Settings { String proxyHost; int proxyPort; @@ -176,4 +179,5 @@ public class ApacheAsyncHttpClient implements AsyncHttpClient<HttpResult> { apacheInstances.clear(); } } + } diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java index 02195701243..3eafd2ae1d5 100644 --- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java +++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/ApacheHttpInstance.java @@ -30,6 +30,7 @@ import org.apache.http.params.HttpParams; * Synchronous http client using Apache commons. */ public class ApacheHttpInstance implements SyncHttpClient { + private static final Logger log = Logger.getLogger(ApacheHttpInstance.class.getName()); DefaultHttpClient client; @@ -128,4 +129,5 @@ public class ApacheHttpInstance implements SyncHttpClient { public void close() { client.getConnectionManager().shutdown(); } + } diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java index aa44845561e..1069bd79b4f 100644 --- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java +++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; /** * Note. This class is tested through apache http instance test, using this as other endpoint. - * @author humbe + * @author Haakon Humberset * @author Harald Musum * @author Vegard Sjonfjell */ @@ -124,4 +124,5 @@ public class JDiscHttpRequestHandler extends LoggingRequestHandler { } return headers; } + } diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java index 0f203dac3bf..559eaee4821 100644 --- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java +++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapper.java @@ -7,6 +7,7 @@ import com.yahoo.vespa.clustercontroller.utils.util.MetricReporter; import java.util.logging.Logger; public class JDiscMetricWrapper implements MetricReporter { + private final Object lock = new Object(); private Metric m; @@ -47,4 +48,5 @@ public class JDiscMetricWrapper implements MetricReporter { return new ContextWrapper(m.createContext(stringMap)); } } + } diff --git a/clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java b/clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java index 278f6a9e1fa..13abfa0ecd5 100644 --- a/clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java +++ b/clustercontroller-apputil/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java @@ -10,6 +10,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class JDiscMetricWrapperTest { + class MetricImpl implements Metric { int calls = 0; @Override @@ -41,4 +42,5 @@ public class JDiscMetricWrapperTest { assertEquals(5, impl2.calls); } + } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java index 414cc56b1e3..c9cc51af867 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java @@ -19,8 +19,7 @@ import java.util.List; /** * Builds the config model for the standalone config server. * - * @author lulf - * @since 5.16 + * @author Ulf Lilleengen */ public class ConfigServerContainerModelBuilder extends ContainerModelBuilder { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java index 377b3997e43..70be29fa80d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java @@ -51,14 +51,12 @@ import java.util.logging.Logger; * @author Vegard Havdal * @author Ulf Lilleengen */ -//TODO Rename to TenantRepository +// TODO: Rename to TenantRepository public class Tenants implements ConnectionStateListener, PathChildrenCacheListener { public static final TenantName HOSTED_VESPA_TENANT = TenantName.from("hosted-vespa"); private static final TenantName DEFAULT_TENANT = TenantName.defaultName(); - private static final List<TenantName> SYSTEM_TENANT_NAMES = Arrays.asList( - DEFAULT_TENANT, - HOSTED_VESPA_TENANT); + private static final List<TenantName> SYSTEM_TENANT_NAMES = Arrays.asList(DEFAULT_TENANT, HOSTED_VESPA_TENANT); private static final Path tenantsPath = Path.fromString("/config/v2/tenants/"); private static final Path vespaPath = Path.fromString("/vespa"); diff --git a/vespajlib/src/main/java/com/yahoo/collections/ByteArrayComparator.java b/vespajlib/src/main/java/com/yahoo/collections/ByteArrayComparator.java index d6f73cea3e2..d8b964a2a3c 100644 --- a/vespajlib/src/main/java/com/yahoo/collections/ByteArrayComparator.java +++ b/vespajlib/src/main/java/com/yahoo/collections/ByteArrayComparator.java @@ -5,9 +5,10 @@ package com.yahoo.collections; * Utility class which is useful when implementing <code>Comparable</code> and one needs to * compare byte arrays as instance variables. * - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class ByteArrayComparator { + /** * Compare the arguments. Shorter arrays are always considered * smaller than longer arrays. For arrays of equal lengths, the elements @@ -29,17 +30,18 @@ public class ByteArrayComparator { return 1; } - //lengths are equal, compare contents + // lengths are equal, compare contents for (int i = 0; i < first.length; i++) { if (first[i] < second[i]) { return -1; } else if (first[i] > second[i]) { return 1; } - //values at index i are equal, continue... + // values at index i are equal, continue... } - //we haven't returned yet; contents must be equal: + // we haven't returned yet; contents must be equal: return 0; } + } |