diff options
| author | Arne Juul <arnej@yahooinc.com> | 2023-02-14 12:21:15 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahooinc.com> | 2023-02-14 12:36:13 +0000 |
| commit | 644c64e344ec92e03a41c6d1945242f525c31a34 (patch) | |
| tree | d43870c81299a5b5b7fd9f2fb1f8dee222831f7c /config-model/src | |
| parent | 4952685746717a2022024f06b889ed29b2d6d36f (diff) | |
use simpler superclasses
Diffstat (limited to 'config-model/src')
2 files changed, 4 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java index ebf0a6ed07a..c7f74b8f018 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.model.container.http; import com.yahoo.component.provider.ComponentRegistry; +import com.yahoo.config.model.producer.AnyConfigProducer; import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.jdisc.http.ServerConfig; import com.yahoo.vespa.model.container.component.chain.ChainedComponent; @@ -17,7 +18,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * @author Tony Vaagenes * @author bjorncs */ -public class Http extends TreeConfigProducer<TreeConfigProducer<?>> implements ServerConfig.Producer { +public class Http extends TreeConfigProducer<AnyConfigProducer> implements ServerConfig.Producer { private final FilterChains filterChains; private final List<FilterBinding> bindings = new CopyOnWriteArrayList<>(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java index e6c5912f8ff..37a49d439be 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java @@ -7,6 +7,7 @@ import com.yahoo.config.ConfigInstance; import com.yahoo.test.RestartConfig; import com.yahoo.test.SimpletypesConfig; import com.yahoo.config.model.api.ConfigChangeAction; +import com.yahoo.config.model.producer.AnyConfigProducer; import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.config.model.producer.AbstractConfigProducerRoot; import com.yahoo.config.model.test.MockRoot; @@ -252,7 +253,7 @@ public class ConfigValueChangeValidatorTest { @Override public void allocatePorts(int start, PortAllocBridge from) { } } - private static class SimpleConfigProducer extends TreeConfigProducer<TreeConfigProducer<?>> + private static class SimpleConfigProducer extends TreeConfigProducer<AnyConfigProducer> implements RestartConfig.Producer { public final int value; |