diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-08-16 14:38:02 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-08-16 14:38:02 +0200 |
commit | 920b4a169d82b917d1686c376bcbb401f8702e18 (patch) | |
tree | 566b12f562efdb2c207723b6e004416798e00179 | |
parent | 4324d883cbd8fe08a919d776772052c4e2fef297 (diff) |
Remove dead code
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java | 29 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java | 21 |
2 files changed, 0 insertions, 50 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java index 11e97bc8a95..2b3e4515740 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java @@ -2,8 +2,6 @@ package com.yahoo.vespa.model; import com.yahoo.config.ConfigBuilder; -import com.yahoo.config.ConfigInstance; -import com.yahoo.config.ConfigurationRuntimeException; import com.yahoo.config.codegen.CNode; import com.yahoo.config.codegen.InnerCNode; import com.yahoo.config.codegen.LeafCNode; @@ -38,24 +36,6 @@ class InstanceResolver { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InstanceResolver.class.getName()); /** - * Resolves this config key into a correctly typed ConfigInstance using the given config builder. - * FIXME: Make private once config overrides are deprecated.? - * - * @param builder a ConfigBuilder to create the instance from. - * @param targetDef the def to use - * @return the config instance or null of no producer for this found in model - */ - static ConfigInstance resolveToInstance(ConfigInstance.Builder builder, InnerCNode targetDef) { - try { - if (targetDef != null) applyDef(builder, targetDef); - Class<? extends ConfigInstance> clazz = getConfigClass(builder.getClass()); - return clazz.getConstructor(builder.getClass()).newInstance(builder); - } catch (Exception e) { - throw new ConfigurationRuntimeException(e); - } - } - - /** * If some fields on the builder are null now, set them from the def. Do recursively. * <p> * If the targetDef has some schema incompatibilities, they are not handled here @@ -126,15 +106,6 @@ class InstanceResolver { } } - @SuppressWarnings("unchecked") - private static Class<? extends ConfigInstance> getConfigClass(Class<? extends ConfigInstance.Builder> builderClass) { - Class<?> configClass = builderClass.getEnclosingClass(); - if (configClass == null || ! ConfigInstance.class.isAssignableFrom(configClass)) { - throw new ConfigurationRuntimeException("Builder class " + builderClass + " has enclosing class " + configClass + ", which is not a ConfigInstance"); - } - return (Class<? extends ConfigInstance>) configClass; - } - static String packageName(ConfigDefinitionKey cKey, PackagePrefix packagePrefix) { return packagePrefix.value + cKey.getNamespace(); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 6aa5c92ca17..1c87fced55f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -14,7 +14,6 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.ValidationId; import com.yahoo.config.application.api.ValidationOverrides; -import com.yahoo.config.codegen.InnerCNode; import com.yahoo.config.model.ApplicationConfigProducerRoot; import com.yahoo.config.model.ConfigModelRegistry; import com.yahoo.config.model.ConfigModelRepo; @@ -42,7 +41,6 @@ import com.yahoo.searchdefinition.document.SDField; import com.yahoo.searchdefinition.processing.Processing; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.config.ConfigKey; -import com.yahoo.vespa.config.ConfigPayload; import com.yahoo.vespa.config.ConfigPayloadBuilder; import com.yahoo.vespa.config.GenericConfig.GenericConfigBuilder; import com.yahoo.vespa.model.InstanceResolver.PackagePrefix; @@ -64,7 +62,6 @@ import com.yahoo.vespa.model.ml.OnnxModelInfo; import com.yahoo.vespa.model.routing.Routing; import com.yahoo.vespa.model.search.AbstractSearchCluster; import com.yahoo.vespa.model.utils.internal.ReflectionUtil; -import com.yahoo.yolean.Exceptions; import org.xml.sax.SAXException; import java.io.IOException; @@ -483,7 +480,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri log.log(Level.FINE, () -> "Trying to get config for " + builder.getClass().getDeclaringClass().getName() + " for config id " + quote(configProducer.getConfigId()) + ", found=" + found + ", foundOverride=" + foundOverride); - } /** @@ -511,23 +507,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri return builder; } - private ConfigPayload getConfigFromBuilder(ConfigInstance.Builder builder, InnerCNode targetDef) { - if (builder instanceof GenericConfigBuilder) return ((GenericConfigBuilder) builder).getPayload(); - - try { - ConfigInstance instance = InstanceResolver.resolveToInstance(builder, targetDef); - log.log(Level.FINE, () -> "getConfigFromBuilder for builder " + builder.getClass().getName() + ", instance=" + instance); - return ConfigPayload.fromInstance(instance); - } catch (ConfigurationRuntimeException e) { - // This can happen in cases where services ask for config that no longer exist before they have been able - // to reconfigure themselves. This happens for instance whenever jdisc reconfigures itself until - // ticket 6599572 is fixed. When that happens, consider propagating a full error rather than empty payload - // back to the client. - log.log(Level.INFO, "Error resolving instance for builder '" + builder.getClass().getName() + "', returning empty config: " + Exceptions.toMessageString(e)); - return ConfigPayload.fromBuilder(new ConfigPayloadBuilder()); - } - } - @Override public Set<ConfigKey<?>> allConfigsProduced() { Set<ConfigKey<?>> keySet = new LinkedHashSet<>(); |