diff options
author | Harald Musum <musum@oath.com> | 2018-12-02 14:48:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-02 14:48:46 +0100 |
commit | 3d7da2d3d5d93231fa0351a6b716f9dea7ba2b81 (patch) | |
tree | cd1cddf00418b943df6e15dda45051f89a989e43 /config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java | |
parent | 0c39992b60e6103a85fa00362df74930a660e51c (diff) | |
parent | 051c699dee05fc0a2f5e9a83ddd49016114d8bfb (diff) |
Merge pull request #7832 from vespa-engine/bratseth/deprecate-provisioning-version
Deprecate com.yahoo.config.provision.Version
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java | 13 |
1 files changed, 10 insertions, 3 deletions
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 4442b42bb88..ca6bdee82cf 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 @@ -5,13 +5,14 @@ import com.yahoo.config.application.api.ApplicationMetaData; import com.yahoo.config.application.api.ComponentInfo; import com.yahoo.config.application.api.UnparsedConfigDefinition; import com.yahoo.config.application.api.ApplicationFile; -import com.yahoo.config.provision.Version; +import com.yahoo.component.Version; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; import com.yahoo.io.reader.NamedReader; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.search.query.profile.config.QueryProfileXMLReader; -import com.yahoo.searchdefinition.*; +import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.searchdefinition.SearchBuilder; import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.config.application.api.ApplicationPackage; @@ -25,7 +26,13 @@ import java.io.InputStream; import java.io.Reader; import java.io.StringReader; import java.io.UncheckedIOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; /** |