diff options
Diffstat (limited to 'config-model/src/main/java/com')
52 files changed, 17 insertions, 187 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java deleted file mode 100644 index d80df441798..00000000000 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.config.model; - -import java.io.Serializable; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static com.yahoo.text.Lowercase.toLowerCase; - -/** - * Utilities for config models - * - * @author gjoranv - */ -// TODO: Split this into appropriate classes, or move to ConfigModel superclass -public class ConfigModelUtils implements Serializable { - - private static final long serialVersionUID = 1L; - - public static Pattern hourNmin = Pattern.compile("(\\d\\d):(\\d\\d)"); - - public static Map<String, Integer> day2int; - static { - day2int = new HashMap<>(); - day2int.put("sunday", 0); - day2int.put("monday", 1); - day2int.put("tuesday", 2); - day2int.put("wednesday", 3); - day2int.put("thursday", 4); - day2int.put("friday", 5); - day2int.put("saturday", 6); - } - - /** Parses a 24 hour clock that must be the five characters ##:## to an int stating minutes after midnight. */ - public static int getTimeOfDay(String time) { - Matcher m = ConfigModelUtils.hourNmin.matcher(time); - if (m.matches()) { - return Integer.parseInt(m.group(1)) * 60 + Integer.parseInt(m.group(2)); - } - throw new IllegalArgumentException("The string '" + time + "' is not in ##:## format."); - } - - /** Parses a day of week name in english to an int, where 0 is sunday, 6 saturday. */ - public static int getDayOfWeek(String day) { - return ConfigModelUtils.day2int.get(toLowerCase(day)); - } - -} diff --git a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java index 9178e4beca9..d94a9c1580a 100644 --- a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java +++ b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java @@ -5,20 +5,19 @@ import com.google.inject.Inject; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.config.model.builder.xml.ConfigModelBuilder; import com.yahoo.config.model.builder.xml.ConfigModelId; -import com.yahoo.log.LogLevel; -import org.osgi.framework.Bundle; -import org.osgi.framework.FrameworkUtil; -import java.util.*; -import java.util.logging.Logger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Ulf Lilleengen - * @since 5.1 */ public class MapConfigModelRegistry extends ConfigModelRegistry { - private static final Logger log = Logger.getLogger(MapConfigModelRegistry.class.getPackage().getName()); private final List<ConfigModelBuilder> builders; /** diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java b/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java index 22dce91140d..9aeb5c40b28 100644 --- a/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java +++ b/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java @@ -1,9 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.producer; -import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.log.LogLevel; -import com.yahoo.vespa.config.*; +import com.yahoo.vespa.config.ConfigDefinitionKey; +import com.yahoo.vespa.config.ConfigPayload; +import com.yahoo.vespa.config.ConfigPayloadBuilder; import java.util.LinkedHashMap; import java.util.Map; @@ -14,7 +14,6 @@ import java.util.Set; * how the user configs are stored, and defines the methods to retrieve user configs and merge the repo with others. * * @author Ulf Lilleengen - * @since 5.1 */ public class UserConfigRepo { private final Map<ConfigDefinitionKey, ConfigPayloadBuilder> userConfigsMap; @@ -46,10 +45,6 @@ public class UserConfigRepo { this.userConfigsMap = map; } - public UserConfigRepo(UserConfigRepo userConfigRepo) { - this.userConfigsMap = userConfigRepo.userConfigsMap; - } - public ConfigPayloadBuilder get(ConfigDefinitionKey key) { return userConfigsMap.get(key); } diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Host.java b/config-model/src/main/java/com/yahoo/config/model/provision/Host.java index 8c8debbae43..c8d92220db3 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/Host.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/Host.java @@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableList; import com.yahoo.component.Version; import com.yahoo.config.provision.Flavor; -import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java index b381a5f28db..60435decb04 100644 --- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java +++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java @@ -341,7 +341,7 @@ public class MockApplicationPackage implements ApplicationPackage { } @Override - public Reader createReader() throws FileNotFoundException { + public Reader createReader() { try { if ( ! exists()) throw new FileNotFoundException("File '" + file + "' does not exist"); return IOUtils.createReader(file, "UTF-8"); @@ -352,7 +352,7 @@ public class MockApplicationPackage implements ApplicationPackage { } @Override - public InputStream createInputStream() throws FileNotFoundException { + public InputStream createInputStream() { try { if ( ! exists()) throw new FileNotFoundException("File '" + file + "' does not exist"); return new BufferedInputStream(new FileInputStream(file)); diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java index 13d4064f55f..74ab4504136 100644 --- a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java +++ b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java @@ -7,7 +7,6 @@ import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.ConfigModelContext; import com.yahoo.config.model.ConfigModelRepo; import com.yahoo.config.model.api.HostProvisioner; -import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.builder.xml.XmlHelper; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java index d738929f721..7a34ff258b7 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -20,7 +20,6 @@ import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; import com.yahoo.searchlib.rankingexpression.evaluation.Value; import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode; import com.yahoo.tensor.TensorType; -import com.yahoo.tensor.evaluation.TypeContext; import com.yahoo.vespa.model.VespaModel; import java.io.File; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java index 6481d42446f..bf1939e2c3d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java @@ -8,7 +8,6 @@ import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DocumentTypeManager; import com.yahoo.io.IOUtils; import com.yahoo.io.reader.NamedReader; -import com.yahoo.search.query.profile.QueryProfile; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.search.query.profile.config.QueryProfileXMLReader; import com.yahoo.searchdefinition.derived.SearchOrderer; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java index a807cc79d95..ed09a95b4f4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java @@ -11,7 +11,6 @@ import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.search.config.IndexInfoConfig; import java.util.*; -import java.util.stream.Stream; /** * Per-index commands which should be applied to queries prior to searching diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java index dc6c17e425e..94d475cf519 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java @@ -4,7 +4,6 @@ package com.yahoo.searchdefinition.derived; import com.yahoo.document.DataType; import com.yahoo.document.PositionDataType; import com.yahoo.searchdefinition.Search; -import com.yahoo.searchdefinition.document.Attribute; import com.yahoo.searchdefinition.document.ImmutableSDField; import com.yahoo.vespa.configdefinition.IlscriptsConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig.Ilscript.Builder; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java index f88da34428d..78400666c36 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.derived; -import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.document.DataType; import com.yahoo.prelude.fastsearch.DocsumDefinitionSet; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java index b7b796d8976..e3bbf78ec21 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java @@ -4,8 +4,6 @@ package com.yahoo.searchdefinition.derived.validation; import com.yahoo.searchdefinition.Search; import com.yahoo.searchdefinition.derived.DerivedConfiguration; -import java.util.logging.Logger; - /** * @author mathiasm */ diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java index cae9b20b7b5..6df8a7998a6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java @@ -1,11 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.document; -import java.io.Serializable; -import java.util.Arrays; -import java.util.Collections; -import java.util.Set; - /** * The rank type of a field. For now this is just a container of a string name. * This class is immutable. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java index 630c8644eb1..c76b8536ea0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java @@ -3,9 +3,7 @@ package com.yahoo.searchdefinition.expressiontransforms; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.MapEvaluationTypeContext; import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.searchlib.rankingexpression.evaluation.Value; import com.yahoo.searchlib.rankingexpression.transform.TransformContext; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java index 59dc4275e15..f0575f1f70f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java @@ -6,11 +6,9 @@ import com.yahoo.searchdefinition.RankProfileRegistry; import com.yahoo.searchdefinition.Search; import com.yahoo.searchdefinition.document.ImmutableImportedComplexSDField; import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.ImportedComplexField; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; -import com.yahoo.searchdefinition.document.ImmutableImportedSDField; import java.util.stream.Stream; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java index 6e089d6155b..e8c958f9609 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java @@ -8,18 +8,13 @@ import com.yahoo.document.PositionDataType; import com.yahoo.searchdefinition.RankProfileRegistry; import com.yahoo.searchdefinition.Search; import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.ImmutableImportedSDField; import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.ImportedField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryField.Source; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; -import java.util.LinkedList; -import java.util.List; - /* * Adjusts position summary fields by adding derived summary fields (.distance and .position) and setting summary * transform and source. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java index b0129c0a836..fbe04881ce1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java @@ -4,7 +4,6 @@ package com.yahoo.searchdefinition.processing; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.searchdefinition.RankProfileRegistry; import com.yahoo.searchdefinition.Search; -import com.yahoo.searchdefinition.document.SDDocumentType; import com.yahoo.searchdefinition.document.SDField; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java index cd75f1f8df7..483fe2105a3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java @@ -2,14 +2,9 @@ package com.yahoo.searchdefinition.processing.multifieldresolver; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.language.Linguistics; -import com.yahoo.searchdefinition.Index; import com.yahoo.searchdefinition.Search; import com.yahoo.searchdefinition.document.SDField; import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.processing.BuiltInFieldSets; -import com.yahoo.vespa.indexinglanguage.expressions.*; -import com.yahoo.vespa.indexinglanguage.linguistics.AnnotatorConfig; import java.util.List; import java.util.logging.Level; diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java index 5905ee3c3b5..1ff674da439 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.documentmodel; import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.DocumentTypeManager; import java.util.HashMap; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducerRoot.java index 2d4b8e9201f..b30aa5aeca6 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducerRoot.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducerRoot.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model; import com.yahoo.config.ConfigInstance; -import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.filedistribution.FileDistributor; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Host.java b/config-model/src/main/java/com/yahoo/vespa/model/Host.java index 1aff926a8c4..a952d63526b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/Host.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/Host.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model; import java.io.File; -import java.io.IOException; import java.util.Objects; import com.yahoo.cloud.config.SentinelConfig; @@ -68,7 +67,7 @@ public final class Host extends AbstractConfigProducer<AbstractConfigProducer<?> } @Override - public void writeFiles(File directory) throws IOException { + public void writeFiles(File directory) { } @Override diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java b/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java index 225d0bbcb11..69b692e3ad9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java @@ -6,7 +6,6 @@ import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.provision.NetworkPorts; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java index 8b47c03f4a4..6da8df60161 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java @@ -6,7 +6,6 @@ import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.HostInfo; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.Flavor; -import com.yahoo.config.provision.NetworkPorts; import javax.annotation.Nullable; import java.util.ArrayList; @@ -18,7 +17,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.logging.Level; import java.util.stream.Collectors; /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java index 0dde5c99d4a..09e67ed96cb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java @@ -8,7 +8,6 @@ import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.HostSpec; -import com.yahoo.config.provision.NetworkPorts; import com.yahoo.config.provision.ProvisionLogger; import java.net.UnknownHostException; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index 03c8055dd12..d31c411a39e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -119,8 +119,6 @@ public class Admin extends AbstractConfigProducer implements Serializable { return configservers; } - public void removeSlobroks() { slobroks.clear(); } - /** Returns an immutable list of the slobroks in this */ public List<Slobrok> getSlobroks() { return Collections.unmodifiableList(slobroks); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java index be3ec8a6a14..25dbd62e647 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.admin; import com.yahoo.collections.CollectionUtil; import com.yahoo.cloud.config.ZookeepersConfig; -import com.yahoo.config.model.api.ConfigServerSpec; import java.util.ArrayList; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java index 61a42d1c1a6..8ba85047057 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java @@ -8,7 +8,6 @@ import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.model.Service; import com.yahoo.vespa.model.admin.Configserver; import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerCluster; import java.util.ArrayList; import java.util.Collection; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java index a2275b17233..866f647a351 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model.application.validation.change; import com.yahoo.config.model.api.ConfigChangeAction; -import com.yahoo.documentmodel.NewDocumentType; import com.yahoo.vespa.model.VespaModel; import com.yahoo.config.application.api.ValidationId; import com.yahoo.config.application.api.ValidationOverrides; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java index 74e3ac581c4..63661104dae 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.builder.xml.dom; -import com.yahoo.config.model.deploy.DeployState; import com.yahoo.text.XML; import com.yahoo.vespa.model.clients.Clients; import org.w3c.dom.Element; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java index 9b33568b61e..10979a21838 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java @@ -4,14 +4,8 @@ package com.yahoo.vespa.model.clients; import com.yahoo.vespa.config.content.LoadTypeConfig; import com.yahoo.config.model.ConfigModel; import com.yahoo.config.model.ConfigModelContext; -import com.yahoo.config.model.ConfigModelRepo; -import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; -import com.yahoo.vespa.model.container.ContainerCluster; - -import java.util.LinkedList; -import java.util.List; /** * This is the clients plugin for the Vespa model. It is responsible for creating diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java index 3b0bb959a7b..3fa4db60195 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java @@ -1,8 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.container.component; -import com.yahoo.config.model.producer.AbstractConfigProducer; -import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.chain.Chains; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Servlet.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Servlet.java index 011fcb7c3c7..e8d733f26a2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Servlet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Servlet.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.container.component; -import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.jdisc.http.ServletPathsConfig; import com.yahoo.osgi.provider.model.ComponentModel; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java index 57d5c203d32..5a251194d75 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java @@ -3,13 +3,12 @@ package com.yahoo.vespa.model.container.docproc; import com.yahoo.collections.Pair; import com.yahoo.config.docproc.DocprocConfig; -import com.yahoo.container.jdisc.config.SessionConfig; -import com.yahoo.container.jdisc.ContainerMbusConfig; import com.yahoo.config.docproc.SchemamappingConfig; +import com.yahoo.container.jdisc.ContainerMbusConfig; +import com.yahoo.container.jdisc.config.SessionConfig; import com.yahoo.docproc.jdisc.messagebus.MbusRequestContext; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.ContainerSubsystem; -import com.yahoo.vespa.model.container.component.chain.ProcessingHandler; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.HashMap; @@ -18,7 +17,6 @@ import java.util.Map; /** * @author einarmr * @author gjoranv - * @since 5.1.9 */ public class ContainerDocproc extends ContainerSubsystem<DocprocChains> implements @@ -70,18 +68,10 @@ public class ContainerDocproc extends ContainerSubsystem<DocprocChains> return preferLocalNode; } - public void setPreferLocalNode(boolean preferLocalNode) { - this.preferLocalNode = preferLocalNode; - } - public int getNumNodesPerClient() { return numNodesPerClient; } - public void setNumNodesPerClient(int numNodesPerClient) { - this.numNodesPerClient = numNodesPerClient; - } - @Override public void getConfig(ContainerMbusConfig.Builder builder) { builder.maxpendingcount(getMaxMessagesInQueue()); @@ -116,10 +106,6 @@ public class ContainerDocproc extends ContainerSubsystem<DocprocChains> } } - public ProcessingHandler<DocprocChains> getDocprocHandler() { - return getChains().getDocprocHandler(); - } - @Override public void getConfig(SchemamappingConfig.Builder builder) { Map<Pair<String, String>, String> allMappings = new HashMap<>(); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocumentProcessor.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocumentProcessor.java index 92b636ed48b..62ea405179a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocumentProcessor.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocumentProcessor.java @@ -5,9 +5,6 @@ import com.yahoo.collections.Pair; import com.yahoo.vespa.model.container.component.chain.ChainedComponent; import com.yahoo.vespa.model.container.docproc.model.DocumentProcessorModel; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; /** 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 9a67871e683..a03c5e1ec42 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 @@ -86,7 +86,7 @@ public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> impl } @Override - public void validate() throws Exception { + public void validate() { validate(bindings); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java index 3ad6484aaec..efae7278b14 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model.container.processing; import com.yahoo.component.chain.model.ChainedComponentModel; -import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.model.container.component.chain.ChainedComponent; /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java index d2f7c5e4549..f1e081f4304 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java @@ -6,7 +6,6 @@ import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.prelude.fastsearch.FS4ResourcePool; import com.yahoo.prelude.semantics.SemanticRulesConfig; import com.yahoo.vespa.model.container.ApplicationContainerCluster; -import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.ContainerSubsystem; import com.yahoo.vespa.model.container.search.searchchain.LocalProvider; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java index c7114178ad6..2e95f02f260 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java @@ -14,7 +14,6 @@ import java.io.Serializable; import java.util.*; import java.util.Map.Entry; import java.util.logging.Level; -import java.util.stream.Collectors; /** * Owns the query profiles and query profile types to be handed to the qrs nodes. diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfilesBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfilesBuilder.java index b832c1bbdcd..b653b0acf8d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfilesBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfilesBuilder.java @@ -6,7 +6,6 @@ import com.yahoo.io.reader.NamedReader; import com.yahoo.search.query.profile.config.QueryProfileXMLReader; import com.yahoo.config.application.api.ApplicationPackage; -import java.util.Collections; import java.util.List; /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java index cb1d94717f6..aa820d1d898 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java @@ -85,7 +85,7 @@ public class LocalProvider extends Provider implements } } - private void addProviderSearchers(LocalProviderSpec providerSpec) { + private void addProviderSearchers() { for (ChainedComponentModel searcherModel : LocalProviderSpec.searcherModels) { addInnerComponent(new Searcher<>(searcherModel)); } @@ -130,7 +130,7 @@ public class LocalProvider extends Provider implements FederationOptions federationOptions, LocalProviderSpec providerSpec) { super(specWithoutInnerSearchers, federationOptions); - addProviderSearchers(providerSpec); + addProviderSearchers(); this.providerSpec = providerSpec; } 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 672ee0bb161..2bfb1da9dcb 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 @@ -79,7 +79,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -import java.util.logging.Level; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java index dc9372c463b..d25396c6a50 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java @@ -1,10 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.content; -import com.yahoo.config.provision.Flavor; import com.yahoo.metrics.MetricsmanagerConfig; import com.yahoo.vespa.config.content.LoadTypeConfig; -import com.yahoo.vespa.config.content.StorFilestorConfig; import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig; import com.yahoo.vespa.config.content.core.StorServerConfig; import com.yahoo.vespa.config.content.core.StorStatusConfig; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java index 67e5dcdd0ee..12ebde2276a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model.content; import com.yahoo.vespa.config.search.core.ProtonConfig; -import com.yahoo.vespa.defaults.Defaults; import java.util.Optional; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java index ff3b4891146..c02f8b2b737 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.content.engines; import com.yahoo.vespa.config.content.core.StorServerConfig; import com.yahoo.vespa.model.content.StorageNode; -import com.yahoo.vespa.model.search.SearchNode; /** * @author baldersheim diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java index 46d621981d4..4fa117ad9e7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model.content.storagecluster; import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig; -import com.yahoo.config.model.ConfigModelUtils; import com.yahoo.vespa.model.builder.xml.dom.ModelElement; import com.yahoo.vespa.model.content.cluster.ContentCluster; @@ -21,9 +20,6 @@ public class IntegrityCheckerProducer implements StorIntegritycheckerConfig.Prod private Integer stopTime; private String weeklyCycle; - IntegrityCheckerProducer() { - } - IntegrityCheckerProducer(Integer startTime, Integer stopTime, String weeklyCycle) { this.startTime = startTime; this.stopTime = stopTime; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java index e12cc60b041..3e70ac4705e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java @@ -31,7 +31,6 @@ import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode; import com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; -import com.yahoo.tensor.evaluation.TypeContext; import com.yahoo.tensor.functions.Generate; import com.yahoo.tensor.functions.Join; import com.yahoo.tensor.functions.Reduce; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java index b29ed0fc25b..74b9e7309c8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.search; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.search.config.IndexInfoConfig; -import com.yahoo.searchdefinition.RankingConstant; import com.yahoo.searchdefinition.derived.DerivedConfiguration; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.config.search.ImportedFieldsConfig; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java index df5f2e844af..df44a429f9c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.search; -import com.yahoo.collections.Pair; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.component.chain.Phase; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingProcessor.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingProcessor.java index a23191e7689..d3d2c8873eb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingProcessor.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingProcessor.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.search; -import com.yahoo.collections.Pair; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchColumn.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchColumn.java deleted file mode 100644 index b45db0d1dc3..00000000000 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchColumn.java +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.search; - -import com.yahoo.config.model.producer.AbstractConfigProducer; - -import java.util.LinkedList; -import java.util.List; - -/** - * @author Simon Thoresen Hult - */ -public class SearchColumn extends AbstractConfigProducer { - - // All search nodes contained in this column, these also exist as child config producers. - private final List<SearchNode> nodes = new LinkedList<>(); - - public SearchColumn(SearchCluster parent, String name, int index) { - super(parent, name); - } - - /** @return The number of rows in this column. */ - public int getNumRows() { return nodes.size(); } - - /** @return All search nodes contained in this column. */ - public List<SearchNode> getSearchNodes() { return nodes; } - -} diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/Duration.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/Duration.java index 0b1e23510fe..c55316186d2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/utils/Duration.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/Duration.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.utils; import java.util.HashMap; import java.util.Map; -import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java index 8995fcbca99..46d41b1e0b0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java @@ -20,8 +20,6 @@ import java.util.*; */ public class FileSender implements Serializable { - public enum FileType {FILE, URI}; - /** * Send the given file to all given services. * |