diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-02-14 10:46:15 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-02-14 10:54:02 +0000 |
commit | cd02c48698c46afe2cb3e837467586c427460b98 (patch) | |
tree | 5b83af36afa0d6d4873a9ba18a3ebf63e55dcc73 /config-model | |
parent | 130c1d8c456cf5a4e1a801899171436540413b96 (diff) |
use VespaDomBuilder.DomConfigProducerBuilderBase
Diffstat (limited to 'config-model')
25 files changed, 34 insertions, 34 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java index 55ea62d0590..57113ff794f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java @@ -34,7 +34,7 @@ import java.util.Optional; * @author Ulf Lilleengen * @author Vegard Havdal */ -public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProducerBuilder<Admin, AnyConfigProducer> { +public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProducerBuilderBase<Admin> { private final ApplicationType applicationType; protected final List<ConfigServerSpec> configServerSpecs; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java index 57dc8955313..7a7092b04dd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java @@ -15,7 +15,7 @@ import com.yahoo.vespa.model.admin.Slobrok; import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerCluster; import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainer; import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainerCluster; -import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder.DomConfigProducerBuilder; +import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder.DomConfigProducerBuilderBase; import com.yahoo.vespa.model.container.Container; import org.w3c.dom.Element; import java.util.ArrayList; @@ -150,7 +150,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { return slobroks; } - private static class LogserverBuilder extends DomConfigProducerBuilder<Logserver, AnyConfigProducer> { + private static class LogserverBuilder extends DomConfigProducerBuilderBase<Logserver> { public LogserverBuilder() { } @@ -160,7 +160,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { } } - private static class ConfigserverBuilder extends DomConfigProducerBuilder<Configserver, AnyConfigProducer> { + private static class ConfigserverBuilder extends DomConfigProducerBuilderBase<Configserver> { private final int i; private final int rpcPort; @@ -181,7 +181,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { } } - private static class SlobrokBuilder extends DomConfigProducerBuilder<Slobrok, AnyConfigProducer> { + private static class SlobrokBuilder extends DomConfigProducerBuilderBase<Slobrok> { int i; @@ -196,7 +196,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { } - private static class ClusterControllerBuilder extends DomConfigProducerBuilder<ClusterControllerContainer, AnyConfigProducer> { + private static class ClusterControllerBuilder extends DomConfigProducerBuilderBase<ClusterControllerContainer> { int i; boolean runStandaloneZooKeeper; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java index 5e0c5bab8ca..3cf8ec7375f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java @@ -28,7 +28,7 @@ import static java.util.logging.Level.INFO; /** * @author gjoranv */ -public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Handler, AnyConfigProducer> { +public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<Handler> { private static final Set<BindingPattern> reservedBindings = Set.of(METRICS_V2_HANDLER_BINDING_1, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java index dce9bfd73c3..d9ef5fd2123 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java @@ -13,7 +13,7 @@ import org.w3c.dom.Element; * * @author geirst */ -public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Tuning, AnyConfigProducer> { +public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<Tuning> { @Override protected Tuning doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> parent, Element spec) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ComponentsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ComponentsBuilder.java index f97cc2562c3..b8a1d8ed056 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ComponentsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/ComponentsBuilder.java @@ -49,15 +49,15 @@ public class ComponentsBuilder<T extends ChainedComponent<?>> { final String name; - private final Class<? extends VespaDomBuilder.DomConfigProducerBuilder<T, AnyConfigProducer> > builderClass; + private final Class<? extends VespaDomBuilder.DomConfigProducerBuilderBase<T> > builderClass; - private ComponentType(String name, Class<? extends VespaDomBuilder.DomConfigProducerBuilder<T, AnyConfigProducer> > builderClass) { + private ComponentType(String name, Class<? extends VespaDomBuilder.DomConfigProducerBuilderBase<T> > builderClass) { this.name = name; this.builderClass = builderClass; values.add(this); } - public VespaDomBuilder.DomConfigProducerBuilder<T, AnyConfigProducer > createBuilder() { + public VespaDomBuilder.DomConfigProducerBuilderBase<T > createBuilder() { return DomBuilderCreator.create(builderClass); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/DomChainBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/DomChainBuilderBase.java index e15c14a1f58..64cc591ec21 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/DomChainBuilderBase.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/DomChainBuilderBase.java @@ -18,7 +18,7 @@ import java.util.Map; * @author Tony Vaagenes */ public abstract class DomChainBuilderBase<COMPONENT extends ChainedComponent<?>, CHAIN extends Chain<COMPONENT>> - extends VespaDomBuilder.DomConfigProducerBuilder<CHAIN, AnyConfigProducer> { + extends VespaDomBuilder.DomConfigProducerBuilderBase<CHAIN> { private final Collection<ComponentsBuilder.ComponentType<COMPONENT>> allowedComponentTypes; protected final Map<String, ComponentsBuilder.ComponentType<?>> outerComponentTypeByComponentName; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/DomChainsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/DomChainsBuilder.java index 98e1e256d17..3434417afb8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/DomChainsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/DomChainsBuilder.java @@ -23,7 +23,7 @@ import java.util.Map; */ public abstract class DomChainsBuilder<COMPONENT extends ChainedComponent<?>, CHAIN extends Chain<COMPONENT>, CHAINS extends Chains<CHAIN>> - extends VespaDomBuilder.DomConfigProducerBuilder<CHAINS, AnyConfigProducer> + extends VespaDomBuilder.DomConfigProducerBuilderBase<CHAINS> { private final Collection<ComponentType<COMPONENT>> allowedComponentTypes; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocumentProcessorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocumentProcessorBuilder.java index ee73ca093cf..3e30e27a8c3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocumentProcessorBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DomDocumentProcessorBuilder.java @@ -13,7 +13,7 @@ import org.w3c.dom.Element; * * @author gjoranv */ -public class DomDocumentProcessorBuilder extends VespaDomBuilder.DomConfigProducerBuilder<DocumentProcessor, AnyConfigProducer> { +public class DomDocumentProcessorBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<DocumentProcessor> { @Override protected DocumentProcessor doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> ancestor, Element documentProcessorElement) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java index c064d5edc37..e4422e427ee 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java @@ -15,7 +15,7 @@ import org.w3c.dom.Element; * @author bratseth * @since 5.1.6 */ -public class DomProcessorBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Processor, AnyConfigProducer> { +public class DomProcessorBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<Processor> { @Override protected Processor doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> ancestor, Element processorElement) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java index e9bfc28752b..64541780942 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java @@ -27,7 +27,7 @@ import java.util.Optional; * * @author Tony Vaagenes */ -public class DomFederationSearcherBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Searcher<?>, AnyConfigProducer> { +public class DomFederationSearcherBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<Searcher<?>> { static class FederationSearcherModelBuilder extends GenericChainedComponentModelBuilder { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearcherBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearcherBuilder.java index 3a2e2300cac..f416da82a8e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearcherBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearcherBuilder.java @@ -14,7 +14,7 @@ import org.w3c.dom.Element; * Builds a Searcher from XML. * @author Tony Vaagenes */ -public class DomSearcherBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Searcher<?>, AnyConfigProducer> { +public class DomSearcherBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<Searcher<?>> { @Override protected Searcher<ChainedComponentModel> doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> ancestor, Element searcherElement) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterBuilder.java index 07a159436a4..e04fe416f36 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/FilterBuilder.java @@ -16,7 +16,7 @@ import org.w3c.dom.Element; * @author Tony Vaagenes * @author gjoranv */ -public class FilterBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Filter, AnyConfigProducer> { +public class FilterBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<Filter> { @Override protected Filter doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> ancestor, Element filterElement) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java index 477274eb10a..ae13bed4bb4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java @@ -28,7 +28,7 @@ import java.util.logging.Level; * @author Tony Vaagenes * @author gjoranv */ -public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http, AnyConfigProducer> { +public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<Http> { static final String REQUEST_CHAIN_TAG_NAME = "request-chain"; static final String RESPONSE_CHAIN_TAG_NAME = "response-chain"; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java index 37aa16dd92c..0e39f94d721 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java @@ -24,7 +24,7 @@ import java.util.Optional; * @author Einar M R Rosenvinge * @author mortent */ -public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ConnectorFactory, AnyConfigProducer> { +public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<ConnectorFactory> { @Override protected ConnectorFactory doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> ancestor, Element serverSpec) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyHttpServerBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyHttpServerBuilder.java index 846c9b53f61..04a50b198f4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyHttpServerBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyHttpServerBuilder.java @@ -14,7 +14,7 @@ import org.w3c.dom.Element; /** * @author Einar M R Rosenvinge */ -public class JettyHttpServerBuilder extends VespaDomBuilder.DomConfigProducerBuilder<JettyHttpServer, AnyConfigProducer> { +public class JettyHttpServerBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<JettyHttpServer> { private final ContainerCluster<?> cluster; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java index ee7a9a7f457..f4bb21af4c2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java @@ -41,7 +41,7 @@ public class AccessLogBuilder { } } - private static class DomBuilder extends VespaDomBuilder.DomConfigProducerBuilder<AccessLogComponent, AnyConfigProducer> { + private static class DomBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<AccessLogComponent> { private final AccessLogType accessLogType; private final boolean isHostedVespa; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index af4ed037298..ceba3864296 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -192,7 +192,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } private ApplicationContainerCluster createContainerCluster(Element spec, ConfigModelContext modelContext) { - return new VespaDomBuilder.DomConfigProducerBuilder<ApplicationContainerCluster, AnyConfigProducer>() { + return new VespaDomBuilder.DomConfigProducerBuilderBase<ApplicationContainerCluster>() { @Override protected ApplicationContainerCluster doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> ancestor, Element producerSpec) { return new ApplicationContainerCluster(ancestor, modelContext.getProducerId(), diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java index 57a6e29e07d..b3665f4998a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java @@ -11,7 +11,7 @@ import org.w3c.dom.Element; /** * @author Tony Vaagenes */ -public class ContainerServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ApplicationContainer, AnyConfigProducer> { +public class ContainerServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<ApplicationContainer> { private final String id; private final int index; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java index ee78412f6ec..8ec4ae35658 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterControllerConfig.java @@ -17,9 +17,9 @@ import org.w3c.dom.Element; * * TODO: Author */ -public class ClusterControllerConfig extends TreeConfigProducer<ClusterControllerConfig> implements FleetcontrollerConfig.Producer { +public class ClusterControllerConfig extends AnyConfigProducer implements FleetcontrollerConfig.Producer { - public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<ClusterControllerConfig, AnyConfigProducer> { + public static class Builder extends VespaDomBuilder.DomConfigProducerBuilderBase<ClusterControllerConfig> { private final String clusterName; private final ModelElement clusterElement; private final ResourceLimits resourceLimits; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index 0eed56a990b..71726b50391 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -78,7 +78,7 @@ public class ContentSearchCluster extends TreeConfigProducer<AnyConfigProducer> /** Whether the nodes of this cluster also hosts a container cluster in a hosted system */ private final double fractionOfMemoryReserved; - public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<ContentSearchCluster, AnyConfigProducer> { + public static class Builder extends VespaDomBuilder.DomConfigProducerBuilderBase<ContentSearchCluster> { private final Map<String, NewDocumentType> documentDefinitions; private final Set<NewDocumentType> globallyDistributedDocuments; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java index dc62d079e88..d73f1618dbc 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java @@ -33,7 +33,7 @@ public class DistributorCluster extends TreeConfigProducer<Distributor> implemen private final GcOptions gc; private final boolean hasIndexedDocumentType; private final int maxActivationInhibitedOutOfSyncGroups; - public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<DistributorCluster, AnyConfigProducer> { + public static class Builder extends VespaDomBuilder.DomConfigProducerBuilderBase<DistributorCluster> { ContentCluster parent; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java index 7b269f62902..2d67a344a17 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java @@ -29,7 +29,7 @@ public class StorageCluster extends TreeConfigProducer<StorageNode> PersistenceConfig.Producer, MetricsmanagerConfig.Producer { - public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<StorageCluster, AnyConfigProducer> { + public static class Builder extends VespaDomBuilder.DomConfigProducerBuilderBase<StorageCluster> { @Override protected StorageCluster doBuild(DeployState deployState, TreeConfigProducer<AnyConfigProducer> ancestor, Element producerSpec) { final ModelElement clusterElem = new ModelElement(producerSpec); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java index c8e01201047..c3de655af92 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java @@ -70,7 +70,7 @@ public class SearchNode extends AbstractService implements private final Optional<ResourceLimits> resourceLimits; private final double fractionOfMemoryReserved; - public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<SearchNode, AnyConfigProducer> { + public static class Builder extends VespaDomBuilder.DomConfigProducerBuilderBase<SearchNode> { private final String name; private final NodeSpec nodeSpec; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java b/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java index a520f09eef4..1bdf28e1954 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/TransactionLogServer.java @@ -25,7 +25,7 @@ public class TransactionLogServer extends AbstractService { setProp("clustertype", "search"); } - public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<TransactionLogServer, AnyConfigProducer> { + public static class Builder extends VespaDomBuilder.DomConfigProducerBuilderBase<TransactionLogServer> { private final String clusterName; private final Boolean useFsync; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java index ffd880e089a..6dddb9d4322 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/DomTestServiceBuilder.java @@ -13,7 +13,7 @@ import org.w3c.dom.Element; public class DomTestServiceBuilder { - static class SimpleServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<SimpleService, AnyConfigProducer> { + static class SimpleServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<SimpleService> { int i; public SimpleServiceBuilder(int i) { @@ -26,7 +26,7 @@ public class DomTestServiceBuilder { } } - static class ApiServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ApiService, AnyConfigProducer> { + static class ApiServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<ApiService> { int i; public ApiServiceBuilder(int i) { @@ -39,7 +39,7 @@ public class DomTestServiceBuilder { } } - static class ParentServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ParentService, AnyConfigProducer> { + static class ParentServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilderBase<ParentService> { int i; public ParentServiceBuilder(int i) { |