summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/config/model/builder
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-11-12 13:09:03 +0100
committerJon Bratseth <bratseth@gmail.com>2020-11-12 13:09:03 +0100
commit6040bb66d3b635f08fc692498b610692a3fcba25 (patch)
treedd49ea81937a8a13e539a1e8003fb455944504db /config-model/src/main/java/com/yahoo/config/model/builder
parent3c6feeacafa088c71660565cc35a402101e4376c (diff)
Non-functional changes only
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/builder')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
index b1e197db4eb..9b0f883bc2c 100644
--- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java
@@ -20,11 +20,10 @@ import java.util.List;
* Builds a config model using DOM parsers
*
* @author vegardh
- * @since 5.1.10
*/
public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends AbstractComponent implements ConfigModelPlugin {
- private Class<MODEL> configModelClass;
+ private final Class<MODEL> configModelClass;
public ConfigModelBuilder(Class<MODEL> configModelClass) {
this.configModelClass = configModelClass;
@@ -34,16 +33,16 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
* Method that must return the XML elements this builder handles. Subclasses must implement this in order to
* get called when one of the elements have been encountered when parsing.
*
- * @return A list of elements that this builder handles.
+ * @return a list of elements that this builder handles
*/
public abstract List<ConfigModelId> handlesElements();
/**
* Convenience hook called from {@link #build}. Implement this method to build a config model.
*
- * @param spec The XML element that this builder should handle.
- * @param modelContext A model context that contains the application package and other data needed by the
- * config model constructor.
+ * @param spec the XML element that this builder should handle
+ * @param modelContext a model context that contains the application package and other data needed by the
+ * config model constructor
*/
public abstract void doBuild(MODEL model, Element spec, ConfigModelContext modelContext);
@@ -56,7 +55,7 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
* @param spec the XML element this is constructed from
*/
public final MODEL build(DeployState deployState, VespaModel vespaModel, ConfigModelRepo configModelRepo,
- AbstractConfigProducer parent, Element spec) {
+ AbstractConfigProducer<?> parent, Element spec) {
ConfigModelContext context = ConfigModelContext.create(deployState, vespaModel, configModelRepo, parent, getIdString(spec));
return build(new DefaultModelInstanceFactory(), spec, context);
}
@@ -92,7 +91,7 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
if (!(other instanceof ConfigModelBuilder)) {
return false;
}
- ConfigModelBuilder otherBuilder = (ConfigModelBuilder) other;
+ ConfigModelBuilder<?> otherBuilder = (ConfigModelBuilder<?>) other;
List<ConfigModelId> thisIds = this.handlesElements();
List<ConfigModelId> otherIds = otherBuilder.handlesElements();
if (thisIds.size() != otherIds.size()) {
@@ -118,4 +117,5 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst
}
}
}
+
}