diff options
Diffstat (limited to 'config-model')
3 files changed, 4 insertions, 36 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java index 8881162394b..e664ba56d01 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java @@ -16,7 +16,7 @@ import java.util.Collections; */ public class ContainerDocumentApi implements FeederConfig.Producer { - public static final String vespaClientBundleSpecification = "vespaclient-container-plugin"; + private static final String vespaClientBundleSpecification = "vespaclient-container-plugin"; private final Options options; public ContainerDocumentApi(ContainerCluster cluster, Options options) { @@ -29,7 +29,7 @@ public class ContainerDocumentApi implements FeederConfig.Producer { cluster.addComponent(newVespaClientHandler("com.yahoo.vespa.http.server.FeedHandler", ContainerCluster.RESERVED_URI_PREFIX + "/feedapi")); } - private Handler newVespaClientHandler(String componentId, String bindingSuffix) { + private Handler<AbstractConfigProducer<?>> newVespaClientHandler(String componentId, String bindingSuffix) { Handler<AbstractConfigProducer<?>> handler = new Handler<>(new ComponentModel( BundleInstantiationSpecification.getFromStrings(componentId, null, vespaClientBundleSpecification), "")); @@ -48,8 +48,6 @@ public class ContainerDocumentApi implements FeederConfig.Producer { builder.route(options.route); if (options.maxpendingdocs != null) builder.maxpendingdocs(options.maxpendingdocs); - if (options.maxpendingbytes != null) - builder.maxpendingbytes(options.maxpendingbytes); if (options.retryenabled != null) builder.retryenabled(options.retryenabled); if (options.timeout != null) @@ -58,8 +56,6 @@ public class ContainerDocumentApi implements FeederConfig.Producer { builder.tracelevel(options.tracelevel); if (options.mbusport != null) builder.mbusport(options.mbusport); - if (options.docprocChain != null) - builder.docprocchain(options.docprocChain); } public static final class Options { @@ -67,37 +63,28 @@ public class ContainerDocumentApi implements FeederConfig.Producer { private final Boolean abortondocumenterror; private final String route; private final Integer maxpendingdocs; - private final Integer maxpendingbytes; private final Boolean retryenabled; - private final Double retrydelay; private final Double timeout; private final Integer tracelevel; private final Integer mbusport; - private final String docprocChain; public Options(Collection<String> bindings, Boolean abortondocumenterror, String route, Integer maxpendingdocs, - Integer maxpendingbytes, Boolean retryenabled, - Double retrydelay, Double timeout, Integer tracelevel, - Integer mbusport, - String docprocChain) { + Integer mbusport) { this.bindings = Collections.unmodifiableCollection(bindings); this.abortondocumenterror = abortondocumenterror; this.route = route; this.maxpendingdocs = maxpendingdocs; - this.maxpendingbytes = maxpendingbytes; this.retryenabled = retryenabled; - this.retrydelay = retrydelay; this.timeout = timeout; this.tracelevel = tracelevel; this.mbusport = mbusport; - this.docprocChain = docprocChain; } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java index 10e24a609f7..4602e09eed4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java @@ -26,13 +26,10 @@ public class DocumentApiOptionsBuilder { getAbortOnDocumentError(spec), getRoute(spec), getMaxPendingDocs(spec), - getMaxPendingBytes(spec), getRetryEnabled(spec), - getRetryDelay(spec), getTimeout(spec), getTracelevel(spec), - getMbusPort(spec), - getDocprocChain(spec)); + getMbusPort(spec)); } private static List<String> getBindings(Element spec) { @@ -70,10 +67,6 @@ public class DocumentApiOptionsBuilder { return value.isEmpty() ? null : value; } - private static String getDocprocChain(Element spec) { - return getCleanValue(spec, "docprocchain"); - } - private static Integer getMbusPort(Element spec) { String value = getCleanValue(spec, "mbusport"); return value == null ? null : Integer.parseInt(value); @@ -89,21 +82,11 @@ public class DocumentApiOptionsBuilder { return value == null ? null : Double.parseDouble(value); } - private static Double getRetryDelay(Element spec) { - String value = getCleanValue(spec, "retrydelay"); - return value == null ? null : Double.parseDouble(value); - } - private static Boolean getRetryEnabled(Element spec) { String value = getCleanValue(spec, "retryenabled"); return value == null ? null : Boolean.parseBoolean(value); } - private static Integer getMaxPendingBytes(Element spec) { - String value = getCleanValue(spec, "maxpendingbytes"); - return value == null ? null : Integer.parseInt(value); - } - private static Integer getMaxPendingDocs(Element spec) { String value = getCleanValue(spec, "maxpendingdocs"); return value == null ? null : Integer.parseInt(value); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java index 5b92934678d..c36114edc5c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java @@ -42,7 +42,6 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa " <document-api>", " <abortondocumenterror>false</abortondocumenterror>", " <maxpendingdocs>4321</maxpendingdocs>", - " <retrydelay>12.34</retrydelay>", " <route>non-default</route>", " </document-api>", nodesXml, @@ -54,7 +53,6 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa FeederConfig config = new FeederConfig(builder); assertThat(config.abortondocumenterror(), is(false)); assertThat(config.maxpendingdocs(), is(4321)); - assertThat(config.retrydelay(), is(12.34)); assertThat(config.route(), is("non-default")); } |