diff options
author | Henrik <henrik.hoiness@online.no> | 2018-07-05 13:25:59 +0200 |
---|---|---|
committer | Henrik <henrik.hoiness@online.no> | 2018-07-05 13:25:59 +0200 |
commit | 1c604359c6a432685b6edbb3e721aa9af91a518e (patch) | |
tree | 4306caf78fc7e94283738d5838f37f36e98351fd /container-core | |
parent | 4253ef45bdb7c6f6084134ab4f0e2174eea6f40a (diff) | |
parent | 9e63438157c0659f9382324b5a83cb6a020018e1 (diff) |
Fixed merge conflict with StatusPageProxyHandler
Diffstat (limited to 'container-core')
22 files changed, 39 insertions, 21 deletions
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 afbf163500f..033a5819585 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 @@ -23,7 +23,7 @@ import java.util.Set; * Not for public use. * * If possible, please avoid using this class and HandlersConfigurer in your tests - * @author tonytv + * @author Tony Vaagenes * @author gjoranv * */ diff --git a/container-core/src/main/java/com/yahoo/container/core/slobrok/SlobrokConfigurator.java b/container-core/src/main/java/com/yahoo/container/core/slobrok/SlobrokConfigurator.java index f2cacb1b080..9472fa07bb5 100644 --- a/container-core/src/main/java/com/yahoo/container/core/slobrok/SlobrokConfigurator.java +++ b/container-core/src/main/java/com/yahoo/container/core/slobrok/SlobrokConfigurator.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; /** * Configures which slobrok nodes the container should register with. - * @author tonytv + * @author Tony Vaagenes */ public class SlobrokConfigurator { public SlobrokConfigurator(SlobroksConfig config) { 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 132b1153fc5..22933556d9f 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 @@ -63,10 +63,16 @@ public class RequestHandlerTestDriver implements AutoCloseable { return sendRequest(uri, method, ""); } + /** Send a POST request */ public MockResponseHandler sendRequest(String uri, HttpRequest.Method method, String body) { return sendRequest(uri, method, ByteBuffer.wrap(body.getBytes(StandardCharsets.UTF_8))); } + /** Send a POST request with defined content type */ + public MockResponseHandler sendRequest(String uri, HttpRequest.Method method, String body, String contentType) { + return sendRequest(uri, method, ByteBuffer.wrap(body.getBytes(StandardCharsets.UTF_8)), contentType); + } + public MockResponseHandler sendRequest(String uri, HttpRequest.Method method, ByteBuffer body) { responseHandler = new MockResponseHandler(); Request request = HttpRequest.newServerRequest(driver, URI.create(uri), method); @@ -78,6 +84,18 @@ public class RequestHandlerTestDriver implements AutoCloseable { return responseHandler; } + public MockResponseHandler sendRequest(String uri, HttpRequest.Method method, ByteBuffer body, String contentType) { + responseHandler = new MockResponseHandler(); + Request request = HttpRequest.newServerRequest(driver, URI.create(uri), method); + request.context().put("contextVariable", 37); // TODO: Add a method for accepting a Request instead + request.headers().put(com.yahoo.jdisc.http.HttpHeaders.Names.CONTENT_TYPE, contentType); + ContentChannel requestContent = request.connect(responseHandler); + requestContent.write(body, null); + requestContent.close(null); + request.release(); + return responseHandler; + } + /** Replaces all occurrences of 0-9 digits by d's */ public String censorDigits(String s) { return s.replaceAll("[0-9]","d"); 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 861ee40dbf5..c06aad9644d 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 @@ -37,7 +37,7 @@ import javax.annotation.concurrent.GuardedBy; * Note that this means that subclass handlers are synchronous - the request io can * continue after completion of the worker thread. * - * @author Simon Thoresen + * @author Simon Thoresen Hult */ public abstract class ThreadedRequestHandler extends AbstractRequestHandler { 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 5fa1a57569b..715038470b9 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 @@ -31,7 +31,7 @@ import com.yahoo.processing.request.ErrorMessage; * * @author Einar M R Rosenvinge * @author Steinar Knutsen - * @author Simon Thoresen + * @author Simon Thoresen Hult * @author bratseth */ public final class VespaHeaders { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/CountMetric.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/CountMetric.java index 6d670b1795b..e3ee12a5137 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/CountMetric.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/CountMetric.java @@ -4,7 +4,7 @@ package com.yahoo.container.jdisc.state; /** * A metric which is counting an accumulative value * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public final class CountMetric extends MetricValue { 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 8ab0f5771dc..9b89b8abe52 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 @@ -11,7 +11,7 @@ import com.yahoo.collections.Tuple2; * measured at a point in time. This metric value contains some additional information about the distribution * of this gauge value in the time interval this metric is for. * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public final class GaugeMetric extends MetricValue { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricDimensions.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricDimensions.java index a85cba6628d..a03d1a60cfd 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricDimensions.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricDimensions.java @@ -6,7 +6,7 @@ import java.util.Map; /** * A set of metric dimensions, which are key-value string pairs. * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public interface MetricDimensions extends Iterable<Map.Entry<String, String>> { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSet.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSet.java index 1cd106b37ff..e7304b35075 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSet.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSet.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; /** * A set of metrics. * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public final class MetricSet implements Iterable<Map.Entry<String, MetricValue>> { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricValue.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricValue.java index 4a7b9e9941d..b6cf71343b3 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricValue.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricValue.java @@ -4,7 +4,7 @@ package com.yahoo.container.jdisc.state; /** * A metric value * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public abstract class MetricValue { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java index 6642b06ff83..dfa791304e0 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java @@ -7,7 +7,7 @@ import com.yahoo.jdisc.application.MetricConsumer; import java.util.Map; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ final class StateMetricConsumer implements MetricConsumer { 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 a5be5cb0b0a..c0dc7e8a9ae 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 @@ -20,7 +20,7 @@ import java.util.logging.Logger; * It is used by jDisc to hand out metric update API endpoints to workers through {@link #newMetricConsumer}, * and to inspect the current accumulated state of metrics through {@link #snapshot}. * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public class StateMonitor extends AbstractComponent { diff --git a/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java b/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java index 1046289bb50..45ad02d2cef 100644 --- a/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java +++ b/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java @@ -11,7 +11,7 @@ import java.util.Collections; import java.util.List; /** - * @author tonytv + * @author Tony Vaagenes */ public class MockOsgi extends NonWorkingOsgiFramework implements Osgi { 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 69a48bfb17e..31f1146c311 100644 --- a/container-core/src/main/java/com/yahoo/osgi/Osgi.java +++ b/container-core/src/main/java/com/yahoo/osgi/Osgi.java @@ -9,7 +9,7 @@ import org.osgi.framework.ServiceReference; import java.util.List; /** - * @author tonytv + * @author Tony Vaagenes */ public interface Osgi { 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 06ecd67ca6e..d9ccd5c590f 100644 --- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java +++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.logging.Logger; /** - * @author tonytv + * @author Tony Vaagenes */ public class OsgiImpl implements Osgi { diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java index 2425ac58c4c..2269bd1358b 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java @@ -48,7 +48,7 @@ import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry; * COMPONENT: The type of the processing components of which this executes a chain * * @author bratseth - * @author tonyv + * @author Tony Vaagenes * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @since 5.1.6 */ diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java index cd03f7c45e1..1504a0e861b 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java @@ -15,7 +15,7 @@ import java.util.concurrent.Executor; /** * A jDisc request handler which invokes a processing chain to produce the response. * - * @author tonytv + * @author Tony Vaagenes * @since 5.1.7 */ public class ProcessingHandler extends AbstractProcessingHandler<Processor> { 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 8644b7b9c98..d04eda943af 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 @@ -19,7 +19,7 @@ import java.io.OutputStream; * <li>State mutated during rendering shall be initialized in the init method.</li> * </ol> * - * @author tonytv + * @author Tony Vaagenes * @author Steinar Knutsen */ public abstract class Renderer<RESPONSE extends Response> extends AbstractComponent implements Cloneable { diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java index 5c2eee228a4..331c536a531 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedRequestHandlerTestCase.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.*; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen Hult */ public class ThreadedRequestHandlerTestCase { diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricConsumerProviders.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricConsumerProviders.java index 335e5407e6f..777f43c5607 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricConsumerProviders.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricConsumerProviders.java @@ -5,7 +5,7 @@ import com.google.inject.Provider; import com.yahoo.jdisc.application.MetricConsumer; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ class MetricConsumerProviders { diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateMonitorBenchmarkTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateMonitorBenchmarkTest.java index 288270df975..3892f81b8b5 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateMonitorBenchmarkTest.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateMonitorBenchmarkTest.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.assertTrue; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ public class StateMonitorBenchmarkTest { diff --git a/container-core/src/test/java/com/yahoo/processing/handler/ProcessingHandlerTestCase.java b/container-core/src/test/java/com/yahoo/processing/handler/ProcessingHandlerTestCase.java index 82ce8ca4c33..ce4d7f5d9cb 100644 --- a/container-core/src/test/java/com/yahoo/processing/handler/ProcessingHandlerTestCase.java +++ b/container-core/src/test/java/com/yahoo/processing/handler/ProcessingHandlerTestCase.java @@ -56,7 +56,7 @@ import static org.mockito.Mockito.times; * * @author bratseth * @author gjoranv - * @author tonytv + * @author Tony Vaagenes */ public class ProcessingHandlerTestCase { |