diff options
3 files changed, 11 insertions, 5 deletions
diff --git a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java index f86c11d431c..f89e79c4cfa 100644 --- a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java +++ b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java @@ -59,8 +59,10 @@ public final class DocumentProcessing { * @return Progress.DONE or Progress.FAILED * @throws RuntimeException if one of the document processors in the chain throws, or if the calling thread is interrupted */ + @SuppressWarnings("removal") // TODO Vespa 8: remove public DocumentProcessor.Progress process(ComponentSpecification chain, com.yahoo.docproc.Processing processing) { DocprocExecutor executor = getExecutor(chain); + // TODO Vespa 8: Use TBD instead, this method will be removed processing.setDocprocServiceRegistry(handler.getDocprocServiceRegistry()); return executor.processUntilDone(processing); } @@ -78,12 +80,15 @@ public final class DocumentProcessing { * @return any Progress * @throws RuntimeException if one of the document processors in the chain throws */ + @SuppressWarnings("removal") // TODO Vespa 8: remove public DocumentProcessor.Progress processOnce(ComponentSpecification chain, com.yahoo.docproc.Processing processing) { DocprocExecutor executor = getExecutor(chain); + // TODO Vespa 8: Use TBD instead, this method will be removed processing.setDocprocServiceRegistry(handler.getDocprocServiceRegistry()); return executor.process(processing); } + @SuppressWarnings("removal") // TODO Vespa 8: remove private DocprocExecutor getExecutor(ComponentSpecification chain) { DocprocService service = handler.getDocprocServiceRegistry().getComponent(chain); if (service == null) { diff --git a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java index d5b027e2479..7361723a3a5 100644 --- a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java +++ b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java @@ -274,6 +274,7 @@ public class ApplicationStatusHandler extends AbstractRequestHandler { return jsonMapper.createObjectNode(); } + @SuppressWarnings("removal") // TODO Vespa 8: remove private static JsonNode renderDocprocChains(Container container) { ObjectNode ret = jsonMapper.createObjectNode(); for (RequestHandler h : container.getRequestHandlerRegistry().allComponents()) { diff --git a/docproc/src/main/java/com/yahoo/docproc/Processing.java b/docproc/src/main/java/com/yahoo/docproc/Processing.java index 3e092038e69..47ebb6a7988 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Processing.java +++ b/docproc/src/main/java/com/yahoo/docproc/Processing.java @@ -140,10 +140,10 @@ public class Processing { } /** - * @deprecated Use GVL TBD instead + * @deprecated Use TBD instead */ - // TODO GVL: used to: processing.setDocprocServiceRegistry(this.documentProcessingHandler.getDocprocServiceRegistry()); - // from Processor and LoggingRequestHandler + // TODO: used to: processing.setDocprocServiceRegistry(this.documentProcessingHandler.getDocprocServiceRegistry()); + // from Processor and LoggingRequestHandler @Deprecated(forRemoval = true, since="7") @SuppressWarnings("removal") // TODO Vespa 8: remove public void setDocprocServiceRegistry(ComponentRegistry<DocprocService> docprocServiceRegistry) { @@ -166,9 +166,9 @@ public class Processing { * if #getServiceName returns a name that is not registered in {@link com.yahoo.docproc.DocprocService}. * * @return the service processing this, or null if unknown. - * @deprecated Use GVL TBD instead + * @deprecated Use TBD instead */ - // TODO GVL: used to getService().getDocumentTypeManager() in subclasses of DocumentProcessor + // TODO: used to getService().getDocumentTypeManager() in subclasses of DocumentProcessor @Deprecated(forRemoval = true, since="7") @SuppressWarnings("removal") // TODO Vespa 8: remove public DocprocService getService() { |