From 9a380da57ac0b59359a26ebcb79be04b9400d892 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 14 Nov 2018 17:06:16 +0100 Subject: Remove coverageReport parameter - always on --- .../yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java | 1 - container-core/src/main/resources/configdefinitions/qr.def | 4 ---- .../src/main/java/com/yahoo/search/query/Presentation.java | 2 -- 3 files changed, 7 deletions(-) diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index 9bf83082f9a..864b9f0d332 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -685,7 +685,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { assertTrue(config.rpc().enabled()); assertEquals("", config.rpc().host()); assertFalse(config.restartOnDeploy()); - assertFalse(config.coveragereports()); assertEquals("filedistribution/" + hostname, config.filedistributor().configid()); } diff --git a/container-core/src/main/resources/configdefinitions/qr.def b/container-core/src/main/resources/configdefinitions/qr.def index d6549674137..ddf12fd32f5 100644 --- a/container-core/src/main/resources/configdefinitions/qr.def +++ b/container-core/src/main/resources/configdefinitions/qr.def @@ -20,10 +20,6 @@ rpc.host string default="" restart ## The id this service should register itself with in slobrok rpc.slobrokId string default="" restart -## Whether to obtain coverage reports by default. This can be overridden with -## the 'reportcoverage' HTTP parameter. -coveragereports bool default=false restart - ## A unique identifier string for this QRS. The only guarantee given is ## this string will be unique for every QRS in a Vespa application. discriminator string default="qrserver.0" restart diff --git a/container-search/src/main/java/com/yahoo/search/query/Presentation.java b/container-search/src/main/java/com/yahoo/search/query/Presentation.java index 7ef4b0728c4..6b10fd0847c 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Presentation.java +++ b/container-search/src/main/java/com/yahoo/search/query/Presentation.java @@ -32,7 +32,6 @@ public class Presentation implements Cloneable { public static final String BOLDING = "bolding"; public static final String TIMING = "timing"; public static final String SUMMARY = "summary"; - public static final String REPORT_COVERAGE = "reportCoverage"; public static final String SUMMARY_FIELDS = "summaryFields"; /** The (short) name of the parameter holding the name of the return format to use */ @@ -45,7 +44,6 @@ public class Presentation implements Cloneable { argumentType.addField(new FieldDescription(BOLDING, "boolean", "bolding")); argumentType.addField(new FieldDescription(TIMING, "boolean", "timing")); argumentType.addField(new FieldDescription(SUMMARY, "string", "summary")); - argumentType.addField(new FieldDescription(REPORT_COVERAGE, "string", "reportcoverage")); argumentType.addField(new FieldDescription(FORMAT, "string", "format template")); argumentType.addField(new FieldDescription(SUMMARY_FIELDS, "string", "summaryFields")); argumentType.freeze(); -- cgit v1.2.3