diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-12-13 09:59:33 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-12-13 09:59:33 +0100 |
commit | 76f043b07a87b7e56f8ab37880a13177ccdfc6de (patch) | |
tree | 9710d242235234d4cc98f4d09a9b5f2da69c00bf | |
parent | d377c98a3e13ea071cce48ec2f72e3bc09c91316 (diff) |
Nonfunctional changes only
8 files changed, 9 insertions, 12 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java index f4dd655d80c..fa875e53875 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java @@ -34,8 +34,7 @@ import static com.yahoo.jdisc.http.HttpRequest.Method; * framework, e.g. Processing. * * @author hmusum - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @since 5.1 + * @author Steinar Knutsen */ public class HttpRequest { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/PrefixItem.java b/container-search/src/main/java/com/yahoo/prelude/query/PrefixItem.java index 9c3a88178f7..5f285a394c8 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/PrefixItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/PrefixItem.java @@ -17,6 +17,8 @@ public class PrefixItem extends WordItem { super(prefix, isFromQuery); } + public PrefixItem(String prefix, String indexName) { super(prefix, indexName); } + public ItemType getItemType() { return ItemType.PREFIX; } diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java index 75ae960cac0..61846fc386c 100644 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/searcher/JuniperSearcher.java @@ -34,7 +34,7 @@ import com.yahoo.search.searchchain.PhaseNames; * Note: This searcher only converts backend binary highlighting and separators * to the configured highlighting and separator tags. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ @After(PhaseNames.RAW_QUERY) @Before(PhaseNames.TRANSFORMED_QUERY) diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/NGramSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/NGramSearcher.java index 2775ba33146..7a2fc1bc7e5 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/NGramSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/NGramSearcher.java @@ -17,10 +17,7 @@ import com.yahoo.search.Searcher; import com.yahoo.search.result.Hit; import com.yahoo.search.searchchain.Execution; -import java.util.Collections; import java.util.Iterator; -import java.util.List; -import java.util.Set; import static com.yahoo.prelude.searcher.JuniperSearcher.JUNIPER_TAG_REPLACING; import static com.yahoo.language.LinguisticsCase.toLowerCase; diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java index 92a2065d76b..6a3180fc488 100644 --- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java @@ -58,7 +58,7 @@ public class QueryTestCase { assertEquals("", q.properties().get("aParameter")); assertNull(q.properties().get("notSetParameter")); } - + // TODO: YQL work in progress (jon) @Ignore @Test diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java index a210660aae5..d893bb443b7 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; * <p>For every successfully dispatched Request (i.e. a non-null ContentChannel has been retrieved), there will be * exactly one {@link Response} returned to the provided {@link ResponseHandler}.</p> * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen * @see Container * @see Response */ diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java index 580f83ca5a8..661f96d7dc3 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; * A HTTP request. * * @author <a href="mailto:anirudha@yahoo-inc.com">Anirudha Khanna</a> - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest { diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java index c37cb51d7ca..fdfc64d7ba4 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/FeedHandler.java @@ -39,7 +39,7 @@ import java.util.zip.GZIPInputStream; /** * Accept feeds from outside of the Vespa cluster. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen * @since 5.1 */ public class FeedHandler extends LoggingRequestHandler { @@ -79,8 +79,7 @@ public class FeedHandler extends LoggingRequestHandler { /** * Exposed for creating mocks. */ - protected DocumentTypeManager createDocumentManager( - DocumentmanagerConfig documentManagerConfig) { + protected DocumentTypeManager createDocumentManager(DocumentmanagerConfig documentManagerConfig) { return new DocumentTypeManager(documentManagerConfig); } |