diff options
Diffstat (limited to 'container-search/src/main')
129 files changed, 129 insertions, 129 deletions
diff --git a/container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java b/container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java index 4ebe0819d9e..1aee548a7de 100644 --- a/container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java +++ b/container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java @@ -10,7 +10,7 @@ import java.nio.ByteBuffer; * packets used today, they allow more flexible sets of parameters * to be shipped with query results. This packet can be decoded only. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DocsumPacket extends Packet { diff --git a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java index fb909a480b1..bc20e7e9501 100644 --- a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java +++ b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; * <p>A packet for requesting a list of document summaries. * This packet can be encoded only.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class GetDocSumsPacket extends Packet { diff --git a/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java b/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java index 948c537f068..47ea2b76dbf 100644 --- a/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java +++ b/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java @@ -17,7 +17,7 @@ import java.util.Set; /** * A static utility for encoding values to the binary map representation used in fs4 packets. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapEncoder { diff --git a/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java b/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java index f63ef59e093..0f6f58ba7b7 100644 --- a/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java +++ b/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; /** * Returns the correct package for a package byte stream * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author <a href="mailto:borud@yahoo-inc.com">Bj\u00f8rn Borud</a> */ public class PacketDecoder { diff --git a/container-search/src/main/java/com/yahoo/prelude/Index.java b/container-search/src/main/java/com/yahoo/prelude/Index.java index 5b1944c352b..4f596cefa95 100644 --- a/container-search/src/main/java/com/yahoo/prelude/Index.java +++ b/container-search/src/main/java/com/yahoo/prelude/Index.java @@ -18,7 +18,7 @@ import java.util.Set; * addCommand sets both types. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Index { diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java index 77ee36785f7..d183a47a66f 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java @@ -16,7 +16,7 @@ import com.yahoo.search.result.ErrorMessage; * Monitors of a cluster of remote nodes. The monitor uses an internal thread * for node monitoring. * - * @author <a href="mailto:jon.bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class ClusterMonitor implements Runnable, Freezable { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java index dfca9c49cba..cd94d2a59ec 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java @@ -41,7 +41,7 @@ import static com.yahoo.container.util.Util.quote; * The searcher which forwards queries to fdispatch nodes, using the fnet/fs4 * network layer. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ // TODO: Clean up all the duplication in the various search methods by // switching to doing all the error handling using exceptions below doSearch2. diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java index e5a7d433324..01f12753ea7 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java @@ -15,7 +15,7 @@ import com.yahoo.log.LogLevel; * size limiting factor. Directly modelled after com.yahoo.collections.Cache. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class PacketCache extends LinkedHashMap<CacheKey, PacketWrapper> { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java index 66931f37369..44d38b0d96a 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.fastsearch; /** * Information about a rank profile * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class RankProfile { diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java index 8c3d587a059..8d46b7ae441 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java @@ -6,7 +6,7 @@ import java.io.IOException; /** * Thrown on communication timeouts * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class TimeoutException extends IOException { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java b/container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java index 993c395b191..6aebf73c6ec 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; /** * A query item which never matches. This is sometimes an useful output of query rewriting. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class FalseItem extends Item { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java index 90a9ce5a07f..da998088534 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java @@ -18,7 +18,7 @@ import java.nio.ByteBuffer; * If a range is specified in brackets, it is also permissible to add a third number specifying the number of hits this * will match on each node - [from;to;hitLimit] * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IntItem extends TermItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java b/container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java index 8fb16e8a3ba..ae6fa4c81bd 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.query.textualrepresentation.Discloser; * Special words known by the index used for marking things. * The reserved word itself is not public, while a symbol representation is. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class MarkerWordItem extends WordItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java index abac8200f49..244706222a4 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java @@ -9,7 +9,7 @@ package com.yahoo.prelude.query; * <p> * This type functions as a marked interfaces for query rewriters. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.22 */ public abstract class NonReducibleCompositeItem extends CompositeItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NotItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NotItem.java index 0432795b716..61f04e6419e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/NotItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/NotItem.java @@ -10,7 +10,7 @@ import java.util.Iterator; * <p>A composite item where the first item is positive and the following * items are negative items which should be excluded from the result. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ // TODO: Handle nulls by creating nullItem or checking in encode/toString public class NotItem extends CompositeItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java b/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java index 410eb1c35f5..f52d711ff3d 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java @@ -12,7 +12,7 @@ import java.util.*; * A class which canonicalizes and validates queries. * This class is multithread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryCanonicalizer { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/Substring.java b/container-search/src/main/java/com/yahoo/prelude/query/Substring.java index fa304d6b63a..7c9a5040b63 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/Substring.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/Substring.java @@ -6,7 +6,7 @@ package com.yahoo.prelude.query; * An substring which also provides access to the full (query) string it is a substring of. * This is immutable. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Substring { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/TermType.java b/container-search/src/main/java/com/yahoo/prelude/query/TermType.java index f2b38d5eacb..7f88cfd2a9b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/TermType.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/TermType.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.query; /** * A term type enumeration * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class TermType { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java index 17ee905400e..f56d3ab02c7 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.query.parser; /** * Parser exceptions. JavaCC legacy, never thrown. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class ParseException extends RuntimeException { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java index 27ad26279e7..48a68325018 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.query.Substring; /** * A query token. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Token { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java index a1ad4983f34..cfc22f038c0 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java @@ -9,7 +9,7 @@ import java.util.List; * An iterator-like view of a list, but typed, random-accessible * and with more convenience methods * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class TokenPosition { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java index e52a0347834..582395bc738 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java @@ -16,7 +16,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.*; /** * Query tokenizer. Singlethreaded. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public final class Tokenizer { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java index 519f07b0aa3..bf673083596 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java @@ -16,7 +16,7 @@ import java.util.Set; * <li>"a b": Phrase search for a followed by b * </ul> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class WebParser extends AllParser { diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java index da969986394..86fdee2bad9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java @@ -14,7 +14,7 @@ import static com.yahoo.language.LinguisticsCase.toLowerCase; /** * <p>Detects query phrases using an automaton. This class is thread safe.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PhraseMatcher { diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java index f3d4b09c65c..78c046efd10 100644 --- a/container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java @@ -19,7 +19,7 @@ import java.util.List; * <p>Detects query phrases. When a phrase is detected in the query, * the query is mutated to reflect this fact.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> */ @After(PhaseNames.RAW_QUERY) diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java index f4b3ab3406a..fa6df50efe4 100644 --- a/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java @@ -26,7 +26,7 @@ import java.util.Set; * Any field in the configured hits which has a name starting by attribute * will be returned when attribute prefetch filling is requested.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @SuppressWarnings({"rawtypes"}) public class DocumentSourceSearcher extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java index d3f51e76712..e236d60ff84 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java @@ -15,7 +15,7 @@ import java.util.*; * A set of semantic production rules and named conditions used to analyze * and rewrite queries * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RuleBase { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java index 34c113ceec8..2eb94eee603 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics; /** * Thrown on rule base consistency problems * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class RuleBaseException extends RuntimeException { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java index f2650fef83a..fd63bcdbc33 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.rule.Condition; * closed if there are no further choices. In addition it contains enough information to enable * the rule evaluation to backtrack to this point * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class Choicepoint { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java index fe3543fc655..0b0ae0918aa 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java @@ -14,7 +14,7 @@ import java.util.Set; * An evaluation of a query over a rule base. There is one evaluation for each evaluation * of one query over one rule base. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Evaluation { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java index 00a66206b46..d52741d7c1e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.engine; /** * Thrown on semantic exceptions on evaluation over a rule base * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class EvaluationException extends RuntimeException { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java index 1631d60df6b..475f99640f2 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java @@ -6,7 +6,7 @@ import com.yahoo.prelude.query.TermItem; /** * An item which knows its position in its parent * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class FlattenedItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java index fc7aec62412..5bdb58aba75 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.query.WordItem; /** * A match * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class Match { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java index 76eea63bd68..061c16e0aa3 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java @@ -5,7 +5,7 @@ package com.yahoo.prelude.semantics.engine; * A collection of facts (addressed by namespace.fact in conditions) * over which we may write conditions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class NameSpace { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java index 35427250511..5f36c42b8d4 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java @@ -6,7 +6,7 @@ import com.yahoo.search.Query; /** * A name space representing the (http) parameters following this query * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ParameterNameSpace extends NameSpace { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java index cb7d2af8d19..46e809b2db2 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java @@ -10,7 +10,7 @@ import com.yahoo.prelude.query.PhraseItem; /** * The Matches referenced by a particular context name in a rule evaluation * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ReferencedMatches { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java index ee874b76ed6..16c80bd94f6 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java @@ -13,7 +13,7 @@ import java.util.ListIterator; * Evaluates the rules of a rule base. This method is thread safe on analyze calls, but * not on modification calls. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RuleEngine { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java index a6b90f98879..ba6bf821197 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java @@ -12,7 +12,7 @@ import java.util.*; /** * A particular evalutation of a particular rule. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RuleEvaluation { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java index 91eef25a8b0..aedcfebd20b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java @@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.rule; /** * A production rule which <i>adds</i> the production to the matched query * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class AddingProductionRule extends ProductionRule { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java index 2c826df9196..167b62dc53e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which consists of a list of alternatives to match at any location * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class AndCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java index 5cf3d4bf7a4..7cb29736db9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which consists of a list of alternatives to match at a specific location * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ChoiceCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java index 0d24368cf28..1bdad7bdd89 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java @@ -12,7 +12,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; * A condition which is true of the <i>values</i> of its two subconditions are true * and both have the same value * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ComparisonCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java index e7fd8d599d4..62bd6ff7095 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java @@ -10,7 +10,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which contains a list of conditions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class CompositeCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java index 18fbbb04412..ee22564605f 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition on the presense of a particular kind of composite item (possibly also with a particular content) * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.15 */ public class CompositeItemCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java index f2029ede6fa..8b796509dd3 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * Superclass of all kinds of conditions of production rules * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java index 855a8b802ba..a4aa2a04ea5 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java @@ -16,7 +16,7 @@ import java.util.Map; /** * A reference to a named condition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ConditionReference extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java index 84a470ff64e..cc8229d00c4 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java @@ -11,7 +11,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which greedily matches anything, represented as "..." * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class EllipsisCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java index 3cde8bba5ff..e76cc8f75a6 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java @@ -6,7 +6,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition which is always true, and which has it's own value as return value * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LiteralCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java index 23404fbc6e2..b1df2b517cf 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java @@ -15,7 +15,7 @@ import com.yahoo.protect.Validator; /** * A literal phrase produced by a production rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LiteralPhraseProduction extends TermProduction { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java index f157fd6901d..370acb9beae 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java @@ -10,7 +10,7 @@ import com.yahoo.protect.Validator; /** * A literal term produced by a production rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class LiteralTermProduction extends TermProduction { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java index ca1d623847d..ffef470d266 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java @@ -6,7 +6,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A condition given a name which enables it to be referenced from other conditions. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class NamedCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java index 0c73427ad82..4ca0edd2f65 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A production in a specified namespace * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class NamespaceProduction extends Production { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java index 64a10ea821a..f868d9c0174 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; * NotCondition inverts the term checking but not the label checking. * That is, it means "label:!term", it does not mean "!label:term". * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NotCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java index cc6a9c87fb0..02dd17b5f36 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A new term produced by a production rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class Production { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java index 3397a9ada1e..22dec34c009 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java @@ -11,7 +11,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A list of the productions of a rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ProductionList { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java index 55be2aa2afd..b34c8006d73 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java @@ -11,7 +11,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A query rewriting rule. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class ProductionRule { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java index 319e1969174..617dfcc37c8 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java @@ -15,7 +15,7 @@ import com.yahoo.protect.Validator; * A term produced by a production rule which takes it's actual term value * from one or more terms matched in the condition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ReferenceTermProduction extends TermProduction { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java index 76433ec693c..1de1cf008b9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A production rule which <i>replaces</i> matched terms by the production * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class ReplacingProductionRule extends ProductionRule { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java index 3ba929da021..3ae8a140f75 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java @@ -9,7 +9,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A set of conditions which much match the query in sequence * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SequenceCondition extends CompositeCondition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java index 0b7b3b4a30b..6c36fcb1e84 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java @@ -7,7 +7,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; * A condition which evaluates the <i>last included</i> version of * the named condition this is a premise of. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SuperCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java index 3558ef2b227..0db29820497 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java @@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.engine.RuleEvaluation; /** * A term in a rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class TermCondition extends Condition { diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java index 6490d21e319..f0594926efe 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java @@ -10,7 +10,7 @@ import com.yahoo.protect.Validator; /** * A new term produced by a production rule * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class TermProduction extends Production { diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java index 1c50ea5d904..619beb0a8d1 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; * The monitor uses an internal thread for node monitoring. * All <i>public</i> methods of this class are multithread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ClusterMonitor<T> { diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java index da3d0d8e20b..67f946f62c6 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java @@ -30,7 +30,7 @@ import java.util.concurrent.*; * The type argument is the class (of any type) representing the connections. * The connection objects should implement a good toString to ease diagnostics. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a> */ public abstract class ClusterSearcher<T> extends PingableSearcher implements NodeManager<T> { diff --git a/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java b/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java index 7071867c8c7..ce221fa1479 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java @@ -7,7 +7,7 @@ import java.util.concurrent.Executor; * Must be implemented by a node collection which wants * it's node state monitored by a ClusterMonitor * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public interface NodeManager<T> { diff --git a/container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java index 486473eba8d..4f984efd942 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java @@ -10,7 +10,7 @@ import com.yahoo.search.searchchain.Execution; /** * A searcher to which we can send a ping to probe if it is alive * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class PingableSearcher extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java b/container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java index 8b7e8a1d9d5..ca45ee0e4fa 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java +++ b/container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java @@ -4,7 +4,7 @@ package com.yahoo.search.federation; /** * Thrown on timeouts * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ @SuppressWarnings("serial") public class TimeoutException extends RuntimeException { diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java index 576c16f68db..66bb678e983 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java @@ -14,7 +14,7 @@ import com.yahoo.statistics.Statistics; * Superclass for http client searchers which depends on config. All this is doing is translating * the provider and cache configurations to parameters which are passed upwards. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class ConfiguredHTTPClientSearcher extends HTTPClientSearcher { diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java index 8d3ee016b4f..cb7f32d8e7e 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java +++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java @@ -9,7 +9,7 @@ import com.yahoo.search.federation.ProviderConfig; /** * Some static helper classes for configured*Searcher classes * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class ConfiguredSearcherHelper { diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java b/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java index 88e2c6ad0a0..b626dce16f5 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java +++ b/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java @@ -7,7 +7,7 @@ package com.yahoo.search.federation.http; * contain an open connection later. * The host and port state is immutable. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Connection { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java b/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java index f9d97e057d1..25962090a69 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/Intent.java @@ -9,7 +9,7 @@ package com.yahoo.search.intent.model; * <p> * Intent ids should be human readable, start with lower case and use camel casing * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Intent { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java index c77c937b760..113bad46312 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java @@ -5,7 +5,7 @@ package com.yahoo.search.intent.model; * An intent in an intent model tree. The intent node score is the <i>probability</i> of this intent * given the parent interpretation. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IntentNode extends ParentNode<SourceNode> { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java index 51e5d00c563..d54025bb0c6 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java @@ -7,7 +7,7 @@ import com.yahoo.text.interpretation.Interpretation; * An interpretation which may have multiple intents. The score of this node is the probability of * the wrapped interpretation. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class InterpretationNode extends ParentNode<IntentNode> { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Node.java b/container-search/src/main/java/com/yahoo/search/intent/model/Node.java index ecd3ec712bb..163dc153379 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/Node.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/Node.java @@ -6,7 +6,7 @@ import java.util.Map; /** * A node in the <a href="TODO">intent model tree</a> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class Node implements Comparable<Node> { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java index 357060be93c..25c9b6940d1 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java @@ -8,7 +8,7 @@ import java.util.Map; /** * A node which is not a leaf in the intent tree * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class ParentNode<T extends Node> extends Node { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/Source.java b/container-search/src/main/java/com/yahoo/search/intent/model/Source.java index 937b6ca02e4..f224612f23f 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/Source.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/Source.java @@ -9,7 +9,7 @@ package com.yahoo.search.intent.model; * <p> * Source ids should be human readable, start with lower case and use camel casing * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Source { diff --git a/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java b/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java index 5f63ddbe8d1..84c98b8c723 100644 --- a/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java +++ b/container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java @@ -8,7 +8,7 @@ import java.util.Map; * (i.e the score of a source node is called <i>appropriateness</i>). * Sources are ordered by decreasing appropriateness. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SourceNode extends Node { diff --git a/container-search/src/main/java/com/yahoo/search/match/DocumentDb.java b/container-search/src/main/java/com/yahoo/search/match/DocumentDb.java index f4be6861364..3777d5f92de 100644 --- a/container-search/src/main/java/com/yahoo/search/match/DocumentDb.java +++ b/container-search/src/main/java/com/yahoo/search/match/DocumentDb.java @@ -11,7 +11,7 @@ import com.yahoo.search.searchchain.Execution; /** * A searchable database of documents * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DocumentDb extends Searcher { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java index 2d61d17ade8..de19e8ab747 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java @@ -15,7 +15,7 @@ import java.util.Map; * This visitor will throw an IllegalArgumentException if the same placeholder id * is referenced by two choices. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class PlaceholderMappingVisitor extends PageTemplateVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java index 2e22ad7291e..c464dd3dedc 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java @@ -10,7 +10,7 @@ import java.util.Map; * Creates references from all placeholders to the choices which resolves them. * If a placeholder is encountered which is not resolved by any choice, an IllegalArgumentException is thrown. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class PlaceholderReferenceCreatingVisitor extends PageTemplateVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java index bf2685da56f..22cc2dc0d7c 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java @@ -10,7 +10,7 @@ import java.util.Set; /** * Visits a page template object structure and records the sources mentioned. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class SourceVisitor extends PageTemplateVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java index 5d106a6df8e..e3c16853591 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java @@ -14,7 +14,7 @@ import java.util.List; * Provides a static method to convert a page template config into a PageTemplateRegistry. * In addition, instances of this can be created to subscribe to config and keep an up to date registry reference. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PageTemplateConfigurer { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java index 46823f30cf2..451efb851d5 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; * Reads all page template XML files from a given directory (or list of readers). * Instances of this are for single-thread usage only. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PageTemplateXMLReader { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java index 00e154d460b..8d3edab876e 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java @@ -17,7 +17,7 @@ import java.util.Map; * Reorganizes and prunes a result as prescribed by a resolved template. * This class is multithread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Organizer { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java index 7489768b5a3..5349d9f2aaa 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java @@ -7,7 +7,7 @@ import com.yahoo.search.result.Hit; import java.util.Comparator; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class RelevanceComparator extends ChainableComparator { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java index d67faf805ad..3ee3e3aeef0 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java @@ -12,7 +12,7 @@ import java.util.Map; /** * A resolution of choices within a template. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Resolution { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java index 4972b0e4689..6415dad37ec 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java @@ -19,7 +19,7 @@ import com.yahoo.search.pagetemplates.model.PageTemplateVisitor; * All subclasses of this must be multithread safe. I.e multiple calls may be made * to resolve at the same time from different threads. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class Resolver extends AbstractComponent { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java index b4cd01f0c36..e0185554066 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java @@ -8,7 +8,7 @@ import java.util.Comparator; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class SourceOrderComparator extends ChainableComparator { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java index 32ed54a6775..32ce65bf563 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java @@ -23,7 +23,7 @@ import java.util.Map; * <p> * The id of this if <code>native.deterministic</code> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DeterministicResolver extends Resolver { public static final String nativeId = "native.deterministic"; diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java index 5f06c66795d..be357245146 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java @@ -15,7 +15,7 @@ import java.util.*; * A resolver which makes all choices by random. * The id of this is <code>native.random</code>. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RandomResolver extends Resolver { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java index 069598b2e02..5a8abb76a5c 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java @@ -6,7 +6,7 @@ import com.yahoo.component.provider.FreezableClass; /** * Abstract superclass of various kinds of choices. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class AbstractChoice extends FreezableClass implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java index a1932012236..3e956d510e7 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java @@ -6,7 +6,7 @@ import java.util.*; /** * A choice between some alternative lists of page elements. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class Choice extends AbstractChoice { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java index f8e00b78787..4100ca5504c 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java @@ -4,7 +4,7 @@ package com.yahoo.search.pagetemplates.model; /** * The layout of a section * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ // This is not made an enum, to allow the value set to be extendible. // It is not explicitly made immutable diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java index 33c3bba9a77..ccfad1673aa 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java @@ -13,7 +13,7 @@ import java.util.List; * Each unique set of mappings (pairs) from values to placeholder ids is a separate possible * alternative of this choice. The alternatives are not listed explicitly but are generated as needed. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MapChoice extends AbstractChoice { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java index fba58f069ec..4cbabcf871f 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java @@ -6,7 +6,7 @@ import com.yahoo.component.provider.Freezable; /** * Implemented by all page template model classes * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface PageElement extends Freezable { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java index d7ebd3d1169..e4f6f12e47e 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java @@ -6,7 +6,7 @@ import com.yahoo.search.pagetemplates.PageTemplate; /** * Superclass of visitors over the page template object structure * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PageTemplateVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java index cf7a85fc779..0eb98f329cb 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java @@ -6,7 +6,7 @@ package com.yahoo.search.pagetemplates.model; * Source placeholders may not have any content themselves - attempting to call any setter on this * results in a IllegalStateException. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Placeholder implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java index 4564ceeef3c..c3a46dbee8b 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java @@ -14,7 +14,7 @@ import java.util.Map; * All data items has a default renderer. This can be overridden or parametrized by * an explicit renderer. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class Renderer extends FreezableClass implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java index 0a980419853..67f67cb8538 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; * Pages are freezable - once frozen calling a setter will cause an IllegalStateException, and returned * live collection references are unmodifiable * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Section extends FreezableClass implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java index 91c403eae84..de1cadff5db 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java @@ -11,7 +11,7 @@ import java.util.*; * <p> * Two sources are equal if they have the same name and parameters. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Source extends FreezableClass implements PageElement { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java index 00f6c6350fc..c9c482781a4 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java @@ -12,7 +12,7 @@ import java.util.List; * A hit group corresponding to a section - contains some additional information * in proper getters and setters which is used during rendering. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SectionHitGroup extends HitGroup { diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java index 588580dda4d..b11dd6b9b2c 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Model.java +++ b/container-search/src/main/java/com/yahoo/search/query/Model.java @@ -26,7 +26,7 @@ import static com.yahoo.text.Lowercase.toLowerCase; * The parameters defining the recall of a query. * * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Model implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/SessionId.java b/container-search/src/main/java/com/yahoo/search/query/SessionId.java index 7f8ca6385e1..86771c37d2a 100644 --- a/container-search/src/main/java/com/yahoo/search/query/SessionId.java +++ b/container-search/src/main/java/com/yahoo/search/query/SessionId.java @@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicLong; * A query id which is unique across this cluster - consisting of * container runtime id + timestamp + serial. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SessionId { diff --git a/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java b/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java index e59f8589903..d6fc9adeac8 100644 --- a/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java +++ b/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java @@ -17,7 +17,7 @@ import java.util.Iterator; * * @since 4.2 * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryContext implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java index 393aba2b002..759e3978b7b 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Set; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class AllReferencesQueryProfileVisitor extends PrefixQueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java index fb9638a958b..50da6552645 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class AllTypesQueryProfileVisitor extends PrefixQueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java index 65c3480272e..6db6ebb994b 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java @@ -7,7 +7,7 @@ import java.util.HashSet; import java.util.Set; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class AllUnoverridableQueryProfileVisitor extends PrefixQueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java index bef5b00c51b..ab8cd49047d 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class AllValuesQueryProfileVisitor extends PrefixQueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java b/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java index 3c02677b676..f309ba952cc 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java @@ -13,7 +13,7 @@ import java.util.Map; * This may be frozen, at which point no further modifications are allowed. * Note that <b>until</b> this is cloned, the internal map may be both read and written. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CopyOnWriteContent extends FreezableClass implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java index 9adacee74af..78fa24973d4 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java @@ -10,7 +10,7 @@ import java.util.Map; /** * An immutable, binding of a list of dimensions to dimension values * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DimensionBinding { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java b/container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java index b9d631cdd10..342b85e5b19 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java @@ -11,7 +11,7 @@ import com.yahoo.search.query.profile.config.QueryProfileXMLReader; /** * A standalone tool for dumping query profile properties * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DumpTool { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java index 73c0fcd2cb1..8170dffe974 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java @@ -6,7 +6,7 @@ import com.yahoo.search.query.profile.types.FieldDescription; import java.util.List; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class FieldDescriptionQueryProfileVisitor extends QueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java index 2a22d58d8b7..6fdcd576441 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java @@ -6,7 +6,7 @@ import com.yahoo.processing.request.CompoundName; /** * A query profile visitor which keeps track of name prefixes and can skip values outside a given prefix * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ abstract class PrefixQueryProfileVisitor extends QueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java index 42ea4a96d8f..05bf7055822 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java @@ -10,7 +10,7 @@ import java.util.*; /** * A variant of a query profile * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryProfileVariant implements Cloneable, Comparable<QueryProfileVariant> { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java index fde851bdc75..705ba7d3d29 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java @@ -20,7 +20,7 @@ import java.util.*; * A set of virtual profiles are always owned by a single profile, which is also their parent * in the inheritance hierarchy. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryProfileVariants implements Freezable, Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java index 8cb6bf34021..723e772bda0 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java @@ -17,7 +17,7 @@ package com.yahoo.search.query.profile; * The first enter call will be on the root node, which has an empt reference name. * </code> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ abstract class QueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java index 6d5d1b0686a..c6af9e53494 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java @@ -10,7 +10,7 @@ import java.util.List; * value, or query profile, whichever is encountered first which matches the name. * <p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ final class SingleValueQueryProfileVisitor extends QueryProfileVisitor { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java index 59401592378..d0d18d7ba85 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java @@ -16,7 +16,7 @@ import java.util.Map; * <p> * This is a value object. Lookups in this are thread safe. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SubstituteString { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java index a440365ceba..3f52e10d32b 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java @@ -12,7 +12,7 @@ import java.util.Map; * An immutable binding of a set of dimensions to values. * This binding is minimal in that it only includes dimensions which actually have values. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Binding implements Comparable<Binding> { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java index b82939fa4ac..670377d5a09 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java @@ -14,7 +14,7 @@ import java.util.Set; * <p> * Dimensional maps are immutable and created through a DimensionalMap.Builder * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DimensionalMap<KEY, VALUE> { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java index 0112928ada6..c62696dfd8e 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java @@ -14,7 +14,7 @@ import java.util.Set; /** * Contains the values a given key in a DimensionalMap may take for different dimensional contexts. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DimensionalValue<VALUE> { diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java index cc2c08c5504..536e31ba26e 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java @@ -15,7 +15,7 @@ import java.util.Map; * This is multithread safe or not depending on the status of the passed map of aliases. * Cloning will not deep copy the set of aliases. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class PropertyAliases extends Properties { diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java index 15544e8ff4c..9ebbee52afa 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java @@ -9,7 +9,7 @@ import java.util.Map; * Property aliases which contains some hardcoded unaliasing of prefixes of * rankfeature and rankproperty maps. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class QueryPropertyAliases extends PropertyAliases { diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java index c97f4daf6d4..19f77b58dc4 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java @@ -11,7 +11,7 @@ import java.util.Map; * This is used to allow the query's request to be supplied to all property requests * without forcing users of the query.properties() to supply this explicitly. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RequestContextProperties extends Properties { diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java b/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java index eccb8bac2d4..2691b1fda9d 100644 --- a/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java @@ -16,7 +16,7 @@ import java.util.Map; * Contains the properties properties of a query. * This is a multimap: Multiple properties may be set for the same key. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankProperties implements Cloneable { diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java b/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java index 5886014deed..0c7871eb6e6 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java @@ -26,7 +26,7 @@ import java.util.Set; * <p> * Queries are eligible if they do sorting, don't do grouping, and the first sort criteria is a fast-search attribute. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ // This writes fields to query.getRanking which are moved to rank.properties during query.prepare() diff --git a/container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java b/container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java index 0750618de67..4f74096feb1 100644 --- a/container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java +++ b/container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java @@ -7,7 +7,7 @@ import java.util.Comparator; * Superclass of hit comparators which delegates comparisons of hits which are * equal according to this comparator, to a secondary comparator. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public abstract class ChainableComparator implements Comparator<Hit> { diff --git a/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java b/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java index 5982a93d86a..4ce1bf3789a 100644 --- a/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java +++ b/container-search/src/main/java/com/yahoo/search/result/HitOrderer.java @@ -7,7 +7,7 @@ import java.util.List; /** * A class capable of ordering a list of hits * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class HitOrderer { diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java index a5b9c58f084..e59808bdf5d 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java @@ -28,7 +28,7 @@ import com.yahoo.search.searchchain.Execution; * Any field in the configured hits which has a name starting by attribute * will be returned when attribute prefetch filling is requested.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class DocumentSourceSearcher extends Searcher { |