diff options
Diffstat (limited to 'docproc')
12 files changed, 10 insertions, 81 deletions
diff --git a/docproc/abi-spec.json b/docproc/abi-spec.json index bc76aefb958..65ca886efaf 100644 --- a/docproc/abi-spec.json +++ b/docproc/abi-spec.json @@ -11,7 +11,7 @@ "public abstract java.util.Map documentTypes()", "public abstract java.util.Map structTypes()", "public abstract java.util.Map annotationTypes()", - "public com.yahoo.document.Document getDocumentCopy(java.lang.String, com.yahoo.document.datatypes.StructuredFieldValue, com.yahoo.document.DocumentId)" + "public abstract com.yahoo.document.Document getDocumentCopy(java.lang.String, com.yahoo.document.datatypes.StructuredFieldValue, com.yahoo.document.DocumentId)" ], "fields": [] }, @@ -269,7 +269,6 @@ "methods": [ "public void <init>()", "public static com.yahoo.docproc.Processing of(com.yahoo.document.DocumentOperation)", - "public static com.yahoo.docproc.Processing fromDocumentOperation(com.yahoo.document.DocumentOperation)", "public void <init>(java.lang.String, com.yahoo.document.DocumentOperation, com.yahoo.docproc.CallStack)", "public static com.yahoo.docproc.Processing createProcessingFromDocumentOperations(java.lang.String, java.util.List, com.yahoo.docproc.CallStack)", "public com.yahoo.component.provider.ComponentRegistry getDocprocServiceRegistry()", @@ -312,7 +311,6 @@ ], "methods": [ "public void <init>()", - "public void process(com.yahoo.document.Document)", "public void process(com.yahoo.document.DocumentPut)", "public void process(com.yahoo.document.DocumentUpdate)", "public void process(com.yahoo.document.DocumentRemove)", diff --git a/docproc/pom.xml b/docproc/pom.xml index 6fe2458ce95..3def1a65a44 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -8,12 +8,12 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>docproc</artifactId> <packaging>jar</packaging> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/docproc/src/main/java/com/yahoo/docproc/AbstractConcreteDocumentFactory.java b/docproc/src/main/java/com/yahoo/docproc/AbstractConcreteDocumentFactory.java index 36686caf7ac..8f771418959 100644 --- a/docproc/src/main/java/com/yahoo/docproc/AbstractConcreteDocumentFactory.java +++ b/docproc/src/main/java/com/yahoo/docproc/AbstractConcreteDocumentFactory.java @@ -28,18 +28,5 @@ public abstract class AbstractConcreteDocumentFactory extends com.yahoo.componen * * @return A concrete document instance */ - public com.yahoo.document.Document getDocumentCopy(java.lang.String type, com.yahoo.document.datatypes.StructuredFieldValue src, com.yahoo.document.DocumentId id) { - // Note: This method can't be abstract because it must work with older bundles where the ConcreteDocumentFactory may not implement it. - // It is overridden to not use reflection by newer bundles. - // The implementation here is not so good in bundles, since it instantiates the doc using reflection. - // TODO: for 6.0: make this method abstract and throw away the code below. - Class<? extends Document> concreteClass = documentTypes().get(type); - try { - Constructor<? extends Document> copyCon = concreteClass.getConstructor(StructuredFieldValue.class, DocumentId.class); - return copyCon.newInstance(src, id); - } catch (InvocationTargetException | NoSuchMethodException | InstantiationException | IllegalAccessException e) { - throw new RuntimeException(Exceptions.toMessageString(e), e); - } - } - + public abstract com.yahoo.document.Document getDocumentCopy(java.lang.String type, com.yahoo.document.datatypes.StructuredFieldValue src, com.yahoo.document.DocumentId id); } diff --git a/docproc/src/main/java/com/yahoo/docproc/Processing.java b/docproc/src/main/java/com/yahoo/docproc/Processing.java index eacbf6ef132..e157ad0b09b 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Processing.java +++ b/docproc/src/main/java/com/yahoo/docproc/Processing.java @@ -61,16 +61,6 @@ public class Processing { return new Processing(documentOperation); } - /** - * Create a Processing from the given document operation - * @deprecated Use {@link #of(DocumentOperation)} instead - */ - @Deprecated - @SuppressWarnings("unused") - public static Processing fromDocumentOperation(DocumentOperation documentOperation) { - return Processing.of(documentOperation); - } - private Processing(DocumentOperation documentOperation) { this(); addDocumentOperation(documentOperation); diff --git a/docproc/src/main/java/com/yahoo/docproc/SimpleDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/SimpleDocumentProcessor.java index bcd1ee521bc..bb9ef8ff636 100644 --- a/docproc/src/main/java/com/yahoo/docproc/SimpleDocumentProcessor.java +++ b/docproc/src/main/java/com/yahoo/docproc/SimpleDocumentProcessor.java @@ -28,29 +28,16 @@ import com.yahoo.log.LogLevel; public class SimpleDocumentProcessor extends DocumentProcessor { /** - * Override this to process the Document inside a DocumentPut. - * @deprecated use process(DocumentPut) - * - * @param document the Document to process. - */ - @Deprecated - // TODO: Remove on Vespa 7 - public void process(Document document) { - if (log.isLoggable(LogLevel.DEBUG)) { - log.log(LogLevel.DEBUG, "Ignored " + document); - } - } - - /** * Override this to process DocumentPuts. If this method is not overridden, the implementation in this class * will ignore DocumentPuts (passing them through un-processed). If processing of this DocumentPut fails, the * implementation must throw a {@link RuntimeException}. * * @param put the DocumentPut to process. */ - @SuppressWarnings("deprecation") public void process(DocumentPut put) { - process(put.getDocument()); + if (log.isLoggable(LogLevel.DEBUG)) { + log.log(LogLevel.DEBUG, "Ignored " + put); + } } /** diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java index 7b6c96ffa4a..89f3782da52 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java @@ -7,8 +7,6 @@ import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.*; import com.yahoo.log.LogLevel; import com.yahoo.messagebus.Message; -import com.yahoo.vdslib.DocumentList; -import com.yahoo.vdslib.Entry; import java.util.logging.Logger; diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java index ac9310784f2..b540f1c204d 100644 --- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java +++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java @@ -290,18 +290,6 @@ public class ProxyDocument extends Document implements DocumentOperationWrapper } @Override - @SuppressWarnings("deprecation") - public void serializeHeader(Serializer target) throws SerializationException { - doc.serializeHeader(target); - } - - @Override - @SuppressWarnings("deprecation") - public void serializeBody(Serializer target) throws SerializationException { - doc.serializeBody(target); - } - - @Override public DocumentType getDataType() { return doc.getDataType(); } diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java index 517f44cb983..51f9afa7a2e 100644 --- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java +++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java @@ -11,7 +11,6 @@ import com.yahoo.document.serialization.DocumentUpdateWriter; import com.yahoo.document.update.FieldUpdate; import java.util.Collection; -import java.util.List; import java.util.Map; /** @@ -19,7 +18,6 @@ import java.util.Map; * * @author vegardh */ -// TODO Vespa 7 Remove all deprecated methods public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOperationWrapper { private DocumentUpdate docU; @@ -47,13 +45,6 @@ public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOpera } @Override - @Deprecated - @SuppressWarnings( "deprecation" ) - public FieldUpdate getFieldUpdate(int index) { - return docU.getFieldUpdate(index); - } - - @Override public FieldUpdate getFieldUpdate(String fieldName) { String mapped = fieldMap.get(fieldName); if (mapped==null) { @@ -64,12 +55,6 @@ public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOpera } @Override - @Deprecated - @SuppressWarnings( "deprecation" ) - public List<FieldUpdate> getFieldUpdates() { - return docU.getFieldUpdates(); - } - @Override public Collection<FieldUpdate> fieldUpdates() { return docU.fieldUpdates(); } diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java index e0ca630889d..375c0e0552a 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java @@ -16,8 +16,6 @@ import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.Reply; -import com.yahoo.vdslib.DocumentList; -import com.yahoo.vdslib.Entry; import org.junit.Test; import java.util.ArrayList; diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java index e7f750dc8dd..2158901b009 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java @@ -12,8 +12,6 @@ import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.WriteDocumentReply; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.Reply; -import com.yahoo.vdslib.DocumentList; -import com.yahoo.vdslib.Entry; import org.junit.Test; import java.util.*; diff --git a/docproc/src/test/java/com/yahoo/docproc/util/docindoc.sd b/docproc/src/test/java/com/yahoo/docproc/util/docindoc.sd index 8b6acd71f47..b05f8d71c89 100644 --- a/docproc/src/test/java/com/yahoo/docproc/util/docindoc.sd +++ b/docproc/src/test/java/com/yahoo/docproc/util/docindoc.sd @@ -1,7 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search docindoc { document docindoc { - field name type string { header } - field content type string { body } + field name type string { } + field content type string { } } } diff --git a/docproc/src/test/java/com/yahoo/docproc/util/outerdoc.sd b/docproc/src/test/java/com/yahoo/docproc/util/outerdoc.sd index 6fdbd402ffe..57a1bda323a 100644 --- a/docproc/src/test/java/com/yahoo/docproc/util/outerdoc.sd +++ b/docproc/src/test/java/com/yahoo/docproc/util/outerdoc.sd @@ -1,6 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search outerdoc { document outerdoc { - field innerdocuments type array<docindoc> { body } + field innerdocuments type array<docindoc> { } } } |