diff options
79 files changed, 279 insertions, 308 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/Container.java b/container-core/src/main/java/com/yahoo/container/Container.java index 031d4a26d05..70167453e21 100755 --- a/container-core/src/main/java/com/yahoo/container/Container.java +++ b/container-core/src/main/java/com/yahoo/container/Container.java @@ -32,7 +32,7 @@ public class Container { private volatile FileAcquirer fileAcquirer; private volatile UrlDownloader urlDownloader; - private static Logger logger = Logger.getLogger(Container.class.getName()); + private static final Logger logger = Logger.getLogger(Container.class.getName()); // TODO: Make this final again. private static Container instance = new Container(); @@ -52,7 +52,7 @@ public class Container { } /** - * Hack. For internal use only, will be removed later + * Hack. For internal use only, will be removed later. * * Used by Application to be able to repeatedly set up containers. */ @@ -93,7 +93,7 @@ public class Container { this.componentRegistry = registry; } - //Only intended for use by the Server instance. + // Only intended for use by the Server instance. public void setupFileAcquirer(QrConfig.Filedistributor filedistributorConfig) { if (usingCustomFileAcquirer) return; @@ -109,9 +109,7 @@ public class Container { setPathAcquirer(fileAcquirer); } - /** - * Only for internal use. - */ + /** Only for internal use. */ public void setCustomFileAcquirer(FileAcquirer fileAcquirer) { if (this.fileAcquirer != null) { throw new RuntimeException("Can't change file acquirer. Is " + diff --git a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java index 6ecb6c75f90..5bb506fbd6a 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java @@ -21,9 +21,11 @@ import java.util.stream.Collectors; * @author Tony Vaagenes */ public class ApplicationBundleLoader { + private static final Logger log = Logger.getLogger(ApplicationBundleLoader.class.getName()); - /* Map of file refs of active bundles (not scheduled for uninstall) to the installed bundle. + /** + * Map of file refs of active bundles (not scheduled for uninstall) to the installed bundle. * * Used to: * 1. Avoid installing already installed bundles. Just an optimization, installing the same bundle location is a NOP diff --git a/container-core/src/main/java/com/yahoo/container/core/config/FileAcquirerBundleInstaller.java b/container-core/src/main/java/com/yahoo/container/core/config/FileAcquirerBundleInstaller.java index 51d77462652..97a11ce7507 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/FileAcquirerBundleInstaller.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/FileAcquirerBundleInstaller.java @@ -18,7 +18,8 @@ import java.util.logging.Logger; * @author gjoranv */ public class FileAcquirerBundleInstaller { - private static Logger log = Logger.getLogger(FileAcquirerBundleInstaller.class.getName()); + + private static final Logger log = Logger.getLogger(FileAcquirerBundleInstaller.class.getName()); private final FileAcquirer fileAcquirer; @@ -39,8 +40,8 @@ public class FileAcquirerBundleInstaller { retries++; } if (notReadable(file)) { - com.yahoo.protect.Process.logAndDie("Shutting down - unable to read bundle file with reference '" + reference - + "' and path " + file.getAbsolutePath()); + com.yahoo.protect.Process.logAndDie("Shutting down - unable to read bundle file with reference '" + + reference + "' and path " + file.getAbsolutePath()); } } diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 9c0951c1c95..af163e88fee 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -37,7 +37,6 @@ import java.util.logging.Logger; import static com.yahoo.collections.CollectionUtil.first; - /** * For internal use only. * diff --git a/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java index 0ab89e223f6..3951e656736 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; * @author gjoranv */ public class PlatformBundleLoader { + private static final Logger log = Logger.getLogger(PlatformBundleLoader.class.getName()); private final Osgi osgi; diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java index 2ae33347408..f36e0031ec8 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java @@ -35,12 +35,13 @@ import java.util.concurrent.Executors; * */ public class HandlersConfigurerTestWrapper { - private ConfigSourceSet configSources = + + private final ConfigSourceSet configSources = new ConfigSourceSet(this.getClass().getSimpleName() + ": " + new Random().nextLong()); - private HandlersConfigurerDi configurer; + private final HandlersConfigurerDi configurer; // TODO: Remove once tests use ConfigSet rather than dir: - private final static String testFiles[] = { + private final static String[] testFiles = { "components.cfg", "handlers.cfg", "platform-bundles.cfg", @@ -143,8 +144,12 @@ public class HandlersConfigurerTestWrapper { } private static class SimpleContainerThreadpool implements ContainerThreadPool { + private final Executor executor = Executors.newCachedThreadPool(); - @Override public Executor executor() { return executor; } + + @Override + public Executor executor() { return executor; } + } } diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java index 98c927b8efd..356f302f7c0 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java @@ -37,4 +37,5 @@ public class MockOsgiWrapper implements OsgiWrapper { @Override public void allowDuplicateBundles(Collection<Bundle> bundles) { } + } diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java index 2ec5d34a0a6..7593e4dfecb 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java @@ -92,7 +92,7 @@ public class Coverage { } /** - * The number of documents searched for this result. If the final result + * Returns the number of documents searched for this result. If the final result * set is produced through several queries, this number will be the sum * for all the queries. */ @@ -100,18 +100,12 @@ public class Coverage { return docs; } - /** - * Total number of documents that could be searched. - * - * @return Total number of active documents - */ + /** Returns the total number of documents that could be searched. */ public long getActive() { return active; } /** - * Total number of documents that will be searchable once redistribution has settled. - * Still in beta, sematics not finalized yet. - * - * @return Total number of documents that will soon be available. + * Returns the total number of documents that will be searchable once redistribution has settled. + * Still in beta, semantics not finalized yet. */ @Beta public long getSoonActive() { return soonActive; } @@ -122,9 +116,7 @@ public class Coverage { public boolean isDegradedByAdapativeTimeout() { return (degradedReason & DEGRADED_BY_ADAPTIVE_TIMEOUT) != 0; } public boolean isDegradedByNonIdealState() { return (degradedReason == 0) && (getResultPercentage() != 100);} - /** - * @return whether the search had full coverage or not - */ + /** Returns whether the search had full coverage or not */ public boolean getFull() { switch (fullReason) { case EXPLICITLY_FULL: @@ -138,16 +130,12 @@ public class Coverage { } } - /** - * @return the number of search instances which participated successfully in the search. - */ + /** Returns the number of search instances which participated successfully in the search. */ public int getNodes() { return nodes; } - /** - * @return the number of search instances which tried to participate in the search. - */ + /** Returns the number of search instances which tried to participate in the search. */ public int getNodesTried() { return nodesTried; } diff --git a/container-core/src/main/java/com/yahoo/container/handler/Prefix.java b/container-core/src/main/java/com/yahoo/container/handler/Prefix.java index 076e0b32a58..2fec5f07736 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Prefix.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Prefix.java @@ -49,4 +49,5 @@ public final class Prefix implements Comparable<Prefix> { public String toString() { return prefix + ": " + handler; } + } diff --git a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java index ae313b1b04c..a07898cb1d1 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java +++ b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java @@ -58,7 +58,7 @@ public class ThreadPoolProvider extends AbstractComponent implements Provider<Ex public Executor get() { return threadpool.executor(); } /** - * Shutdown the thread pool, give a grace period of 1 second before forcibly + * Shut down the thread pool, give a grace period of 1 second before forcibly * shutting down all worker threads. */ @Override diff --git a/container-core/src/main/java/com/yahoo/container/handler/Timing.java b/container-core/src/main/java/com/yahoo/container/handler/Timing.java index e52928404be..0026854ce61 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Timing.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Timing.java @@ -70,4 +70,5 @@ public class Timing { public long getTimeout() { return timeout; } + } diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java index f2df5ddb7c5..04d03a44fb6 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java @@ -70,8 +70,7 @@ public final class VipStatusHandler extends ThreadedHttpRequestHandler { stream.write(data); } else { - throw new IllegalStateException( - "Neither file nor hardcoded data. This is a bug, please notify the Vespa team."); + throw new IllegalStateException("Neither file nor hardcoded data. This is a bug."); } stream.close(); } @@ -158,7 +157,6 @@ public final class VipStatusHandler extends ThreadedHttpRequestHandler { * out of capacity. This is the default behavior. */ @Inject - @SuppressWarnings("unused") // injected public VipStatusHandler(VipStatusConfig vipConfig, Metric metric, VipStatus vipStatus) { // One thread should be enough for status handling - otherwise something else is completely wrong, // in which case this will eventually start returning a 503 (due to work rejection) as the bounded diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java index 1fcde746878..c59dc2939a5 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java @@ -13,9 +13,10 @@ import static java.util.logging.Level.WARNING; * @author gjoranv */ public class ErrorResponse extends JsonResponse { - private static Logger log = Logger.getLogger(ErrorResponse.class.getName()); - private static ObjectMapper objectMapper = new ObjectMapper(); + private static final Logger log = Logger.getLogger(ErrorResponse.class.getName()); + + private static final ObjectMapper objectMapper = new ObjectMapper(); public ErrorResponse(int code, String message) { super(code, asErrorJson(message != null ? message : "<null>")); @@ -29,4 +30,5 @@ public class ErrorResponse extends JsonResponse { return "Could not encode error message to json, check the log for details."; } } + } diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java index def06ce9de3..fc817332079 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java @@ -11,6 +11,7 @@ import java.nio.charset.Charset; * @author gjoranv */ public class JsonResponse extends HttpResponse { + private final byte[] data; public JsonResponse(int code, String data) { @@ -27,4 +28,5 @@ public class JsonResponse extends HttpResponse { public void render(OutputStream outputStream) throws IOException { outputStream.write(data); } + } diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java index 78ea62e1b3a..a4a092b02ad 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java @@ -74,4 +74,5 @@ public class MetricsV2Handler extends HttpHandlerBase { static String consumerQuery(String consumer) { return (consumer == null || consumer.isEmpty()) ? "" : "?consumer=" + consumer; } + } diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java index e33f2f47828..00fb488489e 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java @@ -20,6 +20,9 @@ import org.apache.http.impl.client.CloseableHttpClient; import static com.yahoo.container.handler.metrics.MetricsV2Handler.consumerQuery; import static com.yahoo.jdisc.Response.Status.INTERNAL_SERVER_ERROR; +/** + * @author Oracien + */ public class PrometheusV1Handler extends HttpHandlerBase{ public static final String V1_PATH = "/prometheus/v1"; diff --git a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java index eef80e95b3d..0228bc06c51 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java +++ b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java @@ -43,18 +43,18 @@ import java.util.logging.Logger; @Beta public class MockService extends LoggingRequestHandler { - private MockServiceHandler handler; + private final MockServiceHandler handler; /** * Create a mock service that mocks an external service using data provided via file distribution. * A custom handler can be created by subclassing and overriding the createHandler method. * - * @param executor An {@link Executor} used to create threads. - * @param accessLog An {@link AccessLog} where requests will be logged. - * @param fileAcquirer A {@link FileAcquirer} which is used to fetch file from config. - * @param config A {@link MockserviceConfig} for this service. - * @throws InterruptedException if unable to get data file within timeout. - * @throws IOException if unable to create handler due to some IO errors. + * @param executor used to create threads + * @param accessLog where requests will be logged + * @param fileAcquirer used to fetch file from config + * @param config the mock config for this service + * @throws InterruptedException if unable to get data file within timeout + * @throws IOException if unable to create handler due to some IO errors */ public MockService(Executor executor, AccessLog accessLog, FileAcquirer fileAcquirer, MockserviceConfig config, Metric metric) throws InterruptedException, IOException { super(executor, accessLog, metric); @@ -65,9 +65,9 @@ public class MockService extends LoggingRequestHandler { /** * Create a handler for a file. Override this method to handle a custom file syntax of your own. * - * @param dataFile A file to read. - * @return a {@link MockServiceHandler} used to handle requests. - * @throws IOException if errors occured when loading the file + * @param dataFile the file to read + * @return the handler used to handle requests + * @throws IOException if errors occurred when loading the file */ protected MockServiceHandler createHandler(File dataFile) throws IOException { if (!dataFile.getName().endsWith(".txt")) { @@ -210,7 +210,7 @@ public class MockService extends LoggingRequestHandler { } } - private class ExceptionResponse extends HttpResponse { + private static class ExceptionResponse extends HttpResponse { private final Exception e; public ExceptionResponse(int code, Exception e) { super(code); @@ -224,4 +224,5 @@ public class MockService extends LoggingRequestHandler { } } } + } diff --git a/container-core/src/main/java/com/yahoo/container/handler/test/MockServiceHandler.java b/container-core/src/main/java/com/yahoo/container/handler/test/MockServiceHandler.java index 0a246431e43..2ef3d66d501 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/test/MockServiceHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/test/MockServiceHandler.java @@ -8,17 +8,17 @@ import com.yahoo.container.jdisc.HttpRequest; * A service handler that is able to map a request to a key and retrieve a value given a key. * * @author Ulf Lilleengen - * @since 5.1.21 */ @Beta public interface MockServiceHandler { + /** * Create a custom Key given a http request. This will be called for each request, and allows a handler * to customize its key format. * @param request The client http request. * @return a {@link Key} used to query for the value. */ - public Key createKey(HttpRequest request); + Key createKey(HttpRequest request); /** * Lookup a {@link Value} for a {@link Key}. Returns null if the key is not found. @@ -26,9 +26,10 @@ public interface MockServiceHandler { * @param key The {@link Key} to look up. * @return A {@link Value} used as response. */ - public Value get(Key key); + Value get(Key key); + + final class Value { - public final class Value { public final int returnCode; public final byte[] data; public final String contentType; @@ -38,10 +39,13 @@ public interface MockServiceHandler { this.data = data; this.contentType = contentType; } + } - public interface Key { - public int hashCode(); - public boolean equals(Object other); + interface Key { + + int hashCode(); + boolean equals(Object other); + } } diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/DefaultContainerThreadpool.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/DefaultContainerThreadpool.java index 46b3a86798b..b346d42197e 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/DefaultContainerThreadpool.java +++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/DefaultContainerThreadpool.java @@ -49,9 +49,14 @@ public class DefaultContainerThreadpool extends AbstractComponent implements Aut config.name(), config.queueSize()); } - @Override public Executor executor() { return threadpool; } - @Override public void close() { closeInternal(); } - @Override public void deconstruct() { closeInternal(); super.deconstruct(); } + @Override + public Executor executor() { return threadpool; } + + @Override + public void close() { closeInternal(); } + + @Override + public void deconstruct() { closeInternal(); super.deconstruct(); } /** * Shutdown the thread pool, give a grace period of 1 second before forcibly diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ExecutorServiceWrapper.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ExecutorServiceWrapper.java index 771c1da82b6..8e0d11c3171 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ExecutorServiceWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ExecutorServiceWrapper.java @@ -28,10 +28,12 @@ class ExecutorServiceWrapper extends ForwardingExecutorService { private final Thread metricReporter; private final AtomicBoolean closed = new AtomicBoolean(false); - ExecutorServiceWrapper( - WorkerCompletionTimingThreadPoolExecutor wrapped, - ThreadPoolMetric metric, ProcessTerminator processTerminator, - long maxThreadExecutionTimeMillis, String name, int queueCapacity) { + ExecutorServiceWrapper(WorkerCompletionTimingThreadPoolExecutor wrapped, + ThreadPoolMetric metric, + ProcessTerminator processTerminator, + long maxThreadExecutionTimeMillis, + String name, + int queueCapacity) { this.wrapped = wrapped; this.metric = metric; this.processTerminator = processTerminator; diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/WorkerCompletionTimingThreadPoolExecutor.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/WorkerCompletionTimingThreadPoolExecutor.java index 56f8319c110..1f64cdbdc40 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/WorkerCompletionTimingThreadPoolExecutor.java +++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/WorkerCompletionTimingThreadPoolExecutor.java @@ -17,21 +17,18 @@ import java.util.concurrent.atomic.AtomicLong; */ class WorkerCompletionTimingThreadPoolExecutor extends ThreadPoolExecutor { - - volatile long lastThreadAssignmentTimeMillis = System.currentTimeMillis(); private final AtomicLong startedCount = new AtomicLong(0); private final AtomicLong completedCount = new AtomicLong(0); private final ThreadPoolMetric metric; - WorkerCompletionTimingThreadPoolExecutor( - int corePoolSize, - int maximumPoolSize, - long keepAliveTime, - TimeUnit unit, - BlockingQueue<Runnable> workQueue, - ThreadFactory threadFactory, - ThreadPoolMetric metric) { + WorkerCompletionTimingThreadPoolExecutor(int corePoolSize, + int maximumPoolSize, + long keepAliveTime, + TimeUnit unit, + BlockingQueue<Runnable> workQueue, + ThreadFactory threadFactory, + ThreadPoolMetric metric) { super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory); this.metric = metric; } @@ -56,5 +53,6 @@ class WorkerCompletionTimingThreadPoolExecutor extends ThreadPoolExecutor { public int getActiveCount() { return (int)(startedCount.get() - completedCount.get()); } + } diff --git a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java index 31bceca9337..688d2c1c5be 100644 --- a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java +++ b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java @@ -38,6 +38,7 @@ import static java.util.stream.Collectors.toSet; * @author bjorncs */ public class FilterChainRepository extends AbstractComponent { + private static final Logger log = Logger.getLogger(FilterChainRepository.class.getName()); private final ComponentRegistry<Object> filterAndChains; @@ -198,4 +199,5 @@ public class FilterChainRepository extends AbstractComponent { throw new IllegalArgumentException("Unsupported filter type: " + filter.getClass().getName()); } } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java index 592cbff8440..6ed467a465c 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java @@ -32,13 +32,9 @@ public abstract class AsyncHttpResponse extends HttpResponse { * output (using the provided channel and completion handler) when (async) * rendering is completed. * - * @param output - * the stream to which content should be rendered - * @param networkChannel - * the channel which must be closed on completion - * @param handler - * the completion handler to submit when closing the channel, may - * be null + * @param output the stream to which content should be rendered + * @param networkChannel the channel which must be closed on completion + * @param handler the completion handler to submit when closing the channel, may be null */ public abstract void render(OutputStream output, ContentChannel networkChannel, CompletionHandler handler) throws IOException; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java b/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java index 329889e70c0..1d4c20efe5e 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java @@ -29,7 +29,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable private boolean failed = false; private final Object failLock = new Object(); - public ContentChannelOutputStream(final ContentChannel endpoint) { + public ContentChannelOutputStream(ContentChannel endpoint) { this.endpoint = endpoint; buffer = new BufferChain(this); } @@ -38,7 +38,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable * Buffered write of a single byte. */ @Override - public void write(final int b) throws IOException { + public void write(int b) throws IOException { try { buffer.append((byte) b); } catch (RuntimeException e) { @@ -74,8 +74,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable * It is in other words safe to recycle the array {@code b}. */ @Override - public void write(final byte[] b, final int off, final int len) - throws IOException { + public void write(byte[] b, int off, int len) throws IOException { nonCopyingWrite(Arrays.copyOfRange(b, off, off + len)); } @@ -85,7 +84,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable * It is in other words safe to recycle the array {@code b}. */ @Override - public void write(final byte[] b) throws IOException { + public void write(byte[] b) throws IOException { nonCopyingWrite(Arrays.copyOf(b, b.length)); } @@ -94,8 +93,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable * <i>transferring</i> ownership of that array to this stream. It is in * other words <i>not</i> safe to recycle the array {@code b}. */ - public void nonCopyingWrite(final byte[] b, final int off, final int len) - throws IOException { + public void nonCopyingWrite(byte[] b, int off, int len) throws IOException { try { buffer.append(b, off, len); } catch (RuntimeException e) { @@ -108,7 +106,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable * <i>transferring</i> ownership of that array to this stream. It is in * other words <i>not</i> safe to recycle the array {@code b}. */ - public void nonCopyingWrite(final byte[] b) throws IOException { + public void nonCopyingWrite(byte[] b) throws IOException { try { buffer.append(b); } catch (RuntimeException e) { @@ -125,27 +123,23 @@ public class ContentChannelOutputStream extends OutputStream implements Writable * the ByteBuffer to this stream. */ @Override - public void send(final ByteBuffer src) throws IOException { - // Don't do a buffer.flush() from here, this method is used by the - // buffer itself + public void send(ByteBuffer src) throws IOException { + // Don't do a buffer.flush() from here, this method is used by the buffer itself try { - byteBufferData += (long) src.remaining(); + byteBufferData += src.remaining(); endpoint.write(src, new LoggingCompletionHandler()); } catch (RuntimeException e) { throw new IOException(Exceptions.toMessageString(e), e); } } - /** - * Give the number of bytes written. - * - * @return the number of bytes written to this stream - */ + /** Returns the number of bytes written to this stream */ public long written() { return buffer.appended() + byteBufferData; } class LoggingCompletionHandler implements CompletionHandler { + @Override public void completed() { } @@ -166,4 +160,5 @@ public class ContentChannelOutputStream extends OutputStream implements Writable } } } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java index 88c6291fb26..737017b7957 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java @@ -5,8 +5,7 @@ import java.io.IOException; import java.io.OutputStream; /** - * Placeholder response when no content, only headers and status is to be - * returned. + * Placeholder response when no content, only headers and status is to be returned. * * @author Steinar Knutsen */ @@ -19,4 +18,5 @@ public class EmptyResponse extends HttpResponse { public void render(OutputStream outputStream) throws IOException { // NOP } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java index edd24fed515..e202442479f 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java @@ -55,7 +55,7 @@ public class HttpRequest { InputStream requestData = null; URI uri = null; CurrentContainer container = null; - private String nag = " must be set before the attempted operation."; + private final String nag = " must be set before the attempted operation."; SocketAddress remoteAddress; private void boom(Object ref, String what) { @@ -99,9 +99,7 @@ public class HttpRequest { * {@link #jdiscRequest(com.yahoo.jdisc.http.HttpRequest)} before * instantiating any HTTP request. * - * @param request - * source for defaults and parent JDisc request, may be null - * + * @param request source for defaults and parent JDisc request, may be null * @see HttpRequest#createTestRequest(String, com.yahoo.jdisc.http.HttpRequest.Method) */ public Builder(HttpRequest request) { @@ -111,9 +109,7 @@ public class HttpRequest { /** * Instantiate a request builder with defaults from an existing request. * - * @param request - * parent JDisc request - * + * @param request parent JDisc request * @see HttpRequest#createTestRequest(String, com.yahoo.jdisc.http.HttpRequest.Method) */ public Builder(com.yahoo.jdisc.http.HttpRequest request) { @@ -216,8 +212,7 @@ public class HttpRequest { } /** - * Start of API for synchronous HTTP request dispatch. Not yet ready for - * use. + * Start of API for synchronous HTTP request dispatch. Not yet ready for use. * * @return a new client request */ @@ -244,8 +239,7 @@ public class HttpRequest { } /** - * Start of API for synchronous HTTP request dispatch. Not yet ready for - * use. + * Start of API for synchronous HTTP request dispatch. Not yet ready for use. * * @return a new server request */ @@ -277,8 +271,7 @@ public class HttpRequest { return new HttpRequest(serverRequest, requestData, properties); } - private void setParameters( - com.yahoo.jdisc.http.HttpRequest request) { + private void setParameters(com.yahoo.jdisc.http.HttpRequest request) { for (Map.Entry<String, String> entry : properties.entrySet()) { request.parameters().put(entry.getKey(), wrap(entry.getValue())); } @@ -290,10 +283,8 @@ public class HttpRequest { * Wrap a JDisc HTTP request in a synchronous API. The properties from the * JDisc request will be copied into the HTTP request. * - * @param jdiscHttpRequest - * the JDisc request - * @param requestData - * the associated input stream, e.g. with POST request + * @param jdiscHttpRequest the JDisc request + * @param requestData the associated input stream, e.g. with POST request */ public HttpRequest(com.yahoo.jdisc.http.HttpRequest jdiscHttpRequest, InputStream requestData) { this(jdiscHttpRequest, requestData, null); @@ -308,13 +299,10 @@ public class HttpRequest { * will obviously not be reflected by the request. The same applies for * JDisc parameters. * - * @param jdiscHttpRequest - * the JDisc request - * @param requestData - * the associated input stream, e.g. with POST request - * @param propertyOverrides - * properties which should not have the same settings as in the - * parent JDisc request, may be null + * @param jdiscHttpRequest the JDisc request + * @param requestData the associated input stream, e.g. with POST request + * @param propertyOverrides properties which should not have the same settings as in the + * parent JDisc request, may be null */ public HttpRequest(com.yahoo.jdisc.http.HttpRequest jdiscHttpRequest, InputStream requestData, Map<String, String> propertyOverrides) { @@ -495,8 +483,7 @@ public class HttpRequest { * Helper method to parse boolean request flags, using * Boolean.parseBoolean(String). Unset values are regarded as false. * - * @param name - * the name of a request property + * @param name the name of a request property * @return whether the property has been explicitly set to true */ public boolean getBooleanProperty(String name) { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java index 19460053469..064b6cf6279 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java @@ -37,24 +37,30 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler { } public static class Context { + final Executor executor; final AccessLog accessLog; final Metric metric; + @Inject public Context(Executor executor, AccessLog accessLog, Metric metric) { this.executor = executor; this.accessLog = accessLog; this.metric = metric; } + public Context(Context other) { this.executor = other.executor; this.accessLog = other.accessLog; this.metric = other.metric; } + public Executor getExecutor() { return executor; } public AccessLog getAccessLog() { return accessLog; } public Metric getMetric() { return metric; } + } + public static Context testOnlyContext() { return new Context(new Executor() { @Override @@ -254,15 +260,14 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler { } else { // Not running on JDisc http layer (Jetty), e.g unit tests AccessLogEntry accessLogEntry = new AccessLogEntry(); - populateAccessLogEntryNotCreatedByHttpServer( - accessLogEntry, - jdiscRequest, - extendedResponse.getTiming(), - httpRequest.getUri().toString(), - commitStartTime, - startTime, - rendererWiring.written(), - httpResponse.getStatus()); + populateAccessLogEntryNotCreatedByHttpServer(accessLogEntry, + jdiscRequest, + extendedResponse.getTiming(), + httpRequest.getUri().toString(), + commitStartTime, + startTime, + rendererWiring.written(), + httpResponse.getStatus()); accessLog.log(accessLogEntry); entry = accessLogEntry; } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java index a3e264c16ee..faa30bd109d 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; @Beta public class RequestHandlerTestDriver implements AutoCloseable { - private TestDriver driver; + private final TestDriver driver; private MockResponseHandler responseHandler = null; @@ -152,7 +152,7 @@ public class RequestHandlerTestDriver implements AutoCloseable { StringBuilder b = new StringBuilder(); while (content.available()>0) { ByteBuffer nextBuffer = content.read(); - b.append(Charset.forName("utf-8").decode(nextBuffer).toString()); + b.append(Charset.forName("utf-8").decode(nextBuffer)); } return b.toString(); } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index c46488694de..9687697d6f6 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -69,9 +69,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler @Override public final void handleRequest(Request request, BufferedContentChannel requestContent, ResponseHandler responseHandler) { - if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, "In " + this.getClass() + ".handleRequest()"); - } + log.log(Level.FINE, () -> "In " + this.getClass() + ".handleRequest()"); com.yahoo.jdisc.http.HttpRequest jdiscRequest = asHttpRequest(request); HttpRequest httpRequest = new HttpRequest(jdiscRequest, new UnsafeContentInputStream(requestContent.toReadable())); LazyContentChannel channel = null; @@ -95,8 +93,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler } /** Render and return whether the channel was closed */ - private void render(HttpRequest request, HttpResponse httpResponse, - LazyContentChannel channel, long startTime) { + private void render(HttpRequest request, HttpResponse httpResponse, LazyContentChannel channel, long startTime) { LoggingCompletionHandler logOnCompletion = null; ContentChannelOutputStream output = null; try { @@ -139,7 +136,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler private boolean closed = false; // Fields needed to lazily create or close the channel */ - private HttpRequest httpRequest; + private final HttpRequest httpRequest; private HttpResponse httpResponse; private final ResponseHandler responseHandler; private final Metric metric; @@ -227,29 +224,27 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler /** * Override this to implement custom access logging. * - * @param startTime - * execution start - * @param renderStartTime - * start of output rendering - * @param response - * the response which the log entry regards - * @param httpRequest - * the incoming HTTP request - * @param rendererWiring - * the stream the rendered response is written to, used for - * fetching length of rendered response + * @param startTime execution start + * @param renderStartTime start of output rendering + * @param response the response which the log entry regards + * @param httpRequest the incoming HTTP request + * @param rendererWiring the stream the rendered response is written to, used for + * fetching length of rendered response */ - protected LoggingCompletionHandler createLoggingCompletionHandler( - long startTime, long renderStartTime, HttpResponse response, - HttpRequest httpRequest, ContentChannelOutputStream rendererWiring) { + protected LoggingCompletionHandler createLoggingCompletionHandler(long startTime, + long renderStartTime, + HttpResponse response, + HttpRequest httpRequest, + ContentChannelOutputStream rendererWiring) { return null; } protected com.yahoo.jdisc.http.HttpRequest asHttpRequest(Request request) { if (!(request instanceof com.yahoo.jdisc.http.HttpRequest)) { - throw new IllegalArgumentException("Expected " - + com.yahoo.jdisc.http.HttpRequest.class.getName() + ", got " + request.getClass().getName()); + throw new IllegalArgumentException("Expected " + com.yahoo.jdisc.http.HttpRequest.class.getName() + + ", got " + request.getClass().getName()); } return (com.yahoo.jdisc.http.HttpRequest) request; } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java index 4c93613603b..446ee90c205 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java @@ -269,6 +269,7 @@ public abstract class ThreadedRequestHandler extends AbstractRequestHandler { private static class NullFeedContext implements Context { private static final NullFeedContext INSTANCE = new NullFeedContext(); } + } } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java b/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java index f6a089d6fd2..3236f7d2407 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java @@ -47,11 +47,7 @@ public final class VespaHeaders { private static final Tuple2<Boolean, Integer> NO_MATCH = new Tuple2<>(false, Response.Status.OK); public static boolean benchmarkCoverage(boolean benchmarkOutput, HeaderFields headers) { - if (benchmarkOutput && headers.get(BenchmarkingHeaders.REQUEST_COVERAGE) != null) { - return true; - } else { - return false; - } + return benchmarkOutput && headers.get(BenchmarkingHeaders.REQUEST_COVERAGE) != null; } /** Returns true if this is a benchmarking request, according to headers */ @@ -60,14 +56,14 @@ public final class VespaHeaders { } /** - * Add search benchmark output to the HTTP getHeaders + * Add search benchmark output to the HTTP getHeaders. * - * @param responseHeaders The response to write the headers to. - * @param benchmarkCoverage True to include coverage headers. - * @param t The Timing to read data from. - * @param c The Counts to read data from. - * @param errorCount The error count. - * @param coverage The Coverage to read data from. + * @param responseHeaders the response to write the headers to + * @param benchmarkCoverage true to include coverage headers + * @param t the Timing to read data from + * @param c the Counts to read data from + * @param errorCount the error count + * @param coverage the Coverage to read data from */ public static void benchmarkOutput(HeaderFields responseHeaders, boolean benchmarkCoverage, Timing t, HitCounts c, int errorCount, Coverage coverage) { @@ -106,10 +102,10 @@ public final class VespaHeaders { /** * (during normal execution) return 200 unless this is not a success or a 4xx error is requested. * - * @param isSuccess Whether or not the response represents a success. - * @param mainError The main error of the response, if any. - * @param allErrors All the errors of the response, if any. - * @return The status code of the given response. + * @param isSuccess whether or not the response represents a success + * @param mainError the main error of the response, if any + * @param allErrors all the errors of the response, if any + * @return the status code of the given response */ public static int getStatus(boolean isSuccess, ErrorMessage mainError, Iterator<? extends ErrorMessage> allErrors) { // Do note, SearchResponse has its own implementation of isSuccess() @@ -129,7 +125,7 @@ public final class VespaHeaders { Iterator<? extends ErrorMessage> errorIterator = allErrors; if (errorIterator != null && errorIterator.hasNext()) { - for (; errorIterator.hasNext();) { + while (errorIterator.hasNext()) { ErrorMessage error = errorIterator.next(); Tuple2<Boolean, Integer> status = chooseWebServiceStatus(error); if (status.first) { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/FileWrapper.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/FileWrapper.java index 6e22e02eb5b..3e127b87017 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/FileWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/FileWrapper.java @@ -24,4 +24,5 @@ public class FileWrapper { boolean isRegularFile(Path path) { return Files.isRegularFile(path); } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/GaugeMetric.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/GaugeMetric.java index 9b89b8abe52..9a195710c8f 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/GaugeMetric.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/GaugeMetric.java @@ -20,7 +20,7 @@ public final class GaugeMetric extends MetricValue { private double min; private double sum; private long count; - private Optional<List<Tuple2<String, Double>>> percentiles; + private final Optional<List<Tuple2<String, Double>>> percentiles; private GaugeMetric(double last, double max, double min, double sum, long count, Optional<List<Tuple2<String, Double>>> percentiles) { this.last = last; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java index 080a5a8dc32..730f7bc13cd 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java @@ -44,4 +44,5 @@ public class HostLifeGatherer { return jsonObject; } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/JSONObjectWithLegibleException.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/JSONObjectWithLegibleException.java index dc1bfb89197..d22dd9d6f4b 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/JSONObjectWithLegibleException.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/JSONObjectWithLegibleException.java @@ -13,6 +13,7 @@ import java.util.Map; * @author gjoranv */ class JSONObjectWithLegibleException extends JSONObject { + @Override public JSONObject put(String s, boolean b) { try { @@ -80,7 +81,7 @@ class JSONObjectWithLegibleException extends JSONObject { private String getErrorMessage(String key, Object value, JSONException e) { return "Trying to add invalid JSON object with key '" + key + - "' and value '" + value + - "' - " + e.getMessage(); + "' and value '" + value + "' - " + e.getMessage(); } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java index 061ce7138ad..6a06a6362f5 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java @@ -7,8 +7,9 @@ import java.util.ArrayList; import java.util.List; /** + * Gathers metrics regarding currently processing coredumps and host life. + * * @author olaa - * Gathers metrics regarding currently processing coredumps and host life */ public class MetricGatherer { @@ -17,7 +18,8 @@ public class MetricGatherer { List<JSONObject> packetList = new ArrayList<>(); packetList.add(CoredumpGatherer.gatherCoredumpMetrics(fileWrapper)); if (System.getProperty("os.name").contains("nux")) - packetList.add(HostLifeGatherer.getHostLifePacket(fileWrapper)); + packetList.add(HostLifeGatherer.getHostLifePacket(fileWrapper)); return packetList; } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java index d1036db5c6f..c1a6f650a9c 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java @@ -43,6 +43,7 @@ import static com.yahoo.container.jdisc.state.StateHandler.getSnapshotPreprocess * @author gjoranv */ public class MetricsPacketsHandler extends AbstractRequestHandler { + static final String APPLICATION_KEY = "application"; static final String TIMESTAMP_KEY = "timestamp"; static final String STATUS_CODE_KEY = "status_code"; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/SnapshotProvider.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/SnapshotProvider.java index 4967fd1f162..d693bf97bd8 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/SnapshotProvider.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/SnapshotProvider.java @@ -7,7 +7,7 @@ import java.io.PrintStream; * An interface for components supplying a state snapshot where persistence and * other pre-processing has been done. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public interface SnapshotProvider { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java index ccd0864b3ab..40a0ef10fbc 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java @@ -136,4 +136,5 @@ public class StateMonitor extends AbstractComponent { } }); } + } diff --git a/container-core/src/main/java/com/yahoo/container/servlet/ServletProvider.java b/container-core/src/main/java/com/yahoo/container/servlet/ServletProvider.java index 903c01a27f7..213063a725d 100644 --- a/container-core/src/main/java/com/yahoo/container/servlet/ServletProvider.java +++ b/container-core/src/main/java/com/yahoo/container/servlet/ServletProvider.java @@ -11,14 +11,11 @@ import org.eclipse.jetty.servlet.ServletHolder; */ public class ServletProvider implements Provider<ServletHolder> { - private ServletHolder servletHolder; + private final ServletHolder servletHolder; public ServletProvider(Servlet servlet, ServletConfigConfig servletConfigConfig) { servletHolder = new ServletHolder(servlet); - - servletConfigConfig.map().forEach( (key, value) -> - servletHolder.setInitParameter(key, value) - ); + servletConfigConfig.map().forEach( (key, value) -> servletHolder.setInitParameter(key, value)); } @Override diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java index ffce3649419..d49c548d25c 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java @@ -10,8 +10,9 @@ import javax.xml.datatype.DatatypeFactory; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class DatatypeFactoryProvider implements Provider<DatatypeFactory> { + public static final String FACTORY_CLASS = DatatypeFactory.DATATYPEFACTORY_IMPLEMENTATION_CLASS; @Override @@ -25,4 +26,5 @@ public class DatatypeFactoryProvider implements Provider<DatatypeFactory> { @Override public void deconstruct() { } + } diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java index 37b8dff8bf4..c81d173e1ed 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java @@ -9,7 +9,7 @@ import javax.xml.parsers.DocumentBuilderFactory; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class DocumentBuilderFactoryProvider implements Provider<DocumentBuilderFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java index a8ac55a8aca..0d0b79d8ce7 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java @@ -9,7 +9,7 @@ import javax.xml.parsers.SAXParserFactory; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class SAXParserFactoryProvider implements Provider<SAXParserFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java index bbcdf7c9553..0d69e129492 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java @@ -10,7 +10,7 @@ import javax.xml.validation.SchemaFactory; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class SchemaFactoryProvider implements Provider<SchemaFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.validation.XMLSchemaFactory"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java index 974d2e6a259..071a576abe8 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java @@ -9,7 +9,7 @@ import javax.xml.transform.TransformerFactory; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class TransformerFactoryProvider implements Provider<TransformerFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java index 702ecedcc93..f5e1e666072 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java @@ -9,7 +9,7 @@ import javax.xml.stream.XMLEventFactory; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class XMLEventFactoryProvider implements Provider<XMLEventFactory> { public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.events.XMLEventFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java index 9f3518525de..99eb6df7093 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java @@ -9,7 +9,7 @@ import javax.xml.stream.XMLInputFactory; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class XMLInputFactoryProvider implements Provider<XMLInputFactory> { private static final String INPUT_FACTORY_INTERFACE = XMLInputFactory.class.getName(); diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java index ab28ba2e923..c5a21dae410 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java @@ -9,7 +9,7 @@ import javax.xml.stream.XMLOutputFactory; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class XMLOutputFactoryProvider implements Provider<XMLOutputFactory> { public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.XMLOutputFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java index 407369032cf..23ef9995caf 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java @@ -10,7 +10,7 @@ import javax.xml.xpath.XPathFactoryConfigurationException; * @author Einar M R Rosenvinge * @deprecated Do not use! */ -@Deprecated +@Deprecated // TODO: Remove on Vespa 8 public class XPathFactoryProvider implements Provider<XPathFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java index ace5a7ab304..92cdfe8d918 100644 --- a/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java +++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java @@ -17,8 +17,8 @@ import com.yahoo.language.opennlp.OpenNlpLinguistics; @SuppressWarnings("unused") // Injected public class DefaultLinguisticsProvider implements Provider<Linguistics> { - // Use lazy initialization to avoid expensive (memory-wise) instantiation f - private volatile Supplier<Linguistics> linguisticsSupplier = Suppliers.memoize(OpenNlpLinguistics::new); + // Use lazy initialization to avoid expensive (memory-wise) instantiation + private final Supplier<Linguistics> linguisticsSupplier = Suppliers.memoize(OpenNlpLinguistics::new); @Inject public DefaultLinguisticsProvider() { } diff --git a/container-core/src/main/java/com/yahoo/osgi/Osgi.java b/container-core/src/main/java/com/yahoo/osgi/Osgi.java index 513e7883594..54f9ad48703 100644 --- a/container-core/src/main/java/com/yahoo/osgi/Osgi.java +++ b/container-core/src/main/java/com/yahoo/osgi/Osgi.java @@ -27,4 +27,5 @@ public interface Osgi { default boolean hasFelixFramework() { return false; } + } diff --git a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java index b34442d50a9..97e2367bac2 100644 --- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java +++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java @@ -19,6 +19,7 @@ import java.util.logging.Logger; * @author gjoranv */ public class OsgiImpl implements Osgi { + private static final Logger log = Logger.getLogger(OsgiImpl.class.getName()); private final OsgiFramework jdiscOsgi; diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java index 2727d111829..a8ccc28c751 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java @@ -31,8 +31,7 @@ import com.yahoo.processing.response.DataList; * wrapper of the knowhow needed to render the Response from processing. * * @author bratseth - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @since 5.1.12 + * @author Steinar Knutsen */ public class ProcessingResponse extends AsyncHttpResponse { @@ -44,7 +43,6 @@ public class ProcessingResponse extends AsyncHttpResponse { /** True if the return status has been set explicitly and should not be further changed */ private boolean explicitStatusSet = false; - @SuppressWarnings("unchecked") public ProcessingResponse(int status, com.yahoo.processing.Request processingRequest, com.yahoo.processing.Response processingResponse, Renderer renderer, diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java index 8fc0b49c71b..d4e55dbc556 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java @@ -23,7 +23,6 @@ import java.util.concurrent.Executors; * Create an instance of this to test making processing requests and get the response or response data. * * @author bratseth - * @since 5.21 */ @Beta public class ProcessingTestDriver extends RequestHandlerTestDriver { @@ -31,20 +30,20 @@ public class ProcessingTestDriver extends RequestHandlerTestDriver { private final ProcessingHandler processingHandler; public ProcessingTestDriver(Collection<Chain<Processor>> chains) { - this(chains, new ComponentRegistry<Renderer>()); + this(chains, new ComponentRegistry<>()); } public ProcessingTestDriver(String binding, Collection<Chain<Processor>> chains) { - this(chains, new ComponentRegistry<Renderer>()); + this(chains, new ComponentRegistry<>()); } @SafeVarargs @SuppressWarnings("varargs") public ProcessingTestDriver(Chain<Processor> ... chains) { - this(Arrays.asList(chains), new ComponentRegistry<Renderer>()); + this(Arrays.asList(chains), new ComponentRegistry<>()); } @SafeVarargs @SuppressWarnings("varargs") public ProcessingTestDriver(String binding, Chain<Processor> ... chains) { - this(binding, Arrays.asList(chains), new ComponentRegistry<Renderer>()); + this(binding, Arrays.asList(chains), new ComponentRegistry<>()); } public ProcessingTestDriver(Collection<Chain<Processor>> chains, ComponentRegistry<Renderer> renderers) { this(createProcessingHandler(chains, renderers, AccessLog.voidAccessLog())); @@ -64,7 +63,7 @@ public class ProcessingTestDriver extends RequestHandlerTestDriver { public ProcessingTestDriver(Chain<Processor> chain, AccessLogInterface accessLogInterface) { this(createProcessingHandler( Collections.singleton(chain), - new ComponentRegistry<Renderer>(), + new ComponentRegistry<>(), createAccessLog(accessLogInterface))); } @@ -76,10 +75,9 @@ public class ProcessingTestDriver extends RequestHandlerTestDriver { return new AccessLog(componentRegistry); } - private static ProcessingHandler createProcessingHandler( - Collection<Chain<Processor>> chains, - ComponentRegistry<Renderer> renderers, - AccessLog accessLog) { + private static ProcessingHandler createProcessingHandler(Collection<Chain<Processor>> chains, + ComponentRegistry<Renderer> renderers, + AccessLog accessLog) { Executor executor = Executors.newSingleThreadExecutor(); ChainRegistry<Processor> registry = new ChainRegistry<>(); diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ResponseHeaders.java b/container-core/src/main/java/com/yahoo/processing/handler/ResponseHeaders.java index 0267b892878..3a21c5a3ec9 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/ResponseHeaders.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/ResponseHeaders.java @@ -14,7 +14,6 @@ import java.util.Map; * A Response may contain multiple such data objects, and all of them will be added to the response. * * @author bratseth - * @since 5.1.23 */ public class ResponseHeaders extends AbstractData { diff --git a/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java b/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java index e08cf013c19..a42b027b795 100644 --- a/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java +++ b/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java @@ -12,8 +12,7 @@ import java.util.Map; * A processor which adds the current content of the Request.properties() to * the trace before calling the next processor, if traceLevel is 4 or more. * - * @author bratseth - * @since 5.1.17 + * @author bratseth */ public class RequestPropertyTracer extends Processor { diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousRenderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousRenderer.java index b6298558ff9..eb39c4c8117 100644 --- a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousRenderer.java +++ b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousRenderer.java @@ -20,8 +20,7 @@ public abstract class AsynchronousRenderer <RESPONSE extends Response> extends R * Exposes JDisc wiring to ensure asynchronous cleanup. * * @param channel the channel to the client receiving the response - * @param completionHandler the JDisc completion handler which will be invoked at the end - * of the rendering + * @param completionHandler the JDisc completion handler which will be invoked at the end of the rendering * @throws IllegalStateException if attempted invoked more than once */ public abstract void setNetworkWiring(ContentChannel channel, CompletionHandler completionHandler); diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java index fdc3b63fc92..f86cad7c619 100644 --- a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java +++ b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java @@ -53,10 +53,8 @@ public abstract class AsynchronousSectionedRenderer<RESPONSE extends Response> e * stream to be used throughput the rendering. Subsequent calls must use the * same stream. * - * @param stream - * the stream to render to in this and all subsequent calls. - * @throws IOException - * passed on from the stream + * @param stream the stream to render to in this and all subsequent calls. + * @throws IOException passed on from the stream */ public abstract void beginResponse(OutputStream stream) throws IOException; diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/ProcessingRenderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/ProcessingRenderer.java index 556eec9b460..052c1c3f7f5 100644 --- a/container-core/src/main/java/com/yahoo/processing/rendering/ProcessingRenderer.java +++ b/container-core/src/main/java/com/yahoo/processing/rendering/ProcessingRenderer.java @@ -167,7 +167,7 @@ public class ProcessingRenderer extends AsynchronousSectionedRenderer<Response> private static class TraceRenderingVisitor extends TraceVisitor { - private JSONWriter jsonWriter; + private final JSONWriter jsonWriter; public TraceRenderingVisitor(JSONWriter jsonWriter) { this.jsonWriter = jsonWriter; @@ -226,4 +226,5 @@ public class ProcessingRenderer extends AsynchronousSectionedRenderer<Response> return (IOException) super.getCause(); } } + } diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/Renderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/Renderer.java index d04eda943af..a7fa557f71a 100644 --- a/container-core/src/main/java/com/yahoo/processing/rendering/Renderer.java +++ b/container-core/src/main/java/com/yahoo/processing/rendering/Renderer.java @@ -46,16 +46,11 @@ public abstract class Renderer<RESPONSE extends Response> extends AbstractCompon * exception causing failure wrapped in an ExecutionException if rendering * was not successful. * - * @param stream - * a stream API bridge to JDisc - * @param response - * the response to render - * @param execution - * the execution which created this response - * @param request - * the request matching the response - * @return a ListenableFuture containing a boolean where true indicates a - * successful rendering + * @param stream a stream API bridge to JDisc + * @param response the response to render + * @param execution the execution which created this response + * @param request the request matching the response + * @return a ListenableFuture containing a boolean where true indicates a successful rendering */ public abstract ListenableFuture<Boolean> render(OutputStream stream, RESPONSE response, Execution execution, Request request); @@ -63,17 +58,14 @@ public abstract class Renderer<RESPONSE extends Response> extends AbstractCompon /** * Name of the output encoding, if applicable. * - *<p>TODO: ensure null is OK - * - * @return The encoding of the output if applicable, e.g. "utf-8" + * @return the encoding of the output if applicable, e.g. "utf-8" */ public abstract String getEncoding(); /** * The MIME type of the rendered content sent to the client. * - * @return The mime type of the data written to the writer, e.g. - * "text/plain" + * @return The mime type of the data written to the writer, e.g. "text/plain" */ public abstract String getMimeType(); diff --git a/container-core/src/main/java/com/yahoo/restapi/JacksonJsonResponse.java b/container-core/src/main/java/com/yahoo/restapi/JacksonJsonResponse.java index 94785819aa6..0a2c08530aa 100644 --- a/container-core/src/main/java/com/yahoo/restapi/JacksonJsonResponse.java +++ b/container-core/src/main/java/com/yahoo/restapi/JacksonJsonResponse.java @@ -19,8 +19,8 @@ import java.util.logging.Logger; public class JacksonJsonResponse<T> extends HttpResponse { private static final Logger log = Logger.getLogger(JacksonJsonResponse.class.getName()); - private static final ObjectMapper defaultJsonMapper = new ObjectMapper() - .registerModule(new JavaTimeModule()).registerModule(new Jdk8Module()); + private static final ObjectMapper defaultJsonMapper = + new ObjectMapper().registerModule(new JavaTimeModule()).registerModule(new Jdk8Module()); private final ObjectMapper jsonMapper; private final T entity; @@ -48,4 +48,5 @@ public class JacksonJsonResponse<T> extends HttpResponse { @Override public String getContentType() { return "application/json"; } public T getEntity() { return entity; } + } diff --git a/container-disc/src/main/java/com/yahoo/container/FilterConfigProvider.java b/container-disc/src/main/java/com/yahoo/container/FilterConfigProvider.java index c17b9d445a2..b22a8314d2b 100644 --- a/container-disc/src/main/java/com/yahoo/container/FilterConfigProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/FilterConfigProvider.java @@ -74,4 +74,5 @@ public final class FilterConfigProvider implements Provider<FilterConfig> { @Override public void deconstruct() {} + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java index 0e3110e26a8..09febdabc60 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java @@ -14,6 +14,7 @@ import java.util.List; * @author mortent */ public class AthenzIdentityProviderProvider implements Provider<AthenzIdentityProvider> { + private static final ThrowingAthenzIdentityProvider instance = new ThrowingAthenzIdentityProvider(); @Override @@ -84,4 +85,5 @@ public class AthenzIdentityProviderProvider implements Provider<AthenzIdentityPr throw new UnsupportedOperationException(message); } } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java b/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java index a8acaf7dd10..baf7ac8c4dc 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java @@ -22,25 +22,19 @@ public class RestrictedBundleContext implements BundleContext { @Override public ServiceRegistration<?> registerService(String[] strings, Object o, Dictionary<String, ?> stringDictionary) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.registerService(strings, o, stringDictionary); } @Override public ServiceRegistration<?> registerService(String localHostname, Object o, Dictionary<String, ?> stringDictionary) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.registerService(localHostname, o, stringDictionary); } @Override public <S> ServiceRegistration<S> registerService(Class<S> sClass, S s, Dictionary<String, ?> stringDictionary) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.registerService(sClass, s, stringDictionary); } @@ -51,57 +45,43 @@ public class RestrictedBundleContext implements BundleContext { @Override public ServiceReference<?>[] getServiceReferences(String localHostname, String localHostname2) throws InvalidSyntaxException { - if (wrapped == null) { - return new ServiceReference<?>[0]; - } + if (wrapped == null) return new ServiceReference<?>[0]; return wrapped.getServiceReferences(localHostname, localHostname2); } @Override public ServiceReference<?>[] getAllServiceReferences(String localHostname, String localHostname2) throws InvalidSyntaxException { - if (wrapped == null) { - return new ServiceReference<?>[0]; - } + if (wrapped == null) return new ServiceReference<?>[0]; return wrapped.getAllServiceReferences(localHostname, localHostname2); } @Override public ServiceReference<?> getServiceReference(String localHostname) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.getServiceReference(localHostname); } @Override public <S> ServiceReference<S> getServiceReference(Class<S> sClass) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.getServiceReference(sClass); } @Override public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> sClass, String localHostname) throws InvalidSyntaxException { - if (wrapped == null) { - return Collections.<ServiceReference<S>>emptyList(); - } + if (wrapped == null) return Collections.<ServiceReference<S>>emptyList(); return wrapped.getServiceReferences(sClass, localHostname); } @Override public <S> S getService(ServiceReference<S> sServiceReference) { - if (wrapped == null) { - return null; - } + if (wrapped == null) return null; return wrapped.getService(sServiceReference); } @Override public boolean ungetService(ServiceReference<?> serviceReference) { - if (wrapped == null) { - return false; - } + if (wrapped == null) return false; return wrapped.ungetService(serviceReference); } @@ -110,10 +90,6 @@ public class RestrictedBundleContext implements BundleContext { return null; } - - //--------------------- - - @Override public String getProperty(String localHostname) { throw newException(); diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java index 9c1dd00fdd4..eca62bc6ae6 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java @@ -34,4 +34,5 @@ public class SecretStoreProvider implements Provider<SecretStore> { throw new SecretNotFoundException("A secret store is not available"); } } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java index 0bb3832ddf5..b25517ec1f7 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SystemInfoProvider.java @@ -19,9 +19,12 @@ public class SystemInfoProvider extends AbstractComponent implements Provider<Sy private final SystemInfo instance; - @Inject public SystemInfoProvider(ConfigserverConfig config) { + @Inject + public SystemInfoProvider(ConfigserverConfig config) { this.instance = new SystemInfo(new Zone(Environment.valueOf(config.environment()), config.region())); } - @Override public SystemInfo get() { return instance; } + @Override + public SystemInfo get() { return instance; } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java index 10bf96749e8..26014dba08c 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java @@ -11,6 +11,7 @@ import java.util.List; * @author mortent */ public interface AthenzIdentityProvider { + String domain(); String service(); SSLContext getIdentitySslContext(); @@ -22,4 +23,5 @@ public interface AthenzIdentityProvider { List<X509Certificate> getIdentityCertificate(); PrivateKey getPrivateKey(); Path trustStorePath(); + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProviderException.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProviderException.java index fd5839bfc45..039a0535c32 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProviderException.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProviderException.java @@ -13,4 +13,5 @@ public class AthenzIdentityProviderException extends RuntimeException { public AthenzIdentityProviderException(String message, Throwable cause) { super(message, cause); } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/DisableGuiceMetric.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/DisableGuiceMetric.java index 5c205cd5157..b168b21ac1c 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/DisableGuiceMetric.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/DisableGuiceMetric.java @@ -28,4 +28,5 @@ public class DisableGuiceMetric implements Metric { private static RuntimeException newException() { return new UnsupportedOperationException("The Metric framework is only available to components."); } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java index c9caaa9d4b5..60b7b0335bf 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumer.java @@ -55,4 +55,5 @@ public final class ForwardingMetricConsumer implements MetricConsumer { this.contexts = contexts; } } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java index c452fb2435d..17effe2136a 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java @@ -17,6 +17,7 @@ import java.util.Map; * @author ollivir */ public class GarbageCollectionMetrics { + private static final String GC_COUNT = "jdisc.gc.count"; private static final String GC_TIME = "jdisc.gc.ms"; private static final String DIMENSION_KEY = "gcName"; @@ -35,7 +36,7 @@ public class GarbageCollectionMetrics { } } - private Map<String, LinkedList<GcStats>> gcStatistics; + private final Map<String, LinkedList<GcStats>> gcStatistics; private final Clock clock; @@ -92,4 +93,5 @@ public class GarbageCollectionMetrics { Map<String, LinkedList<GcStats>> getGcStatistics() { return gcStatistics; } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java index b29d7fe1f21..22a335a8171 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/JrtMetrics.java @@ -38,4 +38,5 @@ class JrtMetrics { metric.add(metricName, countIncrement, null); } } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index 05c3b88b788..0c26d6eefd9 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -20,7 +20,6 @@ import java.util.TimerTask; * * @author bjorncs * @author vegardh - * */ public class MetricUpdater extends AbstractComponent { @@ -139,5 +138,6 @@ public class MetricUpdater extends AbstractComponent { void schedule(Runnable runnable, Duration frequency); void cancel(); } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java b/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java index 7cd8e11c677..8af1f9860bf 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java @@ -8,6 +8,7 @@ import java.util.List; * @author mortent */ public interface SecretStore { + /** Returns the secret for this key */ String getSecret(String key); @@ -18,4 +19,5 @@ public interface SecretStore { default List<Integer> listSecretVersions(String key) { throw new UnsupportedOperationException("Secret store does not support listing versions"); } + } diff --git a/container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java b/container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java index ae65fc3ad68..709441999d0 100644 --- a/container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java +++ b/container-disc/src/main/java/com/yahoo/container/usability/BindingsOverviewHandler.java @@ -57,7 +57,7 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { @Override protected com.yahoo.jdisc.Response newResponse() { com.yahoo.jdisc.Response response = new com.yahoo.jdisc.Response(statusToReturn); - response.headers().add("Content-Type", Arrays.asList(new String[]{"application/json"})); + response.headers().add("Content-Type", List.of("application/json")); return response; } }.connect(handler)); @@ -110,12 +110,10 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { } private static JSONArray renderBindings(List<String> bindings) { - JSONArray ret = new JSONArray(); - + JSONArray array = new JSONArray(); for (String binding : bindings) - ret.put(binding); - - return ret; + array.put(binding); + return array; } private static JSONObject renderComponent(Object component, ComponentId id) { @@ -136,9 +134,9 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { try { Bundle bundle = FrameworkUtil.getBundle(component.getClass()); - String bundleName = bundle != null ? - bundle.getSymbolicName() + ":" + bundle.getVersion() : - "From classpath"; + String bundleName = bundle != null + ? bundle.getSymbolicName() + ":" + bundle.getVersion() + : "From classpath"; return new BundleInfo(component.getClass().getName(), bundleName); } catch (Exception | NoClassDefFoundError e) { return new BundleInfo("Unavailable, reconfiguration in progress.", ""); @@ -155,12 +153,15 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { } static final class BundleInfo { + public final String className; public final String bundleName; + BundleInfo(String className, String bundleName) { this.className = className; this.bundleName = bundleName; } + } static final class StatusResponse { @@ -182,7 +183,8 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { } - private class IgnoredContent implements ContentChannel { + private static class IgnoredContent implements ContentChannel { + @Override public void write(ByteBuffer buf, CompletionHandler handler) { handler.completed(); @@ -192,5 +194,7 @@ public class BindingsOverviewHandler extends AbstractRequestHandler { public void close(CompletionHandler handler) { handler.completed(); } + } + } diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java index b90f96fb240..2b86d83547e 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java @@ -61,4 +61,5 @@ public class MbusClientProvider implements Provider<MbusClient> { public void deconstruct() { client.release(); } + } diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java index e62f6a8a21a..68b1f5aa5db 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java @@ -159,7 +159,7 @@ public final class SessionCache extends AbstractComponent { return sourcesCreator.retain(sourceLock, sources, p); } - private abstract class SessionCreator<PARAMS, KEY, SESSION extends SharedResource> { + private abstract static class SessionCreator<PARAMS, KEY, SESSION extends SharedResource> { abstract SESSION create(PARAMS p); @@ -352,6 +352,7 @@ public final class SessionCache extends AbstractComponent { } static class UnknownThrottlePolicySignature extends ThrottlePolicySignature { + private final ThrottlePolicy policy; UnknownThrottlePolicySignature(final ThrottlePolicy policy) { @@ -409,26 +410,16 @@ public final class SessionCache extends AbstractComponent { @Override public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; SourceSessionKey other = (SourceSessionKey) obj; if (policy == null) { - if (other.policy != null) { - return false; - } + if (other.policy != null) return false; } else if (!policy.equals(other.policy)) { return false; } - if (Double.doubleToLongBits(timeout) != Double.doubleToLongBits(other.timeout)) { - return false; - } + if (Double.doubleToLongBits(timeout) != Double.doubleToLongBits(other.timeout)) return false; return true; } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java index b7729577bda..1a8c4c8a6c2 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; */ public class Autoscaler { - private final Logger log = Logger.getLogger(this.getClass().getName()); + private static final Logger log = Logger.getLogger(Autoscaler.class.getName()); /** What cost difference factor is worth a reallocation? */ private static final double costDifferenceWorthReallocation = 0.1; @@ -74,9 +74,8 @@ public class Autoscaler { Optional<Double> cpuLoad = clusterTimeseries.averageLoad(Resource.cpu, cluster); Optional<Double> memoryLoad = clusterTimeseries.averageLoad(Resource.memory, cluster); Optional<Double> diskLoad = clusterTimeseries.averageLoad(Resource.disk, cluster); - if (cpuLoad.isEmpty() || memoryLoad.isEmpty() || diskLoad.isEmpty()) { - return Advice.none(); - } + if (cpuLoad.isEmpty() || memoryLoad.isEmpty() || diskLoad.isEmpty()) return Advice.none(); + var target = ResourceTarget.idealLoad(cpuLoad.get(), memoryLoad.get(), diskLoad.get(), currentAllocation); Optional<AllocatableClusterResources> bestAllocation = diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java index 0b8cb4f635b..b53f56e4743 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java @@ -57,7 +57,7 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer { private void autoscale(ApplicationId application, List<Node> applicationNodes) { try (MaintenanceDeployment deployment = new MaintenanceDeployment(application, deployer, metric, nodeRepository())) { - if ( ! deployment.isValid()) return; // Another config server will consider this application + if ( ! deployment.isValid()) return; nodesByCluster(applicationNodes).forEach((clusterId, clusterNodes) -> autoscale(application, clusterId, clusterNodes, deployment)); } } |