diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-11-20 13:20:33 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@oath.com> | 2018-11-20 13:20:33 +0100 |
| commit | 2343bf2644506b6fa385af92631d48ff9c16f915 (patch) | |
| tree | b13c488696112d4567b78adeee3be05c48002680 /config-model | |
| parent | a549b3d81757eb3670982c936c1312a939003816 (diff) | |
Deprecation cleanup
Diffstat (limited to 'config-model')
4 files changed, 4 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModel.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModel.java index b4a5a865b9e..761c3645bad 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModel.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModel.java @@ -39,10 +39,7 @@ public abstract class ConfigModel { * This default implementation does nothing. * * @param configModelRepo The ConfigModelRepo of the VespaModel - * @deprecated This will go away in the next Vespa major release. Instead, inject the models you depend on - * in your config model constructor. */ - @Deprecated public void initialize(ConfigModelRepo configModelRepo) { return; } /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java index cefccca5ec8..de391df5050 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java @@ -42,7 +42,6 @@ public class ContainerModel extends ConfigModel { } @Override - @Deprecated public void initialize(ConfigModelRepo configModelRepo) { List<AbstractSearchCluster> searchClusters = Content.getSearchClusters(configModelRepo); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChain.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChain.java index a970cceabf4..4eb3fee83d8 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChain.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChain.java @@ -10,9 +10,10 @@ import java.util.Map; import static com.yahoo.container.core.ChainsConfig.Chains.Type; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class DocprocChain extends Chain<DocumentProcessor> { + private Map<Pair<String, String>, String> fieldNameSchemaMap; private static final Type.Enum TYPE = Type.Enum.DOCPROC; @@ -40,4 +41,5 @@ public class DocprocChain extends Chain<DocumentProcessor> { public Type.Enum getType() { return TYPE; } + } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java index 6fe0a807b77..071d51aae52 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java @@ -23,8 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> - * @since 5.1.13 + * @author Einar M R Rosenvinge */ public class IndexingAndDocprocRoutingTest extends ContentBaseTest { @Test |