diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-06-17 08:59:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-17 08:59:17 +0200 |
commit | e693aecea5aea0a85035b2676c232bef8d306e6a (patch) | |
tree | 26e7e31b741626edd0dbd75f362616f5779c4ef4 /config-model | |
parent | 0e337c833d1ba15ee7d387d1658d3cdfc4f77dad (diff) | |
parent | 38ff012425e1d65a5016ff090c5163892ebecc89 (diff) |
Merge pull request #19 from yahoo/bratseth/use-github-name-in-author
Use github name in @author
Diffstat (limited to 'config-model')
74 files changed, 76 insertions, 104 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java index fa46c33a97f..a36175accd0 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java @@ -236,8 +236,7 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter // TODO: Doctoring on the XML is the wrong level for this. We should be able to mark a model as default instead -Jon private static Element getImplicitAdmin(DeployState deployState) throws IOException, SAXException { - final boolean hostedVespa = deployState.isHostedVespa(); - String defaultAdminElement = hostedVespa ? getImplicitAdminV4() : getImplicitAdminV2(); + String defaultAdminElement = deployState.isHostedVespa() ? getImplicitAdminV4() : getImplicitAdminV2(); log.log(LogLevel.DEBUG, "No <admin> defined, using " + defaultAdminElement); return XmlHelper.getDocumentBuilder().parse(new InputSource(new StringReader(defaultAdminElement))).getDocumentElement(); } diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java index 924d888b0d0..8dd72561549 100644 --- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java +++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; /** * Static methods for helping dom building * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class XmlHelper { private static final Logger log = Logger.getLogger(XmlHelper.class.getPackage().toString()); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java index c0dcf27c88d..dae3fc4e80a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java @@ -11,7 +11,7 @@ import java.util.Set; * The rank profile containing default settings. This is derived from the fields * whenever this is accessed. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DefaultRankProfile extends RankProfile { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java b/config-model/src/main/java/com/yahoo/searchdefinition/Index.java index 9ed7d8677b9..c14724a17d3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Index.java @@ -16,7 +16,7 @@ import java.util.Set; * Two indices are equal if they have the same name and the same settings, except * alias settings (which are excluded). * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class Index implements Cloneable, Serializable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java b/config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java index a248ca30a8e..9b93975fd0b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java @@ -11,7 +11,7 @@ import java.util.Map; /** * Inlines macros in ranking expressions * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ class MacroInliner extends ExpressionTransformer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java index 3e943377611..0df495ac402 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -19,7 +19,7 @@ import java.util.*; /** * Represents a rank profile - a named set of ranking settings * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankProfile implements Serializable, Cloneable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java index 43c6bb4b441..71bce3d286e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; * index through indexing and how data from documents should be served at search time.</p> <p>The identity of this * class is its name.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ // TODO: Make a class owned by this, for each of these responsibilities: // Managing indexes, managing attributes, managing summary classes. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java index 1130e5630a3..15a00e155d7 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java @@ -16,9 +16,10 @@ import java.util.*; /** * The set of all attribute fields defined by a search definition * - * @author <a href="mailto:bratseth@overture.com">Jon S Bratseth</a> + * @author bratseth */ public class AttributeFields extends Derived implements AttributesConfig.Producer { + private Map<String, Attribute> attributes = new java.util.LinkedHashMap<>(); /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java index 643eeb23c87..520c743d341 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java @@ -19,7 +19,7 @@ import java.util.List; /** * Superclass of all derived configurations * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class Derived implements Exportable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java index bcc295b91e0..20e94e9c177 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java @@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.derived; /** * Classes exportable to configurations * - * @author <a href="mailto:bratseth@overture.com">bratseth</a> + * @author bratseth */ public interface Exportable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java index d61e57a621e..d0f265ce2ff 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.documentmodel.SummaryTransform; /** * The result transformation of a named field * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class FieldResultTransform { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java index 94e4dec567f..e8890288a7f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java @@ -15,7 +15,7 @@ import java.util.*; * An indexing language script derived from a search definition. An indexing script contains a set of indexing * statements, organized in a composite structure of indexing code snippets. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public final class IndexingScript extends Derived implements IlscriptsConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java index 183bfd6ddd4..cc7a123f5e0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java @@ -10,7 +10,7 @@ import java.util.Map; /** * The derived rank profiles of a search definition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RankProfileList extends Derived implements RankProfilesConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java index cf3b10ccadd..a40c73f3e9f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java @@ -14,7 +14,7 @@ import java.util.*; /** * A rank profile derived from a search definition, containing exactly the features available natively in the server * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RawRankProfile implements RankProfilesConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java index 69133e31fb3..17eeb069510 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java @@ -15,7 +15,7 @@ import java.util.*; * <p>This class is <b>not</b> multithread safe. Only one ordering must be done * at the time in any instance.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SearchOrderer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java index 357e0d40f49..9523c224394 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java @@ -10,7 +10,7 @@ import java.util.List; /** * A list of derived summaries * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class Summaries extends Derived implements SummaryConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java index d21523caea2..99897d8a564 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java @@ -20,7 +20,7 @@ import java.util.logging.Level; * Each summary definition have at least one summary, the default * which has the same name as the search definition. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryClass extends Derived { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java index bb1dd87f314..3416b15cd63 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.documentmodel.SummaryTransform; /** * A summary field derived from a search definition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryClassField { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java index d59c671e6a5..be4c34028fc 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java @@ -15,7 +15,7 @@ import java.util.Map; * A summary map (describing search-time summary field transformations) * derived from a search definition * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryMap extends Derived implements SummarymapConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java index aaf376f5cd9..5b3b64ee686 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java @@ -14,7 +14,7 @@ import java.util.*; /** * Vertical streaming matcher summary specification * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class VsmSummary extends Derived implements VsmsummaryConfig.Producer { private Map<SummaryField, List<String>> summaryMap = new java.util.LinkedHashMap<>(1); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java index 35f6a41f0d8..950ec791368 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java @@ -14,7 +14,7 @@ import java.util.Set; * A search-time document attribute (per-document in-memory value). * This belongs to the field defining the attribute. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public final class Attribute implements Cloneable, Serializable { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java index f2b0b6a9164..3b9f5a55af0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java @@ -10,7 +10,7 @@ import java.util.Set; * The rank type of a field. For now this is just a container of a string name. * This class is immutable. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public enum RankType { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java index 6292dc9ef72..b8b577b7b40 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java @@ -19,7 +19,7 @@ import java.util.logging.Logger; any document, it will always inherit the document "document.0".</p> @author <a href="thomasg@yahoo-inc.com">Thomas Gundersen</a> - @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + @author bratseth */ public class SDDocumentType implements Cloneable, Serializable { public static final SDDocumentType VESPA_DOCUMENT; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java index 0aabd4dc192..e014adfb94f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java @@ -29,7 +29,7 @@ import java.util.logging.Level; /** * Adds a "fieldName.zcurve" long attribute and a "fieldName.distance" summary field to all position type fields. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class CreatePositionZCurve extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java index d53be4bd18d..fee09cc53cb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java @@ -15,7 +15,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * The implementation of exact matching * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExactMatch extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java index fa7725843b1..45a1d18b928 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java @@ -17,7 +17,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * Makes implicitly defined summaries into explicit summaries * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ImplicitSummaries extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java index e4e96bb51ab..3f75f6ffa47 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java @@ -21,7 +21,7 @@ import java.util.Iterator; * of complete-boosted fields indexed to <i>indexname</i>. A search for indexname * will be rewritten to also search <i>indexname</i>_exaxt * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class LiteralBoost extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java index a9f013daa98..7b88487495f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java @@ -25,7 +25,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * * <p>This must be done after other summary processors.</p> * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class MakeDefaultSummaryTheSuperSet extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java index 8e5122cc158..84a86d98b56 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java @@ -15,7 +15,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * The implementation of "gram" matching - splitting the incoming text and the queries into * n-grams for matching. This will also validate the gram settings. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NGramMatch extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java index a3e0484b2fd..9ddbf77082d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java @@ -19,7 +19,7 @@ import java.util.logging.Level; /** * Abstract superclass of all search definition processors. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public abstract class Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java index bc676b64a71..bca863dd033 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * All rank: filter fields should have rank type empty. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SetRankTypeEmptyOnFilters extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java index 20eeb5f0810..bb8d1f8a3fe 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java @@ -15,7 +15,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * Ensure that summary field transforms for fields having the same name * are consistent across summary classes * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class SummaryConsistency extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java index 3e211f4f632..a5de99c7406 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java @@ -13,7 +13,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * The implementation of the tag datatype * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TagType extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java index a5c7d25532d..68ba7536c6b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java @@ -12,7 +12,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; /** * Check that fields with index settings actually creates an index or attribute * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ValidateFieldWithIndexSettingsCreatesIndex extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java index 24b811fc7fc..98775051ccd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java @@ -17,7 +17,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; * be left as in the input document, and trivially written queries to work by default. However, this may easily lead to * data which cannot be matched at all as the indexing and query side does not agree. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class WordMatch extends Processor { diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java index 42fa7b04cf6..b959855b080 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java @@ -11,7 +11,7 @@ import java.util.List; /** * A document summary definition - a list of summary fields. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DocumentSummary extends FieldView { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java index 29508eda1eb..58d2137c2e5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.model; /** * A provider of services (an entity which has its own top-level tag in the services.xml file). * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public interface ServiceProvider { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java index 4533b078b28..be733596ed7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java @@ -17,7 +17,7 @@ import java.util.Map; /** * Root builder of the processing model * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class DomProcessingBuilder extends DomChainsBuilder<Processor, ProcessingChain, ProcessingChains> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java index a3cbff2910f..05cab73f7be 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.Map; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class DomProcessingChainBuilder extends DomChainBuilderBase<Processor, ProcessingChain> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java index b48d3dcab2f..c2487974793 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java @@ -10,7 +10,7 @@ import org.w3c.dom.Element; /** * Builds a processor from XML. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class DomProcessorBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Processor> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java index 5806de9343e..57bec4f8a8f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java @@ -14,7 +14,7 @@ import java.util.*; /** * Creates all processing chains from xml. * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class ProcessingChainsBuilder extends ChainsBuilder<Processor, ProcessingChain> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java index ae7bcb64f66..387af49df34 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java @@ -7,7 +7,7 @@ import com.yahoo.vespa.model.container.component.chain.Chain; /** * Represents a processing chain in the config model * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class ProcessingChain extends Chain<Processor> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java index 032aacccca8..6bea1e27ea3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java @@ -11,7 +11,7 @@ import java.util.List; /** * Root config producer for processing * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class ProcessingChains extends Chains<ProcessingChain> { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java index b16243576f9..25f901fa691 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java @@ -8,7 +8,7 @@ import com.yahoo.vespa.model.container.component.chain.ChainedComponent; /** * Representation of a Processor in the configuration model * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @since 5.1.6 */ public class Processor extends ChainedComponent<ChainedComponentModel> { diff --git a/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java b/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java index 1250ac45916..fb5b9360660 100644 --- a/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java +++ b/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java @@ -14,10 +14,8 @@ import java.util.Iterator; import static org.junit.Assert.*; /** - TODO: Document purpose - - @author <a href="thomasg@yahoo-inc.com>Thomas Gundersen</a> - @author <a href="bratseth@yahoo-inc.com>Jon S Bratseth</a> + * @author Thomas Gundersen + * @author bratseth */ public class SDDocumentTypeTestCase extends SearchDefinitionTestCase { @@ -34,7 +32,6 @@ public class SDDocumentTypeTestCase extends SearchDefinitionTestCase { } @Test public void testInheritance() { - SDDocumentType child=new SDDocumentType("child"); Iterator<SDDocumentType> inherited=child.getInheritedTypes().iterator(); assertTrue(inherited.hasNext()); @@ -100,30 +97,5 @@ public class SDDocumentTypeTestCase extends SearchDefinitionTestCase { // TODO: Test uninheriting } - /* What is this?.. DocumentTypeIds aren't used for anything as far as I can see, and is now ignored by document, H\u00F9kon - public void testId() { - Search search = new Search("cocacola"); - SDDocumentType sugar = new SDDocumentType("sugar", 3, true, new DocumentTypeId(5), search); - search.addDocument(sugar); - try { - SDDocumentType color = new SDDocumentType("color", 2, true, new DocumentTypeId(5), search); - fail(); - } catch (RuntimeException re) { - } - - SDDocumentType taste = new SDDocumentType("taste", 3, true, search); - search.addDocument(taste); - try { - SDDocumentType secondtaste = new SDDocumentType("taste", 3, true, search); - fail(); - } catch (RuntimeException re) { - } - - SDDocumentType goodtaste = new SDDocumentType("goodtaste", 3, true, search); - search.addDocument(taste); - SDDocumentType badtaste = new SDDocumentType("badtaste", 3, true, search); - search.addDocument(taste); - } - */ } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java index 210f2d92ac0..86626436b1b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue; /** * tests importing of document containing array type fields * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ArraysTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java index ddffe6d6f48..bfa768cfc79 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java @@ -14,7 +14,7 @@ import static org.junit.Assert.*; /** * Attribute settings * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class AttributeSettingsTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java index 26b6444ec3a..64f96930859 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; /** * Tests comment handling * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class CommentTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java index 150a759ecf4..4115eb621de 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IncorrectRankingExpressionFileRefTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java index b6e3dc1b442..28b1288130e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java @@ -11,7 +11,7 @@ import static org.junit.Assert.fail; /** * Tests importing a search definition with conflicting summary types * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class IncorrectSummaryTypesTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java index 250db2609e2..8cf1014d5e4 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * tests importing of document containing array type fields * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class MultipleSummariesTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java index c71d089e4d4..cd688a1b159 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue; /** * Tests settings outside the document * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class OutsideTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java index 79ee2df03a0..93afbd184f2 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue; /** * Tests rank profiles * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class RankProfileTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java index 05548e62c2b..697e3d6a265 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java @@ -14,7 +14,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankPropertiesTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java index fa20e2a5eaf..22c7e4d4c1e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java @@ -16,7 +16,7 @@ import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankingExpressionConstantsTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java index f15e5c06012..2a771044f42 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java @@ -14,7 +14,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankingExpressionInliningTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java index 0c7a75d5694..c04bdc968d7 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java @@ -9,7 +9,7 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankingExpressionValidationTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java index 4183ffe64e3..6c3b9925d24 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; import static org.junit.Assert.assertNotNull; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ReservedWordsAsFieldNamesTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java index 0b119ccbf0d..c33ebc95bd2 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.fail; /** * tests importing of document containing array type fields * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class StructTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java index ea18fcb5266..2903f7e1e04 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; /** * Tests deriving using the Deriver facade * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class DeriverTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java index 57d62326fe3..b790d9e68e8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java @@ -16,7 +16,7 @@ import java.io.IOException; /** * Tests deriving rank for files from search definitions * - * @author <a href="mailto:Jon S Bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class EmptyRankProfileTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java index 06729b1e27b..d6bd0af51cf 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java @@ -7,7 +7,7 @@ import org.junit.Test; import java.io.IOException; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class ExactMatchTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java index ca5884accd5..add6d690249 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertNull; /** * Tests that documents ids are treated as they should * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class IdTestCase extends AbstractExportingTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java index cb35062e59e..cc87b3eef72 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java @@ -26,7 +26,7 @@ import static org.junit.Assert.*; /** * Tests inheritance * - * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class InheritanceTestCase extends AbstractExportingTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java index 8538944c13c..20c932ed1c8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java @@ -10,7 +10,7 @@ import java.io.IOException; /** * Tests deriving a configuration with multiple summaries * - * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class MultipleSummariesTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java index 77cea993131..29f3053f12c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * Tests deriving of various field types * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class PrefixExactAttributeTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java index 222871c78b7..018c9060fba 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * Tests a search definition with various rank profiles having different settings * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class RankProfilesTestCase extends AbstractExportingTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java index 084366ddcbb..5e01dad4396 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java @@ -11,7 +11,7 @@ import java.util.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SearchOrdererTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java index ee4ad4fcd8a..737086cda27 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java @@ -11,7 +11,7 @@ import java.util.Arrays; /** * Tests VSM configuration deriving for structs * - * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class StreamingStructTestCase extends AbstractExportingTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java index 58316111c55..415f28d769c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; /** * Tests summary map extraction * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryMapTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java index ceac1186b6e..5fd2b9c6f95 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertEquals; /** * Tests summary extraction * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a> + * @author bratseth */ public class SummaryTestCase extends SearchDefinitionTestCase { @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java index 7908bb3a9f3..01dccf2f17e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java @@ -9,7 +9,7 @@ import java.io.IOException; /** * Tests deriving of various field types * - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class TypesTestCase extends AbstractExportingTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java index 6dccdc235b9..f6d40644145 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java @@ -15,7 +15,7 @@ import java.util.List; import static org.junit.Assert.*; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class NGramTestCase extends SearchDefinitionTestCase { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java index bc7197b5408..1de2d6fa770 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java @@ -8,7 +8,7 @@ import org.w3c.dom.Element; import static org.junit.Assert.assertEquals; /** - * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Federation2Test extends SearchChainsTestBase { @Override |