diff options
author | gjoranv <gv@verizonmedia.com> | 2022-04-01 14:22:54 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-04-01 14:22:54 +0200 |
commit | c40e5e5c175258fc8545d4e3bab5769cfca50403 (patch) | |
tree | dd894dc6fed0b1f70487502d57976f1d05e59722 /docproc/src | |
parent | ffade9acb7b44f15104367aa69301bea05b6f252 (diff) |
Deprecate Splitter- and JoinerDocumentProcessor
Diffstat (limited to 'docproc/src')
3 files changed, 8 insertions, 6 deletions
diff --git a/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java index 46a33dbff7b..4e0a5b3eea6 100644 --- a/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java +++ b/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java @@ -15,12 +15,12 @@ import java.util.logging.Level; import java.util.logging.Logger; -import static com.yahoo.docproc.util.SplitterDocumentProcessor.validate; -import static com.yahoo.docproc.util.SplitterDocumentProcessor.doProcessOuterDocument; - /** * @author Einar M R Rosenvinge + * @deprecated Will be removed on Vespa 8 without replacement */ +@Deprecated(forRemoval = true, since = "7") +@SuppressWarnings("removal") public class JoinerDocumentProcessor extends DocumentProcessor { private static Logger log = Logger.getLogger(JoinerDocumentProcessor.class.getName()); @@ -35,12 +35,12 @@ public class JoinerDocumentProcessor extends DocumentProcessor { this.arrayFieldName = cfg.arrayFieldName(); this.contextFieldName = cfg.contextFieldName(); manager = DocumentTypeManagerConfigurer.configureNewManager(documentmanagerConfig); - validate(manager, documentTypeName, arrayFieldName); + SplitterDocumentProcessor.validate(manager, documentTypeName, arrayFieldName); } @Override public Progress process(Processing processing) { - if ( ! doProcessOuterDocument(processing.getVariable(contextFieldName), documentTypeName)) { + if ( ! SplitterDocumentProcessor.doProcessOuterDocument(processing.getVariable(contextFieldName), documentTypeName)) { return Progress.DONE; } diff --git a/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java index 07248e02a4f..1c6e7617edb 100644 --- a/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java +++ b/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java @@ -20,7 +20,9 @@ import java.util.stream.Collectors; /** * @author Einar M R Rosenvinge + * @deprecated Will be removed on Vespa 8 without replacement */ +@Deprecated(forRemoval = true, since = "7") public class SplitterDocumentProcessor extends DocumentProcessor { private static Logger log = Logger.getLogger(SplitterDocumentProcessor.class.getName()); diff --git a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java index 43fe404e0c5..10e10011e55 100644 --- a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; /** * @author Einar M R Rosenvinge */ -@SuppressWarnings({"unchecked"}) +@SuppressWarnings({"unchecked", "removal"}) public class SplitterJoinerTestCase { @Test |