summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-06-17 08:59:17 +0200
committerGitHub <noreply@github.com>2016-06-17 08:59:17 +0200
commite693aecea5aea0a85035b2676c232bef8d306e6a (patch)
tree26e7e31b741626edd0dbd75f362616f5779c4ef4
parent0e337c833d1ba15ee7d387d1658d3cdfc4f77dad (diff)
parent38ff012425e1d65a5016ff090c5163892ebecc89 (diff)
Merge pull request #19 from yahoo/bratseth/use-github-name-in-author
Use github name in @author
-rw-r--r--application/src/main/java/com/yahoo/application/content/ContentCluster.java2
-rw-r--r--application/src/test/java/com/yahoo/application/MockResultSearcher.java2
-rw-r--r--component/src/main/java/com/yahoo/component/provider/Freezable.java2
-rw-r--r--component/src/main/java/com/yahoo/component/provider/FreezableClass.java2
-rw-r--r--component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java2
-rw-r--r--component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java2
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java3
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/builder/xml/XmlHelper.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/Index.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/MacroInliner.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/Search.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java3
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/ServiceProvider.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessingChainBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/DomProcessorBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/processing/ProcessingChainsBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChain.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/processing/ProcessingChains.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java2
-rw-r--r--config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java32
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java2
-rwxr-xr-xconfig-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/SearchOrdererTestCase.java2
-rwxr-xr-xconfig-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/Federation2Test.java2
-rw-r--r--configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java2
-rw-r--r--configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java2
-rw-r--r--configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java2
-rw-r--r--container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java2
-rw-r--r--container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java2
-rw-r--r--container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java2
-rw-r--r--container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java2
-rw-r--r--container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java2
-rw-r--r--container-search/src/main/java/com/yahoo/fs4/DocsumPacket.java2
-rw-r--r--container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java2
-rw-r--r--container-search/src/main/java/com/yahoo/fs4/MapEncoder.java2
-rw-r--r--container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/Index.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/PacketCache.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/RankProfile.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/TimeoutException.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/FalseItem.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/IntItem.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/MarkerWordItem.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/NotItem.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/Substring.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/TermType.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/parser/WebParser.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/querytransform/PhraseMatcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/querytransform/PhrasingSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/RuleBaseException.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/Choicepoint.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/EvaluationException.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/FlattenedItem.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/Match.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/NameSpace.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/ParameterNameSpace.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/ReferencedMatches.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEngine.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/engine/RuleEvaluation.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/AddingProductionRule.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/AndCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/ChoiceCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/ComparisonCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/CompositeItemCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/Condition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/ConditionReference.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/EllipsisCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralPhraseProduction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/LiteralTermProduction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamedCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/NamespaceProduction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/NotCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/Production.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionList.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/ProductionRule.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReferenceTermProduction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/ReplacingProductionRule.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/SequenceCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/SuperCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermCondition.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/semantics/rule/TermProduction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/cluster/PingableSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/federation/TimeoutException.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/federation/http/Connection.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/intent/model/Intent.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/intent/model/IntentNode.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/intent/model/InterpretationNode.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/intent/model/Node.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/intent/model/ParentNode.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/intent/model/Source.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/intent/model/SourceNode.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/match/DocumentDb.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/Model.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/SessionId.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/AllReferencesQueryProfileVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/AllTypesQueryProfileVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/AllUnoverridableQueryProfileVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/CopyOnWriteContent.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/DumpTool.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/FieldDescriptionQueryProfileVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/PrefixQueryProfileVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalMap.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/compiled/DimensionalValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/properties/QueryPropertyAliases.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/properties/RequestContextProperties.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/result/ChainableComparator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/result/HitOrderer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java2
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/Call.java2
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/CallStack.java2
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java2
-rw-r--r--docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java2
-rw-r--r--docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java2
-rw-r--r--docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java2
-rw-r--r--document/src/main/java/com/yahoo/document/Document.java2
-rwxr-xr-xdocument/src/main/java/com/yahoo/document/DocumentType.java2
-rw-r--r--document/src/main/java/com/yahoo/document/select/DocumentSelector.java2
-rw-r--r--document/src/test/java/com/yahoo/document/DataTypeTestCase.java2
-rw-r--r--document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java15
-rw-r--r--document/src/test/java/com/yahoo/document/update/SerializationTestCase.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/Parameters.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/Response.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/Result.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java2
-rw-r--r--fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java2
-rw-r--r--indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java2
-rw-r--r--jrt/src/com/yahoo/jrt/tool/RpcInvoker.java2
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/Protocol.java2
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/Result.java2
-rwxr-xr-xmessagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java2
-rwxr-xr-xmessagebus/src/main/java/com/yahoo/messagebus/routing/Route.java2
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java11
-rw-r--r--processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/execution/Execution.java4
-rw-r--r--processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/request/CompoundName.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/AbstractData.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/Data.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/DataList.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/FutureResponse.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/IncomingData.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/Ordered.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/response/Streamed.java2
-rw-r--r--processing/src/main/java/com/yahoo/processing/test/Responses.java2
-rw-r--r--processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java2
-rw-r--r--processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java2
-rw-r--r--processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java2
-rw-r--r--processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java2
-rw-r--r--processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java2
-rw-r--r--processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java2
-rw-r--r--processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java2
-rwxr-xr-xsearchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java4
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java2
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java2
-rw-r--r--vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java2
-rw-r--r--vespajlib/developernotes/XMLMicroBenchmark.java2
-rw-r--r--vespajlib/developernotes/XMLWriterMicroBenchmark.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/BobHash.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/ListMap.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/Pair.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/io/IOUtils.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/net/URI.java10
-rw-r--r--vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java4
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/BooleanParser.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/JSON.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/PositionedString.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/net/URITestCase.java78
-rw-r--r--vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/JSONTest.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java2
-rw-r--r--yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java2
-rw-r--r--yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java2
-rw-r--r--yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java2
-rw-r--r--yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java2
-rw-r--r--yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java2
421 files changed, 475 insertions, 511 deletions
diff --git a/application/src/main/java/com/yahoo/application/content/ContentCluster.java b/application/src/main/java/com/yahoo/application/content/ContentCluster.java
index 8d1d7530650..9fb025848e0 100644
--- a/application/src/main/java/com/yahoo/application/content/ContentCluster.java
+++ b/application/src/main/java/com/yahoo/application/content/ContentCluster.java
@@ -9,7 +9,7 @@ import java.util.Collections;
import java.util.List;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ContentCluster {
diff --git a/application/src/test/java/com/yahoo/application/MockResultSearcher.java b/application/src/test/java/com/yahoo/application/MockResultSearcher.java
index 2dd3a34a6ec..a429785640e 100644
--- a/application/src/test/java/com/yahoo/application/MockResultSearcher.java
+++ b/application/src/test/java/com/yahoo/application/MockResultSearcher.java
@@ -8,7 +8,7 @@ import com.yahoo.search.result.Hit;
import com.yahoo.search.searchchain.Execution;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MockResultSearcher extends Searcher {
diff --git a/component/src/main/java/com/yahoo/component/provider/Freezable.java b/component/src/main/java/com/yahoo/component/provider/Freezable.java
index 36734c24e1b..2feca23dd20 100644
--- a/component/src/main/java/com/yahoo/component/provider/Freezable.java
+++ b/component/src/main/java/com/yahoo/component/provider/Freezable.java
@@ -5,7 +5,7 @@ package com.yahoo.component.provider;
* A class which may be irreversibly frozen. Any attempt to change the state of this class after
* freezing throws an IllegalStateException.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public interface Freezable {
diff --git a/component/src/main/java/com/yahoo/component/provider/FreezableClass.java b/component/src/main/java/com/yahoo/component/provider/FreezableClass.java
index df819c8c463..c94c8a0bbac 100644
--- a/component/src/main/java/com/yahoo/component/provider/FreezableClass.java
+++ b/component/src/main/java/com/yahoo/component/provider/FreezableClass.java
@@ -4,7 +4,7 @@ package com.yahoo.component.provider;
/**
* Convenience superclass of non-component freezables
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class FreezableClass implements Freezable {
diff --git a/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java b/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java
index 3e1bbd4153a..326b044d007 100644
--- a/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java
+++ b/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java
@@ -4,7 +4,7 @@ package com.yahoo.component.provider;
/**
* A freezable which supports listening
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.13
*/
public interface ListenableFreezable extends Freezable {
diff --git a/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java b/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java
index 6d876b1fb41..d1d82b2de79 100644
--- a/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java
+++ b/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java
@@ -8,7 +8,7 @@ import java.util.concurrent.Executor;
/**
* A convenience superclass for listenable freezables.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.13
*/
public class ListenableFreezableClass extends FreezableClass implements ListenableFreezable {
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
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java b/configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java
index 8518ff04573..e989e977609 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/DefaultValue.java
@@ -4,7 +4,7 @@ package com.yahoo.config.codegen;
/**
* An immutable class representing a default value of a config variable
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class DefaultValue {
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java b/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java
index f28549275ef..c7b0cc42289 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/MakeConfig.java
@@ -77,7 +77,7 @@ public class MakeConfig {
/**
* Helper methods for handling exceptions
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
static class Exceptions {
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
index 515f7838436..58f6b70d733 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
@@ -9,7 +9,7 @@ import org.junit.Test;
/**
* Tests parsing of a single line of a .def file
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
* @author gjoranv
*/
public class DefLineParsingTest {
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
index a463cfa2ba1..5cbe590c030 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
@@ -47,7 +47,7 @@ import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry;
* <p>
* COMPONENT: The type of the processing components of which this executes a chain
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @author tonyv
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
* @since 5.1.6
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java
index efca279cd38..2ce345ad355 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingResponse.java
@@ -30,7 +30,7 @@ import com.yahoo.processing.response.DataList;
* A response from running a request through processing. This response is just a
* wrapper of the knowhow needed to render the Response from processing.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
* @since 5.1.12
*/
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
index b02c0fcccdb..7f656c61db4 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
@@ -22,7 +22,7 @@ import java.util.concurrent.Executors;
* A helper for making processing requests and rendering their responses.
* Create an instance of this to test making processing requests and get the response or response data.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.21
*/
@Beta
diff --git a/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java b/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java
index 195ecc73e9f..a9b8a9a67e2 100644
--- a/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java
+++ b/container-core/src/main/java/com/yahoo/processing/processors/RequestPropertyTracer.java
@@ -12,7 +12,7 @@ import java.util.Map;
* A processor which adds the current content of the Request.properties() to
* the trace before calling the next processor, if traceLevel is 4 or more.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.17
*/
public class RequestPropertyTracer extends Processor {
diff --git a/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java b/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
index 7359cc8ba66..4a7c5642f96 100644
--- a/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
+++ b/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
@@ -5,7 +5,7 @@ import com.yahoo.component.ComponentId;
import junit.framework.TestCase;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ComponentIdTestCase extends TestCase {
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 {
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
index c3ab826bad8..02d8f83bca7 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
@@ -17,7 +17,7 @@ import java.nio.ByteBuffer;
/**
* Tests the packet cache. Also tested in FastSearcherTestCase.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class PacketCacheTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java
index 5df2572242e..22d64f5eabd 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java
@@ -18,7 +18,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.*;
/**
* Tests the tokenizer
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class TokenizerTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java
index 28acb310472..5b6184d884d 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java
@@ -9,7 +9,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class IntItemTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java
index 4185065b33c..56a59e44fba 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java
@@ -6,7 +6,7 @@ import com.yahoo.search.Query;
import com.yahoo.search.query.QueryTree;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class QueryCanonicalizerTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java
index 0173a42f592..ff45d3f2b28 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java
@@ -9,7 +9,7 @@ import com.yahoo.prelude.querytransform.PhraseMatcher;
import java.util.List;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PhraseMatcherTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java
index cea65790644..6d8dd8535e2 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* Test a case reported by Alibaba
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class AlibabaTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java
index 4f477dca5c9..b3e65ad5192 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* Tests anchoring
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class AnchorTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java
index 92815b74ca1..3f1d2cd594b 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java
@@ -5,7 +5,7 @@ package com.yahoo.prelude.semantics.test;
* Tests that ![a] is interpreted as "default:![a]", not as "!default:[a]",
* that is, in negative conditions we still only want to match the default index by default.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class AutomataNotTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java
index 7a34674f554..049a28c67bc 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java
@@ -7,7 +7,7 @@ import com.yahoo.prelude.semantics.RuleBase;
/**
* Tests rule bases using automatas for matching
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class AutomataTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java
index f30bfffc18d..6390ea72391 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java
@@ -6,7 +6,7 @@ import com.yahoo.search.Query;
/**
* Tests blending rules
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class BlendingTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java
index 00c2ebf8d58..09ef73dbbcf 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* Tests that using rule bases containing cjk characters work
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class CJKTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java
index 80f41ad61a4..6b12e1d7de7 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.prelude.semantics.test;
/**
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ComparisonTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java
index 8b85f8bc587..bc867d240bf 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.prelude.semantics.test;
/**
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ComparisonsTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java
index ece03da5262..8a9cc0d856a 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java
@@ -14,7 +14,7 @@ import com.yahoo.prelude.semantics.rule.SequenceCondition;
import com.yahoo.prelude.semantics.rule.TermCondition;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class ConditionTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java
index e1d5b93a32f..a7de4d86995 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java
@@ -6,7 +6,7 @@ import com.yahoo.prelude.semantics.RuleImporter;
import com.yahoo.prelude.semantics.parser.ParseException;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class DuplicateRuleTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java
index 7aa60630db3..f6d89073124 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* tersts the ellipsis rule base
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Ellipsis2TestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java
index 329006414c3..c0d6a094657 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* tersts the ellipsis rule base
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class EllipsisTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java
index 6cc56478fc9..73bf01e64ae 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.prelude.semantics.test;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ExactMatchTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java
index 382870a97b9..d51f4d3c926 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java
@@ -8,7 +8,7 @@ import com.yahoo.prelude.semantics.parser.ParseException;
/**
* Tests label-dependent matching
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class LabelMatchingTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java
index 6cb2a3052d7..74a40ef5beb 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* tersts the ellipsis rule base
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MatchAllTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java
index 9907c710411..17dad7de425 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java
@@ -5,7 +5,7 @@ package com.yahoo.prelude.semantics.test;
* Experiments with a way to match only if it doesn't remove all hard conditions in the query.
* The problem is that a straightforward use case of replacement leads to nonsensical queries as shown.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MatchOnlyIfNotOnlyTermTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java
index fd71c7f682c..c56d5aba219 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* Tests a case reported by tularam
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class NoStemmingTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java
index 5d7db4e0260..a29c041ba32 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.prelude.semantics.test;
/**
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class NotTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java
index abf407d7b9c..238c28e717c 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* Tests numbers as conditions and productions
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class NumbersTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java
index c2b4bdbab35..727a5b04e75 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* Tests numeric terms
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class NumericTermsTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java
index 9a8fc7d6b41..15b8606fa90 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.prelude.semantics.test;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class OrPhraseTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java
index 45c1cf5d4ec..7d65106ec5d 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java
@@ -6,7 +6,7 @@ import com.yahoo.search.Query;
/**
* Tests parameter matching and production
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Parameter2TestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java
index ce40ea6f6c5..58b5d781b90 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java
@@ -6,7 +6,7 @@ import com.yahoo.search.Query;
/**
* Tests parameter matching and production
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ParameterTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java
index 2a8f7008ac1..0c04b647f5b 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java
@@ -5,7 +5,7 @@ package com.yahoo.prelude.semantics.test;
* Tests that the phrase produced by an automata match can subsequently be replaced by an AND of the
* same terms.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PhraseMatchTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java
index 595a2b4c75c..01956eba561 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java
@@ -15,7 +15,7 @@ import com.yahoo.prelude.semantics.rule.TermCondition;
import com.yahoo.prelude.semantics.rule.TermProduction;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class ProductionRuleTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java
index 17f95d37dc7..006b0b5a6a6 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* Tests a case reported by tularam
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class StemmingTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java
index bfac8149a99..390f0ee11ad 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java
@@ -7,7 +7,7 @@ import com.yahoo.search.test.QueryTestCase;
/**
* Tests numeric terms
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class StopwordTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java
index 3dbb27332db..2b94763e06b 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.prelude.semantics.test;
/**
* Tests working with url indexes
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class UrlTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java
index d8263f915b0..364fdfed627 100644
--- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.prelude.semantics.test;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class WeightingTestCase extends RuleBaseAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java
index c59dffb9cb7..d9d4755ac96 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java
@@ -22,7 +22,7 @@ import java.util.Map;
/**
* Rudimentary http searcher test.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class HttpTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java
index baeb9fd0a41..59a68700405 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java
@@ -16,7 +16,7 @@ import java.util.Map;
/**
* Tests that source and backend specific parameters from the query are added correctly to the backend requests
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class QueryParametersTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java
index 9135984b26b..984caecd46c 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java
@@ -8,7 +8,7 @@ import java.util.Map;
/**
* Tests that source and backend specific parameters from the query are added correctly to the backend requests
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class QueryParametersTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
index 052ea62d4f0..32bf80bc512 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
@@ -9,7 +9,7 @@ import com.yahoo.search.pagetemplates.model.*;
import java.util.List;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MapPageTemplateXMLReadingTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
index 7832719412a..6c061cdce47 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
@@ -18,7 +18,7 @@ import java.util.HashSet;
import java.util.Set;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PageTemplateXMLReadingTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java
index 58d05971805..0decab2e13a 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java
@@ -15,7 +15,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ChoiceOfRenderersTestCase extends ExecutionAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java
index 3d92a721f0d..c03322d63cf 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java
@@ -13,7 +13,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ChoiceOfSubsectionsTestCase extends ExecutionAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java
index facffb50649..71a32b75434 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java
@@ -15,7 +15,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ChoiceOfTwoSourcesTestCase extends ExecutionAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java
index a646823c8cb..e26846c57b9 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ChoicesTestCase extends ExecutionAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java
index 54fc342aa22..e1eaa11dde9 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MapSectionsToSectionsTestCase extends ExecutionAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java
index 49cc0411ac5..d0cd65741fc 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MapSourcesToSectionsTestCase extends ExecutionAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java
index 04e550a631c..eb7c3e698dc 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java
@@ -12,7 +12,7 @@ import com.yahoo.search.pagetemplates.model.Choice;
import org.junit.Test;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class SourceChoiceTestCase extends ExecutionAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java
index 3fff2103332..5019fc0d0ca 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java
@@ -15,7 +15,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class TwoSectionsFourSourcesTestCase extends ExecutionAbstractTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java
index bbddae0f7f0..6f47c326e0c 100644
--- a/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java
@@ -10,7 +10,7 @@ import com.yahoo.search.Query;
import com.yahoo.search.query.context.QueryContext;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class LoggingTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java
index e9bdb6f60f5..2e0dff115ed 100644
--- a/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java
@@ -5,7 +5,7 @@ import com.yahoo.search.Query;
import com.yahoo.search.query.context.QueryContext;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PropertiesTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java
index 2f304693d1c..2f668602680 100644
--- a/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java
@@ -10,7 +10,7 @@ import com.yahoo.search.query.profile.compiled.CompiledQueryProfile;
import static com.yahoo.jdisc.http.HttpRequest.Method;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ParametersTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java
index 7a9f5ce59b6..365a8e87c40 100644
--- a/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java
+++ b/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java
@@ -5,7 +5,7 @@ import com.yahoo.prelude.query.WeightedSetItem;
import com.yahoo.search.Query;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class QueryCloneMicroBenchmark {
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
index 4479650cd49..15c6f707c4f 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java
@@ -34,7 +34,7 @@ import com.yahoo.search.searchchain.Execution;
import static com.yahoo.search.searchchain.Execution.Context.createContextStub;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class NGramSearcherTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java
index 8e645f2781b..649681a0e13 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java
@@ -17,7 +17,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class SortingDegraderTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java
index c2d5e73fb97..b60ec24f747 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java
@@ -7,7 +7,7 @@ import com.yahoo.search.result.HitGroup;
import java.util.Arrays;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class HitGroupTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java
index 482b3e08661..ac0f3fe63a5 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java
@@ -18,7 +18,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class AsyncExecutionOfOneChainTestCase extends TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
index 79881c06852..51a050b1e76 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
@@ -29,7 +29,7 @@ import com.yahoo.component.chain.Chain;
/**
* Tests using the async capabilities of the Processing parent framework of searchers.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class FutureDataTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java
index 92091fabbf9..a0641374a62 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java
@@ -19,7 +19,7 @@ import java.util.List;
/**
* Tests tracing scenarios where traces from multiple executions over the same query are involved.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class TraceTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java b/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java
index bab7c0be548..4908efb823f 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java
@@ -6,7 +6,7 @@ import com.yahoo.search.Query;
/**
* Tests the speed of accessing the query
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class QueryBenchmark {
diff --git a/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java b/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java
index 5c77dc0215d..c8bb28b4367 100644
--- a/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.search.test;
import com.yahoo.search.Query;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class RequestParameterPreservationTestCase extends junit.framework.TestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java b/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java
index 450da35b7a4..33b221cdf36 100644
--- a/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java
+++ b/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java
@@ -9,7 +9,7 @@ import com.yahoo.search.result.HitGroup;
/**
* Tests the speed of accessing hits in the query by id
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ResultBenchmark {
diff --git a/docproc/src/main/java/com/yahoo/docproc/Call.java b/docproc/src/main/java/com/yahoo/docproc/Call.java
index 6d5b25b92b5..7517594a094 100644
--- a/docproc/src/main/java/com/yahoo/docproc/Call.java
+++ b/docproc/src/main/java/com/yahoo/docproc/Call.java
@@ -19,7 +19,7 @@ import java.util.List;
/**
* A document processor to call - an item on a {@link com.yahoo.docproc.CallStack}.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
*/
public class Call implements Cloneable {
diff --git a/docproc/src/main/java/com/yahoo/docproc/CallStack.java b/docproc/src/main/java/com/yahoo/docproc/CallStack.java
index 8fbe72577d3..52b16302e26 100644
--- a/docproc/src/main/java/com/yahoo/docproc/CallStack.java
+++ b/docproc/src/main/java/com/yahoo/docproc/CallStack.java
@@ -22,7 +22,7 @@ import java.util.ListIterator;
* This is not thread safe.
* </p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class CallStack {
diff --git a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
index 1ad745ac1b7..cb272a1d151 100644
--- a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
@@ -39,7 +39,7 @@ import java.util.logging.Logger;
* access to any mutable, thread-unsafe state held in a field by the processor is
* synchronized.</p>
*
- * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public abstract class DocumentProcessor extends ChainedComponent {
static Logger log = Logger.getLogger(DocprocService.class.getName());
diff --git a/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java b/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java
index 8ef832faf31..42906f062fd 100644
--- a/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
/**
* Tests call stacks
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class CallStackTestCase extends junit.framework.TestCase {
diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java
index 1b7a005350e..e35685384c7 100644
--- a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java
@@ -12,7 +12,7 @@ import com.yahoo.document.datatypes.StringFieldValue;
/**
* Tests a document processing where some processings fail with an exception
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class FailingDocumentProcessingTestCase extends junit.framework.TestCase {
diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java
index 8ca553b9290..cdeded370f7 100644
--- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java
@@ -7,7 +7,7 @@ import com.yahoo.docproc.Accesses.Field.Tree;
/**
* Tests the basic operation of the docproc service
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class SimpleDocumentProcessingTestCase extends DocumentProcessingAbstractTestCase {
diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java
index 740c91c5c1b..34c952e1cec 100644
--- a/document/src/main/java/com/yahoo/document/Document.java
+++ b/document/src/main/java/com/yahoo/document/Document.java
@@ -25,7 +25,7 @@ import java.util.Map;
* not with primitive types. Support for direct access to primitive types will
* be removed soon.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
* @author <a href="einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
*/
public class Document extends StructuredFieldValue {
diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java
index db38228489d..b703a22255d 100755
--- a/document/src/main/java/com/yahoo/document/DocumentType.java
+++ b/document/src/main/java/com/yahoo/document/DocumentType.java
@@ -17,7 +17,7 @@ import java.util.*;
* any document, it will always inherit the document "document.0".</p>
*
* @author <a href="mailto:thomasg@yahoo-inc.com">Thomas Gundersen</a>
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class DocumentType extends StructuredDataType {
diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
index aa26efb0c2d..8f287d4a213 100644
--- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
@@ -15,7 +15,7 @@ import com.yahoo.document.select.rule.ExpressionNode;
*
* <p>Document selectors are multithread safe.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class DocumentSelector {
diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
index 89f22e97d5d..7a22541c619 100644
--- a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
@@ -13,7 +13,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class DataTypeTestCase {
diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
index 7712cc06c41..f36b4f1d6db 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
@@ -4,10 +4,8 @@ package com.yahoo.document;
import java.util.Iterator;
/**
- * 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 DocumentTypeTestCase extends junit.framework.TestCase {
@@ -30,14 +28,6 @@ public class DocumentTypeTestCase extends junit.framework.TestCase {
DocumentTypeManager typeManager = new DocumentTypeManager();
DocumentType child = new DocumentType("child");
- //typeManager.register(child);
-
- /*
- ListIterator inherited = child.inheritedIterator();
- assertTrue(inherited.hasNext());
- assertEquals(new DataTypeName("document", 0), inherited.next());
- assertTrue(!inherited.hasNext());
- */
Iterator inherited;
child.addField("childfield", DataType.INT);
@@ -104,4 +94,5 @@ public class DocumentTypeTestCase extends junit.framework.TestCase {
// TODO: Test uninheriting
}
+
}
diff --git a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
index 0d73138e077..3fbea80c54b 100644
--- a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
@@ -8,7 +8,7 @@ import com.yahoo.document.serialization.*;
import java.io.FileOutputStream;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class SerializationTestCase extends junit.framework.TestCase {
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java
index 3e06d5f8d94..a0e884e107e 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/AsyncParameters.java
@@ -4,7 +4,7 @@ package com.yahoo.documentapi;
/**
* Parameters for creating an async session
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class AsyncParameters extends Parameters {
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java b/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java
index fdf57cecfc8..012f492d476 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java
@@ -6,7 +6,7 @@ package com.yahoo.documentapi;
* but keeping this parameter hierarchy in place means that we can later add parameters with default values that all
* clients will be able to use with no code changes.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Parameters {
// empty
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Response.java b/documentapi/src/main/java/com/yahoo/documentapi/Response.java
index 5a079ec8580..1a9214c05f4 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/Response.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/Response.java
@@ -7,7 +7,7 @@ package com.yahoo.documentapi;
*
* <p>This is a <i>value object</i>.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Response {
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Result.java b/documentapi/src/main/java/com/yahoo/documentapi/Result.java
index e5982d297f7..9a24da9a676 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/Result.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/Result.java
@@ -6,7 +6,7 @@ package com.yahoo.documentapi;
* A result is either a success or not. If it is not a success, it will contain an explanation of why.
* Document repositories may return subclasses which contain more information.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Result {
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java
index abd24099ff9..692eae01753 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionParameters.java
@@ -4,7 +4,7 @@ package com.yahoo.documentapi;
/**
* Parameters for creating or opening a visitor session
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class SubscriptionParameters extends Parameters {
}
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java b/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java
index 588a5e6f118..a4ff942bb5e 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/SubscriptionSession.java
@@ -5,7 +5,7 @@ package com.yahoo.documentapi;
* This class provides document <i>subscription</i> - accessing document changes to a
* document repository.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public interface SubscriptionSession extends Session {
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java
index 5ac77abd3ae..edcefe9447d 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/local/LocalDocumentAccess.java
@@ -11,7 +11,7 @@ import java.util.Map;
/**
* The main class of the local implementation of the document api
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class LocalDocumentAccess extends DocumentAccess {
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
index 7b895845f3d..5795ea771b5 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
* An access session which wraps a messagebus source session sending document messages.
* The sessions are multithread safe.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @author <a href="mailto:einarmr@yahoo-inc.com">Einar Rosenvinge</a>
*/
public class MessageBusAsyncSession implements MessageBusSession, AsyncSession {
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
index 4300c5938e1..dfd221a5bf6 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
@@ -7,7 +7,7 @@ import java.io.FileInputStream;
import java.io.IOException;
/**
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class FSATestCase extends junit.framework.TestCase {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
index c5b68e6c978..74e2b30a799 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
@@ -15,7 +15,7 @@ import java.util.Iterator;
/**
* A filter which splits incoming text into n-grams
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class NGramExpression extends Expression {
diff --git a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java
index 1742b365697..8aa58a1ed03 100644
--- a/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java
+++ b/jrt/src/com/yahoo/jrt/tool/RpcInvoker.java
@@ -10,7 +10,7 @@ import java.util.ArrayList;
/**
* A generic rpc invoker for use by command line tools
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class RpcInvoker {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java b/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java
index 4e96c9af959..746ab2adc2d 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java
@@ -8,7 +8,7 @@ import com.yahoo.messagebus.routing.RoutingPolicy;
/**
* Interface implemented by the concrete application message protocol.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public interface Protocol {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Result.java b/messagebus/src/main/java/com/yahoo/messagebus/Result.java
index 095398f6b5d..6341e75e158 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/Result.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Result.java
@@ -10,7 +10,7 @@ package com.yahoo.messagebus;
*
* <p>This class is <b>immutable</b>.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Result {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java
index 66321b5975e..cf568eeffb9 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java
@@ -7,7 +7,7 @@ import java.util.*;
* A hop blueprint is a stored prototype of a hop that has been created from a {@link HopSpec} object. A map of these
* are stored in a {@link RoutingTable}.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class HopBlueprint {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java
index c9684e77a66..bb045e435cf 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java
@@ -15,7 +15,7 @@ import java.util.List;
* #parse(String)} to produce a route instance from a string representation, or
* you may build one programatically through the hop accessors.</p>
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class Route {
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java
index b8fa37b0542..a3f93a6231c 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java
@@ -17,8 +17,8 @@ package com.yahoo.messagebus.routing;
* <p>
* This class is pluggable per template point in the address of a hop.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
- * @author <a href="bratseth@yahoo-inc.com">Simon Thoresen</a>
+ * @author bratseth
+ * @author Simon Thoresen
*/
public interface RoutingPolicy {
@@ -29,7 +29,7 @@ public interface RoutingPolicy {
*
* @param context the complete context for the invocation of this policy. Contains all available data.
*/
- public void select(RoutingContext context);
+ void select(RoutingContext context);
/**
* This function is called when all replies have arrived for some message. The implementation is responsible for
@@ -38,11 +38,12 @@ public interface RoutingPolicy {
*
* @param context the complete context for the invocation of this policy. Contains all available data.
*/
- public void merge(RoutingContext context);
+ void merge(RoutingContext context);
/**
* Destroys this factory and frees up any resources it has held. Making further calls on a destroyed
* factory causes a runtime exception.
*/
- public void destroy();
+ void destroy();
+
}
diff --git a/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java b/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java
index 7915fbedb0d..61df0c992b9 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java
+++ b/processing/src/main/java/com/yahoo/processing/execution/AsyncExecution.java
@@ -32,7 +32,7 @@ import java.util.concurrent.*;
* The request is not thread safe. A clone() must be made for each parallel processing.
* </p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @see Execution
*/
public class AsyncExecution {
diff --git a/processing/src/main/java/com/yahoo/processing/execution/Execution.java b/processing/src/main/java/com/yahoo/processing/execution/Execution.java
index c8bc291c036..4930e46f707 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/Execution.java
+++ b/processing/src/main/java/com/yahoo/processing/execution/Execution.java
@@ -16,7 +16,7 @@ import java.util.Iterator;
* An execution of a chain. This keeps tracks of the progress of the execution and is called by the
* processors (using {@link #process} to move the execution to the next one.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Execution {
@@ -240,7 +240,7 @@ public class Execution {
* Tre trace of this execution. This is a facade into a node in the larger trace tree which captures
* the information about all executions caused by some request
*
- * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public static class Trace {
diff --git a/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java b/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java
index ceb5d4f7ccc..79242c6e2dd 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java
+++ b/processing/src/main/java/com/yahoo/processing/execution/ExecutionWithResponse.java
@@ -10,7 +10,7 @@ import com.yahoo.processing.Response;
* An execution which has a response which is returned when this gets to the end of the chain.
* This is useful to run processing chains where a response exists up front, typically for on completion listeners.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ExecutionWithResponse extends Execution {
diff --git a/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java b/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java
index fbc6d0fb6d8..2d4b3a9c317 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java
+++ b/processing/src/main/java/com/yahoo/processing/execution/ResponseReceiver.java
@@ -8,7 +8,7 @@ import com.yahoo.processing.Response;
* Freeze listeners may implement this to be handed the response
* before they are run. There is probably no other sensible use for this.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public interface ResponseReceiver {
diff --git a/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java b/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java
index 617a2b98b03..c86631cca4a 100644
--- a/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java
+++ b/processing/src/main/java/com/yahoo/processing/execution/RunnableExecution.java
@@ -8,7 +8,7 @@ import com.yahoo.processing.Response;
* An adaptor of an Execution to a runnable. Calling run on this causes process to be called on the
* given processor.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class RunnableExecution implements Runnable {
diff --git a/processing/src/main/java/com/yahoo/processing/request/CompoundName.java b/processing/src/main/java/com/yahoo/processing/request/CompoundName.java
index 798d2d11f89..348966891b2 100644
--- a/processing/src/main/java/com/yahoo/processing/request/CompoundName.java
+++ b/processing/src/main/java/com/yahoo/processing/request/CompoundName.java
@@ -15,7 +15,7 @@ import static com.yahoo.text.Lowercase.toLowerCase;
* <p>
* Using CompoundName is generally substantially faster than using strings.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class CompoundName {
diff --git a/processing/src/main/java/com/yahoo/processing/response/AbstractData.java b/processing/src/main/java/com/yahoo/processing/response/AbstractData.java
index 3595315bd62..9404f991901 100644
--- a/processing/src/main/java/com/yahoo/processing/response/AbstractData.java
+++ b/processing/src/main/java/com/yahoo/processing/response/AbstractData.java
@@ -7,7 +7,7 @@ import com.yahoo.processing.Request;
/**
* Convenience superclass for implementations of data. This contains no payload.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public abstract class AbstractData extends ListenableFreezableClass implements Data {
diff --git a/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java b/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java
index 845ab041d73..a1935a1a631 100644
--- a/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java
+++ b/processing/src/main/java/com/yahoo/processing/response/AbstractDataList.java
@@ -17,7 +17,7 @@ import java.util.concurrent.TimeoutException;
/**
* A convenience superclass for dataList implementations which handles references to the request and to incoming data.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public abstract class AbstractDataList<DATATYPE extends Data> extends ListenableFreezableClass implements DataList<DATATYPE>, Streamed, Ordered {
diff --git a/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java b/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java
index d30d1848c7f..7d75f3f4d45 100644
--- a/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java
+++ b/processing/src/main/java/com/yahoo/processing/response/ArrayDataList.java
@@ -10,7 +10,7 @@ import java.util.List;
* A data list backed by an array.
* This implementation supports subclassing.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ArrayDataList<DATATYPE extends Data> extends AbstractDataList<DATATYPE> {
diff --git a/processing/src/main/java/com/yahoo/processing/response/Data.java b/processing/src/main/java/com/yahoo/processing/response/Data.java
index 31207210ef2..67530b32f53 100644
--- a/processing/src/main/java/com/yahoo/processing/response/Data.java
+++ b/processing/src/main/java/com/yahoo/processing/response/Data.java
@@ -9,7 +9,7 @@ import com.yahoo.processing.Request;
* <p>
* If a data item is <i>frozen</i> it is illegal to make further changes to its payload or referenced request.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
// TODO: Have DataList implement this instead, probably (should be a safe change in practise)
public interface Data extends ListenableFreezable {
diff --git a/processing/src/main/java/com/yahoo/processing/response/DataList.java b/processing/src/main/java/com/yahoo/processing/response/DataList.java
index 42cb1f98a70..fd392a72e0b 100644
--- a/processing/src/main/java/com/yahoo/processing/response/DataList.java
+++ b/processing/src/main/java/com/yahoo/processing/response/DataList.java
@@ -18,7 +18,7 @@ import java.util.concurrent.Executor;
* Content in a frozen list may be returned to the requesting client immediately by the underlying engine,
* even if the Response owning the list is not returned yet.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public interface DataList<DATATYPE extends Data> extends Data {
diff --git a/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java b/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java
index 212644a186f..4a85f582905 100644
--- a/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java
+++ b/processing/src/main/java/com/yahoo/processing/response/DefaultIncomingData.java
@@ -14,7 +14,7 @@ import java.util.concurrent.Executor;
/**
* The default incoming data implementation
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class DefaultIncomingData<DATATYPE extends Data> implements IncomingData<DATATYPE> {
diff --git a/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java b/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java
index 7653b8e6c28..dfc0ab0e54c 100644
--- a/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java
+++ b/processing/src/main/java/com/yahoo/processing/response/FutureResponse.java
@@ -18,7 +18,7 @@ import java.util.logging.Logger;
/**
* A processing response which will arrive in the future.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class FutureResponse extends ForwardingFuture<Response> {
diff --git a/processing/src/main/java/com/yahoo/processing/response/IncomingData.java b/processing/src/main/java/com/yahoo/processing/response/IncomingData.java
index 5939f56a8f3..cf45cda1c16 100644
--- a/processing/src/main/java/com/yahoo/processing/response/IncomingData.java
+++ b/processing/src/main/java/com/yahoo/processing/response/IncomingData.java
@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
* A data list own once instance of this which can be used to provide data asynchronously to the list,
* and consume, wait for or be notified upon the arrival of such data.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public interface IncomingData<DATATYPE extends Data> {
diff --git a/processing/src/main/java/com/yahoo/processing/response/Ordered.java b/processing/src/main/java/com/yahoo/processing/response/Ordered.java
index 10aeaaeb952..87fa14e3c04 100644
--- a/processing/src/main/java/com/yahoo/processing/response/Ordered.java
+++ b/processing/src/main/java/com/yahoo/processing/response/Ordered.java
@@ -7,7 +7,7 @@ package com.yahoo.processing.response;
* the list is insignificant. The usage of this is to allow the content of a list to be rendered in the order
* in which it completes rather than in the order in which it is added to the list.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.19
*/
public interface Ordered {
diff --git a/processing/src/main/java/com/yahoo/processing/response/Streamed.java b/processing/src/main/java/com/yahoo/processing/response/Streamed.java
index 6eab5a3287f..f51ef4a7817 100644
--- a/processing/src/main/java/com/yahoo/processing/response/Streamed.java
+++ b/processing/src/main/java/com/yahoo/processing/response/Streamed.java
@@ -7,7 +7,7 @@ package com.yahoo.processing.response;
* until it is completed. This is useful in cases where some decision making which may impact the content of the list
* must be deferred until the list is complete.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.19
*/
public interface Streamed {
diff --git a/processing/src/main/java/com/yahoo/processing/test/Responses.java b/processing/src/main/java/com/yahoo/processing/test/Responses.java
index bd795770b87..3b1196528c7 100644
--- a/processing/src/main/java/com/yahoo/processing/test/Responses.java
+++ b/processing/src/main/java/com/yahoo/processing/test/Responses.java
@@ -7,7 +7,7 @@ import com.yahoo.processing.response.DataList;
/**
* Static utilities
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.13
*/
public class Responses {
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java
index bdf04859151..098c5666187 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/execution/test/AsyncExecutionTestCase.java
@@ -12,7 +12,7 @@ import static com.yahoo.processing.test.ProcessorLibrary.*;
import static org.junit.Assert.assertEquals;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class AsyncExecutionTestCase {
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
index f5b3121f2f8..fa733489e48 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
@@ -11,7 +11,7 @@ import java.util.Iterator;
import java.util.Set;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ExecutionContextTestCase extends junit.framework.TestCase {
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java
index 09d7c38322f..9a31a8d1938 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/execution/test/FutureDataTestCase.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
* Tests scenarios where a data producer returns a promise of some future data rather than the data itself.
* As no processor waits for the data it is returned all the way to the caller.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class FutureDataTestCase {
diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
index 1ce4e293104..6002c1993e2 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/execution/test/StreamingTestCase.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
/**
* Tests listening on every available new piece of data in a response
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class StreamingTestCase {
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java
index 647000c5f88..4b906a723c3 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameTestCase.java
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class CompoundNameTestCase {
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
index 82fd25f9754..8b2f2c64d24 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
@@ -6,7 +6,7 @@ import com.yahoo.processing.request.ErrorMessage;
import org.junit.Test;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ErrorMessageTestCase extends junit.framework.TestCase {
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
index 61ef75c55a2..812ce2fae65 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
@@ -8,7 +8,7 @@ import java.util.Collections;
import java.util.List;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PropertyMapTestCase extends junit.framework.TestCase {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java b/searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java
index 285b39cbfbb..556a69e3cb8 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/gbdt/CategoryFeatureNode.java
@@ -10,7 +10,7 @@ import java.util.Optional;
/**
* A GBDT node representing a set inclusion test: feature IN [value-list] where values can be strings or numbers.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class CategoryFeatureNode extends FeatureNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java b/searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java
index b78b9ed4224..eccd279190c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/gbdt/NumericFeatureNode.java
@@ -10,7 +10,7 @@ import java.util.Optional;
/**
* A GBDT node representing a numeric "less than" comparison: feature &lt; numeric-value
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class NumericFeatureNode extends FeatureNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java
index 608a4b499ed..58a252a2c66 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/CaseList.java
@@ -6,7 +6,7 @@ import java.util.List;
/**
* A producer of a list of cases for function training.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public interface CaseList {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java
index 0ccce4ad2ad..ebf4f6f4bda 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Evolvable.java
@@ -8,7 +8,7 @@ import java.util.List;
/**
* An entity which may evolve over time
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public abstract class Evolvable implements Comparable<Evolvable> {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java
index 416e2da4c82..5b28b176341 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Individual.java
@@ -12,7 +12,7 @@ import java.util.List;
* <p>
* As we are training ranking expressions, the genome, here, is the ranking expression.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Individual extends Evolvable {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java
index 7f2e3645076..091990ffdc5 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/KeyboardChecker.java
@@ -8,7 +8,7 @@ import java.awt.event.KeyEvent;
/**
* TODO
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class KeyboardChecker {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java
index c62462d0c3d..8e515829f2e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Main.java
@@ -13,7 +13,7 @@ import java.io.IOException;
/**
* Command line runner for training sessions
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
/*
TODO: Switch order of generation and sequence in names
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java
index 484a0747e24..184c566c5a2 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Population.java
@@ -10,7 +10,7 @@ import java.util.List;
/**
* A collection of evolvables
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Population {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java
index 4a3edd35a8d..c4d8121867e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/PrintingTracker.java
@@ -9,7 +9,7 @@ import java.util.List;
/**
* A tracker which prints a summary of training events to standard out
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PrintingTracker implements Tracker {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java
index a4421595917..98ed32209c2 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/RankingExpressionCaseList.java
@@ -15,7 +15,7 @@ import java.util.List;
* from a Ranking Expression.
* Useful for testing.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class RankingExpressionCaseList implements CaseList {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java
index d67afddd3c5..27a61d2b157 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Recombiner.java
@@ -15,7 +15,7 @@ import static java.lang.Math.min;
/**
* A class which returns a mutated, recombined genome from a list of parent genomes.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Recombiner {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java
index 39694b6253f..1c559d92af7 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Species.java
@@ -11,7 +11,7 @@ import java.util.List;
* Contrary to a real species, a species population may contain (sub)species
* rather than individuals - at all levels but the lowest.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Species extends Evolvable {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java
index 3bd8ae5e55f..31e85b52318 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/SpeciesName.java
@@ -5,7 +5,7 @@ package com.yahoo.searchlib.mlr.ga;
* The name of a species. For tracking purposes.
* A name has the form superSpeciesName + "/" + serialNumber.generationNumber.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class SpeciesName {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java
index d86af40b805..93df1adb313 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Tracker.java
@@ -8,7 +8,7 @@ import java.util.List;
/**
* A tracker receives callbacks about events happening during a training session.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public interface Tracker {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java
index 7e2551eccb2..af426f1a85c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/Trainer.java
@@ -17,7 +17,7 @@ import java.util.Set;
/**
* Learns a ranking expression from some seed expressions and a training set.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Trainer {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java
index 757a2e4d3d2..e1929c40001 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingEnvironment.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.mlr.ga;
/**
* The static environment of a training session
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class TrainingEnvironment {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java
index e18f560878e..225c40613ed 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingParameters.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
import java.util.Set;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class TrainingParameters {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java
index 507ab26806a..e574aa8e72f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/TrainingSet.java
@@ -12,7 +12,7 @@ import java.util.Set;
/**
* A training set: a set of <i>cases</i>: Input data to output value pairs
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class TrainingSet {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java
index 78291768380..ce2cf86a91d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/CsvFileCaseList.java
@@ -15,7 +15,7 @@ import java.util.Optional;
*
* <p>Comment lines starting with "#" are ignored.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class CsvFileCaseList extends FileCaseList {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java
index ec07a939932..82aed1ce517 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/mlr/ga/caselist/FvFileCaseList.java
@@ -16,7 +16,7 @@ import java.util.Optional;
*
* <p>Comment lines starting with "#" are ignored.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
// NOTE: If we get another type of case list it is time to abstract into a common CaseList base class
public class FvFileCaseList extends FileCaseList {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java
index 9dac3db11c8..f381c8ea158 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/Features.java
@@ -10,7 +10,7 @@ import java.util.Map;
/**
* A set of (immutable) computed features
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
@Beta
public class Features {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java
index e5b4a899844..95bc7d4180e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/FieldTermMatch.java
@@ -11,7 +11,7 @@ import java.util.Map;
/**
* Calculates the fieldTermMatch features
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
@Beta
public class FieldTermMatch {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java
index 77083d4edb4..466463edaeb 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java
@@ -11,7 +11,7 @@ import static java.lang.Math.*;
/**
* The collection of metrics calculated by the string match metric calculator.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class FieldMatchMetrics implements Cloneable {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java
index 3fc3780151a..95284ba1e69 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java
@@ -43,7 +43,7 @@ import java.util.Set;
*
* <p>This class is not multithread safe, but is reusable across queries for a single thread.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class FieldMatchMetricsComputer {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java
index 4ab8565a285..49daf0c6961 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsParameters.java
@@ -5,7 +5,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch;
* The parameters to a string match metric calculator.
* Mutable until frozen.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class FieldMatchMetricsParameters {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java
index f101448a3dd..cbd35a8565b 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Main.java
@@ -33,7 +33,7 @@ public class Main {
private static void printUsage() {
System.out.println("Computes the string segment match metrics of a query and field.");
System.out.println("Usage: java -jar searchlib.jar query field");
- System.out.println("By: Jon Bratseth (bratseth@yahoo-inc.com)");
+ System.out.println("Author: bratseth");
}
}
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java
index 6cd9d651a09..6393300fe80 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Query.java
@@ -12,7 +12,7 @@ import java.util.Arrays;
* explicitly. This allows us to model the matchWeight rank feature of a field as dependent of
* the weights of all the terms in the query.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Query {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java
index 803aaf52964..47ffb276f70 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch;
/**
* A query term. Query terms are equal if they have the same term string.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class QueryTerm {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java
index 9f6e81a04bc..c7331a0b5b6 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/SegmentStartPoint.java
@@ -8,7 +8,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch;
* and the end of the previous segment. In addition it holds information on how far we have tried
* to look for alternative segments from this starting point (skipI and previousJ).</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
final class SegmentStartPoint {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java
index 775c7d1d687..9dfefe5098d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/Trace.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch;
/**
* A computation trace
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Trace {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java
index 8b456b9236b..fd7b80f9342 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/BooleanValue.java
@@ -8,7 +8,7 @@ import com.yahoo.searchlib.rankingexpression.rule.TruthOperator;
* A value which is either true or false.
* In numerical context true is interpreted as 1 and false as 0.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.21
*/
public class BooleanValue extends DoubleCompatibleValue {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java
index 3129bfa05a3..2bae382d5bd 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/DoubleCompatibleValue.java
@@ -7,7 +7,7 @@ import com.yahoo.searchlib.rankingexpression.rule.TruthOperator;
/**
* A value which acts as a double in numerical context.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.21
*/
public abstract class DoubleCompatibleValue extends Value {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java
index 6730053e9fe..d852267f1b7 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/ExpressionOptimizer.java
@@ -27,7 +27,7 @@ import com.yahoo.searchlib.rankingexpression.evaluation.gbdtoptimization.GBDTOpt
* <p>
* Instances of this class are not multithread safe.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ExpressionOptimizer {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java
index 340a074f179..0c062658089 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/OptimizationReport.java
@@ -9,7 +9,7 @@ import java.util.Map;
/**
* Reports the result of optimizations of a ranking expression.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class OptimizationReport {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java
index ff935031149..b2dc5e27b91 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java
@@ -8,7 +8,7 @@ import com.yahoo.searchlib.rankingexpression.rule.TruthOperator;
/**
* A string value.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.21
*/
public class StringValue extends Value {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java
index e56c005cdf7..142cd650ee8 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java
@@ -11,7 +11,7 @@ import com.yahoo.tensor.MapTensor;
* Concrete subclasses of this provides implementations of these methods or throws
* UnsupportedOperationException if the operation is not supported.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.5
*/
public abstract class Value {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java
index 7e74bdce9e6..1d77c955699 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/gbdtoptimization/GBDTOptimizer.java
@@ -16,7 +16,7 @@ import java.util.List;
*
* <p>This class is not multithread safe.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class GBDTOptimizer extends Optimizer {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java
index 11feddb919e..18a572745f6 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java
@@ -11,7 +11,7 @@ import java.util.List;
/**
* A node which flips the sign of the value produced from the nested expression
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class NegativeNode extends CompositeNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java
index bb3b028f696..a62ba02c728 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SetMembershipNode.java
@@ -11,7 +11,7 @@ import java.util.*;
/**
* A node which returns true or false depending on a set membership test
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.21
*/
public class SetMembershipNode extends BooleanNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java
index 26e8b183c21..60fe19f909f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
/**
* A mathematical operator
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public enum TruthOperator implements Serializable {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java
index bd9ad43f155..43eb7beb93e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencer.java
@@ -15,7 +15,7 @@ import java.util.Map;
/**
* Replaces "features" which found in the given constants by their constant value
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ConstantDereferencer extends ExpressionTransformer {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java
index d8995bd8752..cb9358227fb 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/ExpressionTransformer.java
@@ -11,7 +11,7 @@ import java.util.List;
/**
* Superclass of expression transformers
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public abstract class ExpressionTransformer {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
index 5b5a06c99bf..c54c20a17d6 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
@@ -19,7 +19,7 @@ import java.util.List;
/**
* Performs simple algebraic simplification of expressions
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Simplifier extends ExpressionTransformer {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java b/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java
index 4506f4970b0..47bc16a48e0 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/Condition.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
/**
* Represents a condition
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public abstract class Condition extends TreeNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java b/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java
index 95841bf829f..bb47947557c 100755
--- a/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/treenet/rule/SetMembershipCondition.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.searchlib.treenet.rule;
import com.yahoo.java7compat.Util;
@@ -11,7 +11,7 @@ import java.util.List;
/**
* Represents a set membership test on the form <code>feature IN (integer1, integer2 ...)</code>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.21
*/
public class SetMembershipCondition extends Condition {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java
index e95af6ad61d..265b419a9e6 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/CsvFileCaseListTestCase.java
@@ -9,7 +9,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class CsvFileCaseListTestCase {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java
index fc834181f53..1dce786e9e8 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/ExampleLearningSessions.java
@@ -17,7 +17,7 @@ import java.util.List;
/**
* Main class - drives a learning session from the command line.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ExampleLearningSessions {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java
index 51460855983..1cfc1fa673b 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MainTestCase.java
@@ -16,7 +16,7 @@ import java.util.List;
/**
* Tests the main class used from the command line
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MainTestCase {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java
index ab1d5c362b8..b6f7d2a87ea 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/MockTrainingSetTestCase.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MockTrainingSetTestCase {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java
index 9c3e514ddad..a1177aebefe 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/mlr/ga/test/TripAdvisorFileCaseList.java
@@ -14,7 +14,7 @@ import java.util.*;
/**
* Reads a tripadvisor Kaggle challenge training set
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class TripAdvisorFileCaseList implements CaseList {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java
index 272ca98d7c4..3f55d3ed9a0 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/OptimalStringAlignmentDistance.java
@@ -8,7 +8,7 @@ import java.util.Arrays;
* and which uses 2*query length memory rather than field length*query length.
* This class is not thread safe.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class OptimalStringAlignmentDistance {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java
index 398c4e70fb7..f57835cdc3f 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/reference/test/OptimalStringAlignmentTestCase.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.ranking.features.fieldmatch.reference.test;
import com.yahoo.searchlib.ranking.features.fieldmatch.reference.OptimalStringAlignmentDistance;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class OptimalStringAlignmentTestCase extends junit.framework.TestCase {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
index 19948cad9f2..b67a423181d 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
@@ -16,7 +16,7 @@ import java.util.Set;
/**
* Tests expression evaluation
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class EvaluationTestCase extends junit.framework.TestCase {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java
index 9fbaddaab1e..851eafd2ac8 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/ConstantDereferencerTestCase.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ConstantDereferencerTestCase {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java
index 69ec3a914d1..9d94ec0bc99 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/transform/SimplifierTestCase.java
@@ -10,7 +10,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class SimplifierTestCase {
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java
index 8913b01d799..19eacc6ab42 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Exceptions.java
@@ -6,7 +6,7 @@ import com.google.common.annotations.Beta;
/**
* Helper methods for handling exceptions
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
@Beta
public abstract class Exceptions {
diff --git a/vespajlib/developernotes/XMLMicroBenchmark.java b/vespajlib/developernotes/XMLMicroBenchmark.java
index 6a9d02e1c45..4724ead679a 100644
--- a/vespajlib/developernotes/XMLMicroBenchmark.java
+++ b/vespajlib/developernotes/XMLMicroBenchmark.java
@@ -4,7 +4,7 @@ package com.yahoo.text;
/**
* It is what it says
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class XMLMicroBenchmark {
diff --git a/vespajlib/developernotes/XMLWriterMicroBenchmark.java b/vespajlib/developernotes/XMLWriterMicroBenchmark.java
index 67570d54ea6..d1d5f9cdf26 100644
--- a/vespajlib/developernotes/XMLWriterMicroBenchmark.java
+++ b/vespajlib/developernotes/XMLWriterMicroBenchmark.java
@@ -11,7 +11,7 @@ import java.nio.charset.CharsetEncoder;
/**
* It is what it says
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class XMLWriterMicroBenchmark {
diff --git a/vespajlib/src/main/java/com/yahoo/collections/BobHash.java b/vespajlib/src/main/java/com/yahoo/collections/BobHash.java
index b942c4e78f0..41e4a934d71 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/BobHash.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/BobHash.java
@@ -81,7 +81,7 @@ public class BobHash {
* Note: This is copying the string content, change implementation to
* use efficiently on large strings.
*
- * <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * bratseth
*/
public static int hash(String key) {
return hash(Utf8.toBytes(key), 0);
diff --git a/vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java b/vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java
index 43f38c67e4d..c920444a677 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/CopyOnWriteHashMap.java
@@ -17,7 +17,7 @@ import java.util.Set;
* As with regular maps, this can only be used safely if the content of the map is immutable.
* If not, the {@link #copyMap} method can be overridden to perform a deep clone.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
@Beta
public class CopyOnWriteHashMap<K,V> extends AbstractMap<K,V> implements Cloneable {
diff --git a/vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java b/vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java
index e145a08be09..4e6e1340b98 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/FreezableArrayList.java
@@ -9,7 +9,7 @@ import java.util.List;
* After freezing, edit operations will throw UnsupportedOperationException.
* Freezable lists may optionally allow new items to be added to the end of the list also after freeze.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.20
*/
public class FreezableArrayList<ITEM> extends ListenableArrayList<ITEM> {
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ListMap.java b/vespajlib/src/main/java/com/yahoo/collections/ListMap.java
index ab2c97fda17..8054179be30 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ListMap.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ListMap.java
@@ -10,7 +10,7 @@ import java.util.*;
/**
* A map holding multiple items at each key (using ArrayList and HashMap).
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ListMap<K, V> {
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java b/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java
index 1b77e97d159..d195cf36172 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ListenableArrayList.java
@@ -8,7 +8,7 @@ import java.util.List;
/**
* An array list which notifies listeners after one or more items are added
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.17
*/
@SuppressWarnings("serial")
diff --git a/vespajlib/src/main/java/com/yahoo/collections/Pair.java b/vespajlib/src/main/java/com/yahoo/collections/Pair.java
index 8969e1b1021..30c4c1f9276 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/Pair.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/Pair.java
@@ -5,7 +5,7 @@ package com.yahoo.collections;
* An immutable pair of objects. This implements equals and hashCode by delegating to the
* pair objects.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Pair<F, S> {
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
index 8a79db6a6eb..42d3ff51aae 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadRobustList.java
@@ -16,7 +16,7 @@ import java.util.NoSuchElementException;
*
* @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 ThreadRobustList<T> implements Iterable<T> {
diff --git a/vespajlib/src/main/java/com/yahoo/io/IOUtils.java b/vespajlib/src/main/java/com/yahoo/io/IOUtils.java
index 61687f92659..4dcf3f89d33 100644
--- a/vespajlib/src/main/java/com/yahoo/io/IOUtils.java
+++ b/vespajlib/src/main/java/com/yahoo/io/IOUtils.java
@@ -13,7 +13,7 @@ import java.nio.ByteBuffer;
/**
* <p>Some static io convenience methods.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
*/
public abstract class IOUtils {
diff --git a/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java b/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java
index d0d52a8c619..65201a02bae 100644
--- a/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java
+++ b/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java
@@ -10,7 +10,7 @@ import java.util.List;
/**
* A reader with a name. All reader methods are delegated to the wrapped reader.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
@Beta
public class NamedReader extends Reader {
diff --git a/vespajlib/src/main/java/com/yahoo/net/URI.java b/vespajlib/src/main/java/com/yahoo/net/URI.java
index 1f9baa36c06..e97018f20cf 100644
--- a/vespajlib/src/main/java/com/yahoo/net/URI.java
+++ b/vespajlib/src/main/java/com/yahoo/net/URI.java
@@ -13,13 +13,10 @@ import static com.yahoo.text.Lowercase.toLowerCase;
* <p>This does more normalization of hierarchical URIs (URLs) than
* described in the RFC and allows hosts with underscores.</p>
*
- * @author <a href="mailto:bratseth@fast.no">Jon S Bratseth</a>
+ * @author bratseth
*/
public class URI implements Cloneable, java.io.Serializable, Comparable<URI> {
- /**
- *
- */
private static final long serialVersionUID = 2271558213498856909L;
/** The uri string */
@@ -795,7 +792,7 @@ public class URI implements Cloneable, java.io.Serializable, Comparable<URI> {
}
}
- public static enum URLContext {
+ public enum URLContext {
URL_SCHEME(0, "scheme"),
URL_HOST(1, "host"),
URL_DOMAIN(2, "domain"),
@@ -811,9 +808,10 @@ public class URI implements Cloneable, java.io.Serializable, Comparable<URI> {
public final int id;
public final String name;
- private URLContext(int id, String name) {
+ URLContext(int id, String name) {
this.id = id;
this.name = name;
}
}
+
}
diff --git a/vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java b/vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java
index bb2909b346a..609fab1c58f 100644
--- a/vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java
+++ b/vespajlib/src/main/java/com/yahoo/system/ProcessExecuter.java
@@ -12,12 +12,13 @@ import com.yahoo.collections.Pair;
/**
* Executes a system command synchronously.
*
- * @author <a href="mailto:bratseth@yahoo-inc">Jon S Bratseth</a>
+ * @author bratseth
*/
public class ProcessExecuter {
/**
* Executes the given command synchronously without timeout.
+ *
* @return Retcode and stdout/stderr merged
*/
public Pair<Integer, String> exec(String command) throws IOException {
@@ -29,6 +30,7 @@ public class ProcessExecuter {
/**
* Executes the given command synchronously without timeout.
+ *
* @param command tokens
* @return Retcode and stdout/stderr merged
*/
diff --git a/vespajlib/src/main/java/com/yahoo/text/BooleanParser.java b/vespajlib/src/main/java/com/yahoo/text/BooleanParser.java
index a17d821ff9d..54ef07842f1 100644
--- a/vespajlib/src/main/java/com/yahoo/text/BooleanParser.java
+++ b/vespajlib/src/main/java/com/yahoo/text/BooleanParser.java
@@ -5,7 +5,7 @@ package com.yahoo.text;
* Utility class parsing a string into a boolean.
* In contrast to Boolean.parseBoolean in the Java API this parser is strict.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class BooleanParser {
diff --git a/vespajlib/src/main/java/com/yahoo/text/JSON.java b/vespajlib/src/main/java/com/yahoo/text/JSON.java
index 33af017b81d..d40638c3d3c 100644
--- a/vespajlib/src/main/java/com/yahoo/text/JSON.java
+++ b/vespajlib/src/main/java/com/yahoo/text/JSON.java
@@ -6,7 +6,7 @@ import java.util.Map;
/**
* Static methods for working with the map textual format which is parsed by {@link MapParser}
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class JSON {
diff --git a/vespajlib/src/main/java/com/yahoo/text/PositionedString.java b/vespajlib/src/main/java/com/yahoo/text/PositionedString.java
index de2e349ef82..918a683a626 100644
--- a/vespajlib/src/main/java/com/yahoo/text/PositionedString.java
+++ b/vespajlib/src/main/java/com/yahoo/text/PositionedString.java
@@ -5,7 +5,7 @@ package com.yahoo.text;
* A string which has a current position.
* Useful for writing simple single-pass parsers.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.15
*/
public class PositionedString {
diff --git a/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java
index 4370a9b46b0..a66d9c45893 100644
--- a/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/collections/CopyOnWriteHashMapTestCase.java
@@ -5,7 +5,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class CopyOnWriteHashMapTestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java b/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java
index 762ae9d5b60..5a6c331393f 100644
--- a/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java
+++ b/vespajlib/src/test/java/com/yahoo/collections/FreezableArrayListListener.java
@@ -5,7 +5,7 @@ import org.junit.Test;
import static org.junit.Assert.fail;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class FreezableArrayListListener {
diff --git a/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java b/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java
index e3fb48c7a0e..0412d9fefe4 100644
--- a/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/collections/ListenableArrayListTestCase.java
@@ -8,7 +8,7 @@ import java.util.Arrays;
import java.util.ListIterator;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ListenableArrayListTestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java b/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java
index 7f89cccc6c8..d4df3478da8 100644
--- a/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/io/IOUtilsTestCase.java
@@ -6,7 +6,7 @@ import java.util.Arrays;
import java.util.List;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class IOUtilsTestCase extends junit.framework.TestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java b/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java
index 280d0782bd2..4d6954ca9a8 100644
--- a/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java
@@ -13,7 +13,7 @@ import com.yahoo.protect.ClassValidator;
/**
* Tests all method of NamedReader.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
*/
public class NamedReaderTestCase extends junit.framework.TestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/net/URITestCase.java b/vespajlib/src/test/java/com/yahoo/net/URITestCase.java
index 7bb2303d7bb..dc04f42e9d1 100644
--- a/vespajlib/src/test/java/com/yahoo/net/URITestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/net/URITestCase.java
@@ -1,14 +1,12 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.net;
-
import java.util.List;
-
/**
* Tests the URI class
*
- * @author <a href="mailto:bratseth@fast.no">Jon S Bratseth</a>
+ * @author bratseth
*/
public class URITestCase extends junit.framework.TestCase {
@@ -472,41 +470,43 @@ public class URITestCase extends junit.framework.TestCase {
// Error reported int bug #2466528
public void testFileURIEmptyHost() {
- URI uri = new URI("file:///C:/Inetpub/wwwroot/DW_SHORTCUTS.htm");
- List<URI.Token> tokens = uri.tokenize();
- URI.Token token;
- token = tokens.get(0);
- assertEquals("file", token.getToken());
- assertEquals(URI.URLContext.URL_SCHEME, token.getContext());
-
- token = tokens.get(1);
- assertEquals("localhost", token.getToken());
- assertEquals(URI.URLContext.URL_HOST, token.getContext());
-
- token = tokens.get(2);
- assertEquals("C", token.getToken());
- assertEquals(URI.URLContext.URL_PATH, token.getContext());
-
- token = tokens.get(3);
- assertEquals("Inetpub", token.getToken());
- assertEquals(URI.URLContext.URL_PATH, token.getContext());
-
- token = tokens.get(4);
- assertEquals("wwwroot", token.getToken());
- assertEquals(URI.URLContext.URL_PATH, token.getContext());
-
- token = tokens.get(5);
- assertEquals("DW_SHORTCUTS", token.getToken());
- assertEquals(URI.URLContext.URL_PATH, token.getContext());
-
- token = tokens.get(6);
- assertEquals("htm", token.getToken());
- assertEquals(URI.URLContext.URL_PATH, token.getContext());
-
- try {
- tokens.get(7);
- fail();
- } catch (IndexOutOfBoundsException ioobe) {
- }
+ URI uri = new URI("file:///C:/Inetpub/wwwroot/DW_SHORTCUTS.htm");
+ List<URI.Token> tokens = uri.tokenize();
+ URI.Token token;
+ token = tokens.get(0);
+ assertEquals("file", token.getToken());
+ assertEquals(URI.URLContext.URL_SCHEME, token.getContext());
+
+ token = tokens.get(1);
+ assertEquals("localhost", token.getToken());
+ assertEquals(URI.URLContext.URL_HOST, token.getContext());
+
+ token = tokens.get(2);
+ assertEquals("C", token.getToken());
+ assertEquals(URI.URLContext.URL_PATH, token.getContext());
+
+ token = tokens.get(3);
+ assertEquals("Inetpub", token.getToken());
+ assertEquals(URI.URLContext.URL_PATH, token.getContext());
+
+ token = tokens.get(4);
+ assertEquals("wwwroot", token.getToken());
+ assertEquals(URI.URLContext.URL_PATH, token.getContext());
+
+ token = tokens.get(5);
+ assertEquals("DW_SHORTCUTS", token.getToken());
+ assertEquals(URI.URLContext.URL_PATH, token.getContext());
+
+ token = tokens.get(6);
+ assertEquals("htm", token.getToken());
+ assertEquals(URI.URLContext.URL_PATH, token.getContext());
+
+ try {
+ tokens.get(7);
+ fail();
+ } catch (IndexOutOfBoundsException ioobe) {
+ // Success
+ }
}
+
}
diff --git a/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java b/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java
index fa611d8fd71..3e18df93e47 100644
--- a/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java
+++ b/vespajlib/src/test/java/com/yahoo/protect/TestErrorMessage.java
@@ -2,7 +2,7 @@
package com.yahoo.protect;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class TestErrorMessage extends junit.framework.TestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java b/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java
index 6acbda729e5..d5de37ef50f 100644
--- a/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/protect/ValidatorTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.protect;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ValidatorTestCase extends junit.framework.TestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java b/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java
index 2bf1d8c094a..97be79c069a 100644
--- a/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/system/ProcessExecuterTestCase.java
@@ -8,7 +8,7 @@ import java.io.File;
import java.io.IOException;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ProcessExecuterTestCase extends junit.framework.TestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/text/JSONTest.java b/vespajlib/src/test/java/com/yahoo/text/JSONTest.java
index 53be5a1bda5..2e7e1da65f0 100644
--- a/vespajlib/src/test/java/com/yahoo/text/JSONTest.java
+++ b/vespajlib/src/test/java/com/yahoo/text/JSONTest.java
@@ -8,7 +8,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class JSONTest {
diff --git a/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java
index 16d9fe65769..cbb0c37cdd9 100644
--- a/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/text/JSONWriterTestCase.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.*;
/**
* Tests the JSON writer
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
@SuppressWarnings("deprecation")
public class JSONWriterTestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java b/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java
index 21ab4fd4309..5b4456f14f4 100644
--- a/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java
+++ b/vespajlib/src/test/java/com/yahoo/text/MapParserMicroBenchmark.java
@@ -8,7 +8,7 @@ import java.util.Map;
* A benchmark of map parsing.
* Expected time on Jon's mac: 200 microseconds per 1k size map.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MapParserMicroBenchmark {
diff --git a/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java b/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java
index 7bf11c277e1..f846c6263d1 100644
--- a/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/text/MapParserTestCase.java
@@ -6,7 +6,7 @@ import java.util.Map;
import static org.junit.Assert.*;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MapParserTestCase {
diff --git a/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java b/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java
index 69d62d59be5..7e62180d88e 100644
--- a/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java
+++ b/vespajlib/src/test/java/com/yahoo/text/StringAppendMicroBenchmarkTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
/**
* Compares alternative ways of appending strings
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class StringAppendMicroBenchmarkTest {
diff --git a/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java b/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java
index dc3530fdd97..75f6bf64734 100644
--- a/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/text/XMLWriterTestCase.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue;
/**
* This test is currently incomplete. Also much tested in the prelude module though.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
@SuppressWarnings("deprecation")
public class XMLWriterTestCase {
diff --git a/yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java b/yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java
index 5060ed8ef6a..25f4f62f418 100644
--- a/yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java
+++ b/yolean/src/main/java/com/yahoo/yolean/concurrent/ThreadRobustList.java
@@ -19,7 +19,7 @@ import java.util.NoSuchElementException;
* <p>The usage of <tt>ThreadRobustList</tt> has no memory consistency effects. </p>
*
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.15
*/
public class ThreadRobustList<T> implements Iterable<T> {
diff --git a/yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java b/yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java
index d7e9d128ebd..641462b8819 100644
--- a/yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java
+++ b/yolean/src/main/java/com/yahoo/yolean/trace/TraceNode.java
@@ -22,7 +22,7 @@ import java.util.NoSuchElementException;
* need to synchronize their access on the <tt>TraceNode</tt>.</p>
*
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.15
*/
public class TraceNode {
diff --git a/yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java b/yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java
index 2cb48616e56..5000b5220c8 100644
--- a/yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java
+++ b/yolean/src/main/java/com/yahoo/yolean/trace/TraceVisitor.java
@@ -4,7 +4,7 @@ package com.yahoo.yolean.trace;
/**
* <p>This class is an abstract visitor of {@link TraceNode}. See {@link TraceNode#accept(TraceVisitor)}.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
* @since 5.1.15
*/
public abstract class TraceVisitor {
diff --git a/yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java b/yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java
index 36c295ba7f4..893993b3318 100644
--- a/yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java
+++ b/yolean/src/test/java/com/yahoo/yolean/ExceptionsTestCase.java
@@ -2,7 +2,7 @@
package com.yahoo.yolean;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class ExceptionsTestCase extends junit.framework.TestCase {
diff --git a/yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java b/yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java
index cc25ecf4cd0..097020ec579 100644
--- a/yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java
+++ b/yolean/src/test/java/com/yahoo/yolean/trace/TraceNodeTestCase.java
@@ -17,7 +17,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 TraceNodeTestCase {