diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-02-14 09:46:55 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-02-14 09:46:55 +0000 |
commit | ae39a53c627ef4e57612b24dfebb460cb3338327 (patch) | |
tree | 6f2ffa0ee07404afcb1233b498e91b215fd06ec7 /config-model/src/main/java/com/yahoo/config/model/producer | |
parent | 4426f0ee45846a905d2fe47bb0b998014d86ad39 (diff) |
minor cleanup
* add author
* move helper method to the using class
* cleanup unneccessary imports
* remove unused member variable
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/producer')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java | 17 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java | 22 |
2 files changed, 12 insertions, 27 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java index 2cfe1590ad9..cd21fccd855 100644 --- a/config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java +++ b/config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java @@ -14,15 +14,11 @@ import com.yahoo.vespa.config.GenericConfig; import com.yahoo.vespa.model.ConfigProducer; import com.yahoo.vespa.model.HostSystem; import com.yahoo.vespa.model.Service; -import com.yahoo.vespa.model.SimpleConfigProducer; import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.admin.monitoring.Monitoring; -import com.yahoo.vespa.model.utils.FreezableMap; -import java.io.PrintStream; + import java.io.Serializable; -import java.util.ArrayList; import java.util.Collections; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; @@ -33,6 +29,7 @@ import java.util.logging.Logger; * Config producers constructs and returns config instances on request. * * @author gjoranv + * @author arnej */ public abstract class AnyConfigProducer implements ConfigProducer, ConfigInstance.Producer, Serializable { @@ -42,8 +39,6 @@ public abstract class AnyConfigProducer private final String subId; private String configId = null; - private final List<Service> descendantServices = new ArrayList<>(); - private TreeConfigProducer parent = null; private UserConfigRepo userConfigs = new UserConfigRepo(); @@ -93,14 +88,6 @@ public abstract class AnyConfigProducer } /** - * Helper to provide an error message on collisions of sub ids (ignore SimpleConfigProducer, use the parent in that case) - */ - protected String errorMsgClassName() { - if (getClass().equals(SimpleConfigProducer.class)) return parent.getClass().getSimpleName(); - return getClass().getSimpleName(); - } - - /** * Sets the user configs for this producer. * * @param repo User configs repo. diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java index 6b632572250..d7cabaa54be 100644 --- a/config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java +++ b/config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java @@ -2,21 +2,10 @@ package com.yahoo.config.model.producer; import com.yahoo.api.annotations.Beta; -import com.yahoo.config.ConfigInstance; import com.yahoo.config.model.ApplicationConfigProducerRoot; -import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.config.subscription.ConfigInstanceUtil; -import com.yahoo.vespa.config.ConfigDefinitionKey; -import com.yahoo.vespa.config.ConfigPayload; -import com.yahoo.vespa.config.ConfigPayloadBuilder; -import com.yahoo.vespa.config.ConfigTransformer; -import com.yahoo.vespa.config.GenericConfig; import com.yahoo.vespa.model.ConfigProducer; -import com.yahoo.vespa.model.HostSystem; import com.yahoo.vespa.model.Service; import com.yahoo.vespa.model.SimpleConfigProducer; -import com.yahoo.vespa.model.admin.Admin; -import com.yahoo.vespa.model.admin.monitoring.Monitoring; import com.yahoo.vespa.model.utils.FreezableMap; import java.io.PrintStream; import java.io.Serializable; @@ -29,10 +18,11 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * Superclass for all config producers with children. + * Superclass for all producers with children. * Config producers constructs and returns config instances on request. * * @author gjoranv + * @author arnej */ public abstract class TreeConfigProducer<CHILD extends AnyConfigProducer> extends AnyConfigProducer @@ -63,6 +53,14 @@ public abstract class TreeConfigProducer<CHILD extends AnyConfigProducer> } /** + * Helper to provide an error message on collisions of sub ids (ignore SimpleConfigProducer, use the parent in that case) + */ + private String errorMsgClassName() { + if (getClass().equals(SimpleConfigProducer.class)) return getParent().getClass().getSimpleName(); + return getClass().getSimpleName(); + } + + /** * Adds a child to this config producer. * * @param child the child config producer to add |