diff options
Diffstat (limited to 'vespaclient-container-plugin/src/main/java/com/yahoo')
3 files changed, 22 insertions, 22 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java index 4390f70cac0..7a59be49458 100755 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java @@ -7,6 +7,7 @@ import com.yahoo.document.Field; import com.yahoo.document.datatypes.FieldValue; import com.yahoo.document.datatypes.Raw; import com.yahoo.io.ByteWriter; +import com.yahoo.prelude.templates.Context; import com.yahoo.text.XML; import java.io.IOException; @@ -37,7 +38,7 @@ public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTempl } @Override - public void error(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void error(Context context, Writer writer) throws IOException { // Error shouldn't be handled by this template, but rather // delegated to the searcher } @@ -54,7 +55,7 @@ public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTempl } @Override - public void header(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void header(Context context, Writer writer) throws IOException { if (wrapXml) { // XML wrapping should only be used for default field rendering writer.write("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>\n"); @@ -63,14 +64,14 @@ public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTempl } @Override - public void footer(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void footer(Context context, Writer writer) throws IOException { if (wrapXml) { writer.write("</result>\n"); } } @Override - public void hit(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void hit(Context context, Writer writer) throws IOException { DocumentHit hit = (DocumentHit)context.get("hit"); Document doc = hit.getDocument(); // Assume field existence has been checked before we ever get here. @@ -87,11 +88,11 @@ public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTempl } @Override - public void hitFooter(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void hitFooter(Context context, Writer writer) throws IOException { } @Override - public void noHits(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void noHits(Context context, Writer writer) throws IOException { } } diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java index b16f39800ef..25ee0ff5d03 100755 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java @@ -6,6 +6,7 @@ import com.yahoo.search.Result; import com.yahoo.search.result.ErrorHit; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.result.HitGroup; +import com.yahoo.prelude.templates.Context; import com.yahoo.search.result.Hit; import com.yahoo.text.XML; @@ -54,7 +55,7 @@ public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplat } @Override - public void error(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void error(Context context, Writer writer) throws IOException { writer.write("<errors>\n"); // If the error contains no error hits, use a single error with the main // code and description. Otherwise, use the error hits explicitly @@ -71,7 +72,7 @@ public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplat } @Override - public void header(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void header(Context context, Writer writer) throws IOException { writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); writer.write("<result>\n"); HitGroup rootGroup = ((Result) context.get("result")).hits(); @@ -81,12 +82,12 @@ public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplat } @Override - public void footer(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void footer(Context context, Writer writer) throws IOException { writer.write("</result>\n"); } @Override - public void hit(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void hit(Context context, Writer writer) throws IOException { Hit hit = (Hit)context.get("hit"); if (hit instanceof DocumentHit) { DocumentHit docHit = (DocumentHit) hit; @@ -109,11 +110,11 @@ public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplat } @Override - public void hitFooter(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void hitFooter(Context context, Writer writer) throws IOException { } @Override - public void noHits(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException { + public void noHits(Context context, Writer writer) throws IOException { } } diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java index 835a11bf7c2..5f1c96d000f 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java @@ -183,9 +183,9 @@ class ClientFeederV3 { if (! operationId.isPresent()) { return Optional.empty(); } - final DocumentOperationMessageV3 message; + final DocumentOperationMessageV3 msg; try { - message = getNextMessage(operationId.get(), requestInputStream, settings); + msg = getNextMessage(operationId.get(), requestInputStream, settings); } catch (Exception e) { if (log.isLoggable(LogLevel.DEBUG)) { log.log(LogLevel.DEBUG, Exceptions.toMessageString(e), e); @@ -195,9 +195,8 @@ class ClientFeederV3 { continue; } - if (message != null) - setRoute(message, settings); - return Optional.ofNullable(message); + setRoute(msg, settings); + return Optional.of(msg); } } @@ -274,7 +273,6 @@ class ClientFeederV3 { } // protected for mocking - /** Returns the next message in the stream, or null if none */ protected DocumentOperationMessageV3 getNextMessage( String operationId, InputStream requestInputStream, FeederSettings settings) throws Exception { VespaXMLFeedReader.Operation operation = streamReaderV3.getNextOperation(requestInputStream, settings); @@ -287,14 +285,14 @@ class ClientFeederV3 { null); } - DocumentOperationMessageV3 message = DocumentOperationMessageV3.create(operation, operationId, metric); - if (message == null) { + DocumentOperationMessageV3 msg = DocumentOperationMessageV3.create(operation, operationId, metric); + if (msg == null) { // typical end of feed return null; } metric.add(MetricNames.NUM_OPERATIONS, 1, null /*metricContext*/); - log(LogLevel.DEBUG, "Successfully deserialized document id: ", message.getOperationId()); - return message; + log(LogLevel.DEBUG, "Successfully deserialized document id: ", msg.getOperationId()); + return msg; } private void setMessageParameters(DocumentOperationMessageV3 msg, FeederSettings settings) { |