summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-06-17 08:58:12 +0200
committerGitHub <noreply@github.com>2016-06-17 08:58:12 +0200
commit0e337c833d1ba15ee7d387d1658d3cdfc4f77dad (patch)
treefd2990222e19d356f3d8685fc1c8cf6a1ab2c794
parent072535a8715b320cdfaf54105852939e008a9e0d (diff)
parent78310b0b78d18d0424d051c4bd8e95631ddfb0fe (diff)
Merge pull request #40 from yahoo/balder/mailto-balder-2-user-baldersheim
Balder/mailto balder 2 user baldersheim
-rw-r--r--config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java2
-rw-r--r--config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java2
-rw-r--r--config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java2
-rw-r--r--config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java2
-rw-r--r--config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java2
-rw-r--r--config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/content/Content.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java6
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/Coverage.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java2
-rw-r--r--container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java2
-rw-r--r--container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java4
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java6
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java6
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java6
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java4
-rw-r--r--container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/result/Coverage.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java3
-rw-r--r--container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java2
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java2
-rw-r--r--document/OWNERS2
-rw-r--r--document/src/main/java/com/yahoo/document/DocumentRemove.java2
-rw-r--r--document/src/main/java/com/yahoo/document/annotation/Span.java2
-rw-r--r--document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java2
-rw-r--r--document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java2
-rw-r--r--document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java2
-rw-r--r--document/src/main/java/com/yahoo/document/select/simple/Parser.java2
-rw-r--r--document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java2
-rw-r--r--document/src/main/java/com/yahoo/document/select/simple/StringParser.java2
-rw-r--r--document/src/main/java/com/yahoo/document/serialization/DocumentReader.java2
-rw-r--r--document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java2
-rw-r--r--document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java2
-rw-r--r--document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java2
-rw-r--r--document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java2
-rw-r--r--document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java2
-rw-r--r--document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java2
-rw-r--r--fastlib/OWNERS2
-rw-r--r--fastos/OWNERS2
-rw-r--r--fbench/OWNERS2
-rw-r--r--fnet/OWNERS2
-rw-r--r--juniper/OWNERS2
-rw-r--r--messagebus/OWNERS2
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java2
-rw-r--r--processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java2
-rw-r--r--searchcommon/OWNERS2
-rw-r--r--searchcore/OWNERS2
-rw-r--r--searchcore/src/vespa/searchcore/common/OWNERS2
-rw-r--r--searchcore/src/vespa/searchcore/fdispatch/OWNERS2
-rw-r--r--searchcore/src/vespa/searchcore/grouping/OWNERS2
-rw-r--r--searchcore/src/vespa/searchcore/proton/flushengine/OWNERS2
-rw-r--r--searchcore/src/vespa/searchcore/util/OWNERS2
-rw-r--r--searchcorespi/OWNERS2
-rw-r--r--searchlib/OWNERS2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java2
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java2
-rw-r--r--[-rwxr-xr-x]searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java2
-rw-r--r--[-rwxr-xr-x]searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java2
-rw-r--r--searchlib/src/vespa/searchlib/aggregation/OWNERS2
-rw-r--r--searchlib/src/vespa/searchlib/attribute/OWNERS2
-rw-r--r--searchlib/src/vespa/searchlib/docstore/OWNERS2
-rw-r--r--searchlib/src/vespa/searchlib/expression/OWNERS2
-rw-r--r--searchlib/src/vespa/searchlib/grouping/OWNERS2
-rw-r--r--searchlib/src/vespa/searchlib/parsequery/OWNERS2
-rw-r--r--searchlib/src/vespa/searchlib/query/OWNERS2
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/OWNERS2
-rw-r--r--searchsummary/OWNERS2
-rw-r--r--staging_vespalib/OWNERS2
-rw-r--r--streamingvisitors/OWNERS2
-rw-r--r--vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java2
-rw-r--r--vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java2
-rw-r--r--vespajlib/developernotes/Utf8MicroBencmark.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/ArraySet.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java6
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/MethodCache.java6
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java4
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java6
-rw-r--r--vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/java7compat/Util.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java6
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java6
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/GenericWriter.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/Identifier.java6
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java6
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/Utf8.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/Utf8Array.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/Utf8String.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/XMLWriter.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java4
-rw-r--r--vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java6
-rw-r--r--vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java2
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java6
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java6
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java6
-rw-r--r--vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java6
-rw-r--r--vespalib/OWNERS2
-rw-r--r--vespamalloc/OWNERS2
-rw-r--r--vsm/OWNERS2
-rw-r--r--yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java2
-rw-r--r--yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java2
250 files changed, 258 insertions, 315 deletions
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java
index 822ddcd0da7..9c507d7be05 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java
@@ -6,7 +6,7 @@ import com.yahoo.document.DataType;
import java.util.Collection;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public interface DataTypeCollection {
public DataType getDataType(String name);
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
index 6d332ba16fb..73f8d7f91c5 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
@@ -8,7 +8,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class DataTypeRepo implements DataTypeCollection {
Map<Integer, DataType> typeById = new LinkedHashMap<>();
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java
index 6c71410c048..d71fc2d0541 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java
@@ -4,7 +4,7 @@ package com.yahoo.documentmodel;
import java.util.Collection;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public interface DocumentTypeCollection {
public NewDocumentType getDocumentType(NewDocumentType.Name name);
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
index 3585a12ac2f..b71a400666a 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
@@ -6,7 +6,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class DocumentTypeRepo implements DocumentTypeCollection {
final Map<Integer, NewDocumentType> typeById = new LinkedHashMap<>();
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
index 51171e97704..ccf9bdec302 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
@@ -15,7 +15,7 @@ import java.util.*;
/**
* TODO: What is this and why?
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public final class NewDocumentType extends StructuredDataType implements DataTypeCollection {
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java
index bf8ec8d3da7..793a5fcff6c 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java
@@ -10,7 +10,7 @@ import com.yahoo.document.PositionDataType;
* Remember that changes here must be compatible. Changes to types of fields can not be done here.
* This must also match the mirroring class in c++.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class VespaDocumentType {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
index 4fd7048159e..036e2058f75 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
@@ -20,7 +20,7 @@ import com.yahoo.vespa.documentmodel.SearchField;
import java.util.*;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class DocumentModelBuilder {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java
index 040a798d3b3..a92b27d5cd8 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java
@@ -8,7 +8,7 @@ import java.util.TreeSet;
/**
* Searchable collection of fields.
*
- * @author balder
+ * @author baldersheim
*/
public class FieldSet {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java
index a0511dec4b0..8c238c104fe 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java
@@ -7,7 +7,7 @@ import java.io.Serializable;
* A search-time document attribute sort specification(per-document in-memory value).
* This belongs to the attribute or field(implicitt attribute).
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public final class Sorting implements Cloneable, Serializable {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java
index 193ec75acd0..c188df17c9d 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java
@@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.document;
import com.yahoo.document.DataTypeName;
/**
- * @author balder
+ * @author baldersheim
*/
public class TemporarySDDocumentType extends SDDocumentType {
public TemporarySDDocumentType(DataTypeName name) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java
index 49701f3e443..bfc5b7b4ebe 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java
@@ -9,7 +9,7 @@ import com.yahoo.searchdefinition.document.Attribute;
import com.yahoo.vespa.model.container.search.QueryProfiles;
/**
- * Created by balder on 3/10/15.
+ * @author baldersheim
*/
public class DiversitySettingsValidator extends Processor {
public DiversitySettingsValidator(Search search, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java
index 3148273ddc1..46e9d471484 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexTo2FieldSet.java
@@ -8,7 +8,7 @@ import com.yahoo.searchdefinition.Search;
import com.yahoo.vespa.model.container.search.QueryProfiles;
/**
- * @author balder
+ * @author baldersheim
*/
public class IndexTo2FieldSet extends Processor {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java
index a29896ce3e8..24ef60b6bb3 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java
@@ -21,7 +21,7 @@ import java.util.Set;
/**
* Replaces the 'index' statement of all numerical fields to 'attribute' because we no longer support numerical indexes.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class IntegerIndex2Attribute extends Processor {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java
index 0d76ada0d52..06207f5ed6e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles;
/**
* Verifies that the source fields actually refers to a valid field.
*
- * @author balder
+ * @author baldersheim
*
*/
public class SummaryFieldsMustHaveValidSource extends Processor {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
index 8f9b88b0268..b7c98bec964 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
@@ -13,7 +13,7 @@ import java.util.Arrays;
import java.util.List;
/**
- * @author balder
+ * @author baldersheim
*/
public class UriHack extends Processor {
private static final List<String> URL_SUFFIX =
diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
index 29c0c4e8136..3cdcf55b34e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java
@@ -16,7 +16,7 @@ import java.util.HashSet;
import java.util.Set;
/**
- * @author balder
+ * @author baldersheim
* @since 2010-02-19
*/
public class DocumentManager {
diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
index 92b3c13d383..2ba34def464 100644
--- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
+++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java
@@ -14,7 +14,7 @@ import com.yahoo.vespa.documentmodel.DocumentModel;
import java.util.*;
/**
- * @author balder
+ * @author baldersheim
*/
public class DocumentTypes {
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java
index 6c8206d30f2..b0f75df5b74 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java
@@ -9,7 +9,7 @@ import com.yahoo.documentmodel.DocumentTypeRepo;
* It contains a search manager managing all specified search definitions.
* It contains a storage manager managing all specified storage definitions.
*
- * @author balder
+ * @author baldersheim
* @since 2010-02-19
*/
public class DocumentModel {
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java
index dfb44aef917..d36e43bc691 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/FieldView.java
@@ -9,7 +9,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- * @author balder
+ * @author baldersheim
* @since 2010-02-19
*/
public class FieldView implements Serializable {
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java
index 07b7c973841..dc1bd99d1d9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.logging.Logger;
/**
- * @author balder
+ * @author baldersheim
* @since 2010-02-19
*/
public class SearchDef {
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java
index 2db81861955..9a0e3064682 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchField.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * @author balder
+ * @author baldersheim
* @since 2010-02-19
*/
public class SearchField extends Field {
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java
index 29a960f7e7b..dd8c9d227b6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchManager.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.documentmodel;
import java.util.TreeMap;
/**
- * @author balder
+ * @author baldersheim
* @since 2010-02-19
*/
public class SearchManager {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java
index 930e7105c2f..aecd0f9efb5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilder.java
@@ -15,7 +15,7 @@ import java.util.Collections;
import java.util.List;
/**
- * @author balder
+ * @author baldersheim
*/
public class DomContentBuilder extends ConfigModelBuilder<Content> {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
index b9fe10e4873..4bb0144ed0c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
@@ -37,7 +37,7 @@ import java.util.logging.Logger;
* The config model from a content tag in services.
* This consists mostly of a ContentCluster.
*
- * @author balder
+ * @author baldersheim
*/
public class Content extends ConfigModel {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
index d665df3d53c..e425c2decf9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
@@ -5,11 +5,7 @@ import com.yahoo.vespa.model.content.StorageNode;
import com.yahoo.vespa.model.search.SearchNode;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 20.11.12
- * Time: 20:04
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class ProtonProvider extends RPCEngine {
public ProtonProvider(StorageNode parent, SearchNode searchNode) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java
index e9d01f50fb6..2d113a241c9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java
@@ -10,7 +10,7 @@ import java.util.*;
*
* Each @link{Dispatch} has a reference to an instance of this class and use it when producing config.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class DispatchGroup {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java
index 88ebef9da86..75833805bac 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedElasticSearchCluster.java
@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.Collections;
/**
- * @author balder
+ * @author baldersheim
*/
public class IndexedElasticSearchCluster extends IndexedSearchCluster {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
index aa664264ba6..99e08f15007 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
@@ -28,7 +28,7 @@ import java.util.*;
import java.util.logging.Logger;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public abstract class IndexedSearchCluster extends SearchCluster
implements
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
index 2d89eb59b58..a679c2dd5fd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
@@ -17,7 +17,7 @@ import java.util.List;
/**
* A search cluster of type streaming.
*
- * @author balder
+ * @author baldersheim
* @author vegardh
*/
public class StreamingSearchCluster extends SearchCluster implements
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java
index 6aebe765bc4..927a2955bb6 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java
@@ -10,7 +10,7 @@ import static org.junit.Assert.fail;
import static org.junit.Assert.assertEquals;
/**
- * Created by balder on 3/10/15.
+ * @author baldersheim
*/
public class DiversityTestCase {
@Test
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java
index 15aa8e63220..fecba418e7f 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java
@@ -9,7 +9,7 @@ import java.io.IOException;
/**
* Tests sort settings
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class SortingTestCase extends AbstractExportingTestCase {
@Test
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java
index 0b401866932..36a325b42eb 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java
@@ -16,7 +16,7 @@ import java.io.IOException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class IntegerIndex2AttributeTestCase extends SearchDefinitionTestCase {
@Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java
index 60d9fce767e..e1fbcecdf49 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomContentBuilderTest.java
@@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.*;
/**
- * @author balder
+ * @author baldersheim
*/
public class DomContentBuilderTest extends DomBuilderTest {
private ContentCluster createContent(String xml) throws Exception {
diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
index 351af7f2563..fd3c8ed4c49 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
@@ -6,7 +6,7 @@ package com.yahoo.container.handler;
* The coverage report for a result set.
*
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author balder
+ * @author baldersheim
*/
public class Coverage {
diff --git a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
index 51e1c0c1d53..474c2f1a4a2 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
@@ -23,7 +23,7 @@ import com.yahoo.jdisc.Metric;
* Request an Executor injected in your component constructor if you want to use it.
*
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author bratseth
*/
public class ThreadPoolProvider extends AbstractComponent implements Provider<Executor> {
diff --git a/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java b/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java
index e89d98941be..4f5f27dd7d6 100644
--- a/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java
+++ b/container-di/benchmarks/src/test/java/com/yahoo/component/ComponentIdBenchmark.java
@@ -2,7 +2,7 @@
package com.yahoo.component;
/**
- * @author balder
+ * @author baldersheim
*/
public class ComponentIdBenchmark {
public void run() {
diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java b/container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java
index 5a42d26901f..d26bb91236b 100644
--- a/container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java
+++ b/container-search/src/main/java/com/yahoo/fs4/mplex/ListenerPool.java
@@ -13,7 +13,7 @@ import java.util.logging.Logger;
* Pool of com.yahoo.io.Listener instances for shared use by Vespa backend
* searchers.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.3.0
*/
public final class ListenerPool {
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java
index 1aa226dbeb8..f479bed14bd 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
/**
* Provider for {@link com.yahoo.fs4.mplex.ListenerPool}. All users will get the same pool instance.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.4.0
*/
public class FS4ResourcePool extends AbstractComponent {
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
index 820c764de06..e589f85cc96 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
@@ -48,7 +48,7 @@ import java.util.logging.Level;
/**
* Superclass for backend searchers.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
@SuppressWarnings("deprecation")
public abstract class VespaBackEndSearcher extends PingableSearcher {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java b/container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java
index 3972d2b808e..151684ccf96 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/ExactstringItem.java
@@ -2,9 +2,9 @@
package com.yahoo.prelude.query;
/**
- * @author balder
+ * @author baldersheim
*/
-// TODO: balder to fix javadoc
+// TODO: baldersheim to fix javadoc
public class ExactstringItem extends WordItem {
public ExactstringItem(String substring) {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java
index 9a78d4c8765..275f4871f33 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedInteger.java
@@ -4,11 +4,7 @@ package com.yahoo.prelude.query;
import java.nio.ByteBuffer;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 07.12.12
- * Time: 13:42
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
// TODO: Fix javadoc
public class PureWeightedInteger extends PureWeightedItem {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java
index 16f38159235..255c2911f0c 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedItem.java
@@ -4,11 +4,7 @@ package com.yahoo.prelude.query;
import java.nio.ByteBuffer;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 07.12.12
- * Time: 13:24
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
// TODO: Fix javadoc
public abstract class PureWeightedItem extends Item {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java
index 368ccd25483..814626d2294 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/PureWeightedString.java
@@ -4,11 +4,7 @@ package com.yahoo.prelude.query;
import java.nio.ByteBuffer;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 07.12.12
- * Time: 13:15
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
// TODO: Fix javadoc
public class PureWeightedString extends PureWeightedItem {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java
index 4db8ff0b47a..5597724a8b5 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java
@@ -9,7 +9,7 @@ package com.yahoo.prelude.query;
* its way towards 'to' until it has reached its limit or range is exhausted. Negative number means that it will start
* from 'to' and work its way towards 'from'.
*
- * @author balder
+ * @author baldersheim
* @author bratseth
* @since 5.1.23
*/
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
index fe680bd5ad0..84689c5adf2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
@@ -17,7 +17,7 @@ import com.yahoo.search.query.Model;
import com.yahoo.search.result.Hit;
/**
- * @author balder
+ * @author baldersheim
*/
public class QueryRewrite {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java
index 637e0fdf57e..4e2a57535e6 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathACosFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java
index aa5677d90d4..76afb556dad 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathACosHFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathACosHFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java
index c4b9c7a62d6..bf49fbaeb62 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathASinFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java
index f368aefe88a..a50d50afb2f 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathASinHFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathASinHFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java
index ed9349c86e6..7422dc5b587 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathATanFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java
index ebcfd1895fa..854b24d3360 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathATanHFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathATanHFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java
index 78e2c3c9aa5..cb98a8deb41 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCbrtFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathCbrtFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java
index 0ab35653607..6235755f9bb 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathCosFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java
index f4137c302e8..fefc58a50bf 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathCosHFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathCosHFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
index 4be93d77c41..c9c38969fe5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathExpFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathExpFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java
index 5fe5a971be9..fd88fb9a822 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathFunctions.java
@@ -2,7 +2,7 @@
package com.yahoo.search.grouping.request;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public abstract class MathFunctions {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java
index 777a94f9107..4254f6cb1aa 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathHypotFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathHypotFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java
index 444ea7a7349..750b1191cff 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog10Function.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathLog10Function extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java
index 3be6c799bf2..61ed2f4d52a 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLog1pFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathLog1pFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java
index 4d3b43d45b0..dc2007eac00 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathLogFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathLogFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java
index 09a9a28cbb0..18cfc879829 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathPowFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathPowFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java
index 66612e9d80a..51bdd2ad725 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathSinFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java
index 79d260f51a0..220d5865dcb 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSinHFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathSinHFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java
index 18c9396dd12..9eea61c7479 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathSqrtFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathSqrtFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java
index 67db7a9d834..98fcb986a59 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathTanFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java
index e111c1199d7..aaee8a6bce5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathTanHFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author balder
+ * @author baldersheim
*/
public class MathTanHFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java
index 274bb20c9f7..b92808dc895 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ReverseFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a reverse-function in a {@link GroupingExpression}. It evaluates to a list that equals the list
* result of the argument, sorted in descending order.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ReverseFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java
index 2a8845f9847..33d79ab8795 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SortFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a sort-function in a {@link GroupingExpression}. It evaluates to a list that equals the list
* result of the argument, sorted in ascending order.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class SortFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java
index 8eab2af8691..1faac228242 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToDoubleFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a todouble-function in a {@link GroupingExpression}. It converts the result of the argument to
* a double. If the argument can not be converted, this function returns 0.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ToDoubleFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java
index c47a043eea0..1fe84e3ac0d 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToLongFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a tolong-function in a {@link GroupingExpression}. It converts the result of the argument to a
* long. If the argument can not be converted, this function returns 0.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ToLongFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java
index 364d9e5064d..5ad2cca3591 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ToStringFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a tolong-function in a {@link GroupingExpression}. It converts the result of the argument to a
* long. If the argument can not be converted, this function returns 0.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ToStringFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java
index b4790b912e7..6b9db922bd4 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveXFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ZCurveXFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
index e9a011f2193..e6220d96a42 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ZCurveYFunction.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
import java.util.Arrays;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ZCurveYFunction extends FunctionNode {
/**
diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java b/container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java
index b1865ad9d75..8f61c15e4fa 100644
--- a/container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java
+++ b/container-search/src/main/java/com/yahoo/search/query/ranking/Diversity.java
@@ -15,7 +15,7 @@ import java.util.Objects;
*
* <p>You specify an additional attribute to be the diversifier and also min diversity needed.</p>
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class Diversity implements Cloneable {
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java
index 4b68ecfe5a9..98b0b1673f6 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ExactStringConverter.java
@@ -4,9 +4,9 @@ package com.yahoo.search.query.textserialize.item;
import com.yahoo.prelude.query.ExactstringItem;
/**
- * @author balder
+ * @author baldersheim
*/
-// TODO: balder to fix javadoc
+// TODO: baldersheim to fix javadoc
public class ExactStringConverter extends WordConverter {
@Override
ExactstringItem newTermItem(String word) {
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java
index c2d462a17e4..8e95273e300 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java
@@ -18,7 +18,7 @@ import java.util.Set;
/**
* If default position has not been set, it will be set here.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
@After({PhaseNames.RAW_QUERY, POSITION_PARSING})
@Before(PhaseNames.TRANSFORMED_QUERY)
diff --git a/container-search/src/main/java/com/yahoo/search/result/Coverage.java b/container-search/src/main/java/com/yahoo/search/result/Coverage.java
index 7d1e737bfb8..bf34c42b97a 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Coverage.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Coverage.java
@@ -5,7 +5,7 @@ package com.yahoo.search.result;
* The coverage report for a result set.
*
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author balder
+ * @author baldersheim
*/
public class Coverage extends com.yahoo.container.handler.Coverage {
diff --git a/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java b/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java
index ff00c8edb9b..b6f8231da9d 100644
--- a/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/searchers/ValidateMatchPhaseSearcher.java
@@ -15,7 +15,8 @@ import java.util.Set;
/**
* Validates that the attribute given as match-phase override is actually a valid numeric attribute
* with fast-search enabled.
- * Created by balder on 1/21/15.
+ *
+ * @author baldersheim
*/
public class ValidateMatchPhaseSearcher extends Searcher {
private Set<String> validMatchPhaseAttributes = new HashSet<>();
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
index b95a4269cf7..3917d353630 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
@@ -38,7 +38,7 @@ import com.yahoo.vdslib.SearchResult;
* The searcher is a visitor client responsible for starting search
* visitors in storage and collecting and merging the results.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:ulf@yahoo-inc.com">Ulf Carlin</a>
*/
@SuppressWarnings("deprecation")
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
index 58b46662e8b..309b606880c 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- * @author balder
+ * @author baldersheim
*/
public class QueryRewriteTestCase {
diff --git a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
index e7a0c78aa88..b87d4d02b9b 100644
--- a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
- * @author balder
+ * @author baldersheim
*/
public class SortingTestCase {
@Test
diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java
index 4f7654ba3c0..6453c3928de 100644
--- a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java
@@ -21,7 +21,7 @@ import java.util.List;
import static org.junit.Assert.*;
/**
- * @author balder
+ * @author baldersheim
*/
public class ValidateMatchPhaseSearcherTestCase {
diff --git a/document/OWNERS b/document/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/document/OWNERS
+++ b/document/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/document/src/main/java/com/yahoo/document/DocumentRemove.java b/document/src/main/java/com/yahoo/document/DocumentRemove.java
index 8d4f37d5583..aa0ffbc000a 100644
--- a/document/src/main/java/com/yahoo/document/DocumentRemove.java
+++ b/document/src/main/java/com/yahoo/document/DocumentRemove.java
@@ -2,7 +2,7 @@
package com.yahoo.document;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class DocumentRemove extends DocumentOperation {
diff --git a/document/src/main/java/com/yahoo/document/annotation/Span.java b/document/src/main/java/com/yahoo/document/annotation/Span.java
index 87bd568b94a..a6132078c54 100644
--- a/document/src/main/java/com/yahoo/document/annotation/Span.java
+++ b/document/src/main/java/com/yahoo/document/annotation/Span.java
@@ -10,7 +10,7 @@ import java.util.NoSuchElementException;
* This class represents a range of characters from a string.&nbsp;This is the leaf node
* in a Span tree. Its boundaries are defined as inclusive-from and exclusive-to.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
*/
public class Span extends SpanNode {
diff --git a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
index b444c2d5ac2..79411894664 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
@@ -4,7 +4,7 @@ package com.yahoo.document.select.simple;
import com.yahoo.document.select.rule.IdNode;
/**
- * @author balder
+ * @author baldersheim
*/
public class IdSpecParser extends Parser {
private IdNode id;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
index 52a0b0a2c4f..3d0ae1ae2a8 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
@@ -4,7 +4,7 @@ package com.yahoo.document.select.simple;
import com.yahoo.document.select.rule.LiteralNode;
/**
- * @author balder
+ * @author baldersheim
*/
public class IntegerParser extends Parser {
private LiteralNode value;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
index 58da1e0c179..a1ddee75ff2 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
@@ -2,7 +2,7 @@
package com.yahoo.document.select.simple;
/**
- * @author balder
+ * @author baldersheim
*/
public class OperatorParser extends Parser {
private String operator;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/Parser.java b/document/src/main/java/com/yahoo/document/select/simple/Parser.java
index 169f100de83..fa2e5d2910b 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/Parser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/Parser.java
@@ -2,7 +2,7 @@
package com.yahoo.document.select.simple;
/**
- * @author balder
+ * @author baldersheim
*/
public abstract class Parser {
public abstract boolean parse(CharSequence s);
diff --git a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
index df3507e67c8..dd76202cfb2 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
@@ -5,7 +5,7 @@ import com.yahoo.document.select.rule.ComparisonNode;
import com.yahoo.document.select.rule.ExpressionNode;
/**
- * @author balder
+ * @author baldersheim
*/
public class SelectionParser extends Parser {
private ExpressionNode node;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
index e18c2dad8e2..42047a63e5a 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
@@ -4,7 +4,7 @@ package com.yahoo.document.select.simple;
import com.yahoo.document.select.rule.LiteralNode;
/**
- * @author balder
+ * @author baldersheim
*/
public class StringParser extends Parser {
private LiteralNode value;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
index 8a5e889eb8c..52a62caf296 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
@@ -10,7 +10,7 @@ import com.yahoo.document.DocumentTypeManager;
* This interface is used to implement custom deserialization of document updates.
*
* @author <a href="mailto:ravishar@yahoo-inc.com">Ravi Sharma</a>
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public interface DocumentReader {
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
index c3e51b2602a..49e61f64e3d 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
@@ -76,7 +76,7 @@ import static com.yahoo.text.Utf8.calculateStringPositions;
* Class used for de-serializing documents on the Vespa 4.2 document format.
*
* @deprecated Please use {@link com.yahoo.document.serialization.VespaDocumentDeserializerHead} instead for new code.
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
@Deprecated // OK: Don't remove on Vespa 6: Mail may have documents on this format still
// When removing: Move content of this class into VespaDocumentDeserializerHead (and subclass VespaDocumentSerializerHead in that)
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
index 927075a25b5..83dc9df2826 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
@@ -12,7 +12,7 @@ import com.yahoo.io.GrowableByteBuffer;
/**
* Class used for de-serializing documents on the current head document format.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class VespaDocumentDeserializerHead extends VespaDocumentDeserializer42 {
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
index 64aea73d000..a3f1b0a74d4 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
@@ -22,7 +22,7 @@ import static com.yahoo.text.Utf8.calculateBytePositions;
* Class used for serializing documents on the Vespa 4.2 document format.
*
* @deprecated Please use {@link com.yahoo.document.serialization.VespaDocumentSerializerHead} instead for new code.
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
@Deprecated // OK: Don't remove on Vespa 6: Mail may have documents on this format still
// When removing: Move content into VespaDocumentSerializerHead
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
index 7f4c1960122..df15c9fda0b 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
@@ -11,7 +11,7 @@ import com.yahoo.io.GrowableByteBuffer;
/**
* Class used for serializing documents on the current head document format.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class VespaDocumentSerializerHead extends VespaDocumentSerializer42 {
diff --git a/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java
index c7f88ac64e9..5a63453564d 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java
@@ -5,7 +5,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * Created by balder on 8/6/15.
+ * @author baldersheim
*/
public class NumericFieldValueTestCase {
@Test
diff --git a/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java
index 2c76d5ec547..a02446eee76 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java
@@ -8,7 +8,7 @@ import java.nio.ByteBuffer;
import static org.junit.Assert.*;
/**
- * Created by balder on 10/21/14.
+ * @author baldersheim
*/
public class RawTestCase {
@Test
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java
index c72994a9fc7..ad07b6a9d70 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java
@@ -11,7 +11,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class MessageTypePolicy implements DocumentProtocolRoutingPolicy, ConfigSubscriber.SingleSubscriber<MessagetyperouteselectorpolicyConfig> {
diff --git a/fastlib/OWNERS b/fastlib/OWNERS
index f6fda8f0404..9e842aedad9 100644
--- a/fastlib/OWNERS
+++ b/fastlib/OWNERS
@@ -1,3 +1,3 @@
havardpe
tegge
-balder
+baldersheim
diff --git a/fastos/OWNERS b/fastos/OWNERS
index c6b7fc4c94f..912f61c59b8 100644
--- a/fastos/OWNERS
+++ b/fastos/OWNERS
@@ -1,2 +1,2 @@
-balder
+baldersheim
arnej27959
diff --git a/fbench/OWNERS b/fbench/OWNERS
index 0aa3eee0364..fc41da17545 100644
--- a/fbench/OWNERS
+++ b/fbench/OWNERS
@@ -1,2 +1,2 @@
havardpe
-balder
+baldersheim
diff --git a/fnet/OWNERS b/fnet/OWNERS
index 0aa3eee0364..fc41da17545 100644
--- a/fnet/OWNERS
+++ b/fnet/OWNERS
@@ -1,2 +1,2 @@
havardpe
-balder
+baldersheim
diff --git a/juniper/OWNERS b/juniper/OWNERS
index 9673ef97e16..6aeaba5f2a8 100644
--- a/juniper/OWNERS
+++ b/juniper/OWNERS
@@ -1,2 +1,2 @@
geirst
-balder
+baldersheim
diff --git a/messagebus/OWNERS b/messagebus/OWNERS
index 631c3b2dd30..b9557349aa2 100644
--- a/messagebus/OWNERS
+++ b/messagebus/OWNERS
@@ -1,2 +1,2 @@
dybdahl
-balder
+baldersheim
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java
index a9f2ed8de3c..2fc523542e3 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java
@@ -4,7 +4,7 @@ package com.yahoo.messagebus.routing;
/**
* This replaces the incredibly slow javacc RouteParser.jj. It is a has its c++ sibling and
* the implementation is a a copy of the C++ version.
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java b/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java
index 6c512c82903..680f67f56c1 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java
+++ b/processing/src/test/java/com/yahoo/processing/request/test/CompoundNameBenchmark.java
@@ -4,7 +4,7 @@ package com.yahoo.processing.request.test;
import com.yahoo.processing.request.CompoundName;
/**
- * @author balder
+ * @author baldersheim
*/
public class CompoundNameBenchmark {
public void run() {
diff --git a/searchcommon/OWNERS b/searchcommon/OWNERS
index 6b6bfc6e2ac..593ba19b1e6 100644
--- a/searchcommon/OWNERS
+++ b/searchcommon/OWNERS
@@ -1,3 +1,3 @@
geirst
-balder
+baldersheim
tegge
diff --git a/searchcore/OWNERS b/searchcore/OWNERS
index 22a8fdfdfa6..0775e8692a2 100644
--- a/searchcore/OWNERS
+++ b/searchcore/OWNERS
@@ -1,5 +1,5 @@
geirst
tegge
-balder
+baldersheim
havardpe
yngve
diff --git a/searchcore/src/vespa/searchcore/common/OWNERS b/searchcore/src/vespa/searchcore/common/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchcore/src/vespa/searchcore/common/OWNERS
+++ b/searchcore/src/vespa/searchcore/common/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchcore/src/vespa/searchcore/fdispatch/OWNERS b/searchcore/src/vespa/searchcore/fdispatch/OWNERS
index 3e9fc8ab356..d14485102db 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/OWNERS
+++ b/searchcore/src/vespa/searchcore/fdispatch/OWNERS
@@ -1,2 +1,2 @@
-balder
+baldersheim
tegge
diff --git a/searchcore/src/vespa/searchcore/grouping/OWNERS b/searchcore/src/vespa/searchcore/grouping/OWNERS
index 9bbc3a73836..a59a5ddcdbf 100644
--- a/searchcore/src/vespa/searchcore/grouping/OWNERS
+++ b/searchcore/src/vespa/searchcore/grouping/OWNERS
@@ -1,2 +1,2 @@
-balder
+baldersheim
havardpe
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/OWNERS b/searchcore/src/vespa/searchcore/proton/flushengine/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/OWNERS
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchcore/src/vespa/searchcore/util/OWNERS b/searchcore/src/vespa/searchcore/util/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchcore/src/vespa/searchcore/util/OWNERS
+++ b/searchcore/src/vespa/searchcore/util/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchcorespi/OWNERS b/searchcorespi/OWNERS
index 7066165775a..fda83fc8cf8 100644
--- a/searchcorespi/OWNERS
+++ b/searchcorespi/OWNERS
@@ -1,3 +1,3 @@
tegge
geirst
-balder
+baldersheim
diff --git a/searchlib/OWNERS b/searchlib/OWNERS
index 9289349b7db..2b546321fd4 100644
--- a/searchlib/OWNERS
+++ b/searchlib/OWNERS
@@ -1,4 +1,4 @@
havardpe
-balder
+baldersheim
tegge
geirst
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java
index b877a88fc8d..d059c270fa5 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* <p>This is the aggregation super-class from which all types of aggregation inherits.</p>
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class AggregationResult extends ExpressionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java
index 651ab192786..f961829b081 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java
@@ -11,7 +11,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This is an aggregated result holding the average of all results.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class AverageAggregationResult extends AggregationResult {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java
index 5f90c126115..c35c8905c1d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This is an aggregated result holding the number of aggregated hits.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class CountAggregationResult extends AggregationResult {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java
index 6d5d95bbcc0..c9e29c86f66 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java
@@ -15,7 +15,7 @@ import java.util.List;
* This is an aggregated result holding the top n hits for a single group.
*
* @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a>
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class HitsAggregationResult extends AggregationResult {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java
index dba44dcf023..ce51f7ee19f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This is an aggregated result holding the maximum result of the matching hits.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class MaxAggregationResult extends AggregationResult {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java
index ca8c71e6ede..68866769a2c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This is an aggregated result holding the minimum result of the matching hits.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class MinAggregationResult extends AggregationResult {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java
index 88e61d98ba0..0e882fb725e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This is an aggregated result holding the sum of the aggregating expression for all matching hits.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class SumAggregationResult extends AggregationResult {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java
index ee171be0c4b..d04374bbe7e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This is an aggregated result holding the xor of the aggregating expression for all matching hits.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class XorAggregationResult extends AggregationResult {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java
index a56215a6991..ef4ea8c1fb0 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to add all arguments.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class AddFunctionNode extends NumericFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java
index d16058afde2..18c20785251 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AggregationRefNode.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer;
* This node holds the index of an ExpressionNode in an external array, and is used as a proxy in the back-end to allow
* aggregators to be used in expressions.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Ulf Lilleengen</a>
+ * @author baldersheim
*/
public class AggregationRefNode extends ExpressionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java
index f54b8fba9ea..61db5371933 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to perform bitwise AND on the result of all arguments in order.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class AndFunctionNode extends BitFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java
index e58bf1e317d..c2bbef357de 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This function is an instruction to retrieve the value of a named attribute.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class AttributeNode extends FunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java
index 830b74bbb5f..e870344b3ac 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/BitFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This is an abstract super-class for all non-unary functions that operator on bit values.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class BitFunctionNode extends NumericFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java
index 0dc7f49a826..f17259f4f58 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/BucketResultNode.java
@@ -5,7 +5,7 @@ package com.yahoo.searchlib.expression;
* This is the superclass of all bucket values
*
* @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a>
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
abstract public class BucketResultNode extends ResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java
index 98c3ba0580e..c84c345a57b 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to concatenate the bits of all arguments in order.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class CatFunctionNode extends MultiArgFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java
index 2ba6ee6e1c3..af5ec5c552d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ConstantNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This abstract expression node represents a function to execute.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class ConstantNode extends ExpressionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java
index 2a99e9f1edb..c7ff00a9e78 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to divide the arguments in order.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class DivideFunctionNode extends NumericFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java
index dabbf8d622b..581a70a3f82 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentAccessorNode.java
@@ -5,7 +5,7 @@ package com.yahoo.searchlib.expression;
* This abstract expression node represents a document whose content is accessed depending on the subclass
* implementation of this.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class DocumentAccessorNode extends ExpressionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java
index c33ef6cd7fd..aa9adc8203d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* The node is a request to retrieve the content of a document field.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class DocumentFieldNode extends DocumentAccessorNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java
index 07aa4c8d580..62b6b9ebac9 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ExpressionNode.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
* This is the base class for all expression node types. There is no execution logic implemented in Java, since that all
* happens in the C++ backend. This class hierarchy is for <b>building</b> the expression tree to pass to the backend.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class ExpressionNode extends Identifiable implements Serializable {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java
index 9d6d83ccc5c..c5ae141cd26 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class FloatBucketResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java
index 6e44f113eed..5e94f9880a1 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java
@@ -10,7 +10,7 @@ import java.nio.ByteBuffer;
/**
* This result holds a float value.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class FloatResultNode extends NumericResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java
index ae57aeb6a7f..ad2130eba24 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class FloatResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java
index 13f7f8e11a2..5cee2df245b 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FunctionNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This abstract expression node represents a function to execute.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class FunctionNode extends ExpressionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java
index 1308e668d3b..483443ed4dc 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* The node is a request to retrieve the namespace-specific content of a document id.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class GetDocIdNamespaceSpecificFunctionNode extends DocumentAccessorNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java
index 89b1f477706..3714460846f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetYMUMChecksumFunctionNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This node is a request to retrieve the YMUM checksum of a document.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class GetYMUMChecksumFunctionNode extends DocumentAccessorNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
index 53455fe26ec..4a636bb8a3f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
@@ -10,7 +10,7 @@ import java.nio.ByteBuffer;
/**
* This result holds an integer value.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class Int16ResultNode extends NumericResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java
index 7e67f80b5e0..a3439b820fc 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class Int16ResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java
index e2acb243714..0316ee2d9c3 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java
@@ -10,7 +10,7 @@ import java.nio.ByteBuffer;
/**
* This result holds an integer value.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class Int32ResultNode extends NumericResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java
index f9166ac63da..90849fcb46c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class Int32ResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
index dedb2f3ddbc..0bbc3414c2e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
@@ -10,7 +10,7 @@ import java.nio.ByteBuffer;
/**
* This result holds an integer value.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class Int8ResultNode extends NumericResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java
index da1edfc5a3a..ac1fad4125a 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class Int8ResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java
index 1ea639bd67f..a5caef9c77a 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class IntegerBucketResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java
index 4ca5dfc4139..6b9b46b922c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java
@@ -10,7 +10,7 @@ import java.nio.ByteBuffer;
/**
* This result holds an integer value.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class IntegerResultNode extends NumericResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java
index ac55a4e7d8b..20454bb8198 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class IntegerResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java
index 64c81072714..f7e85b974d5 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is a request to calculate the MD5 of the result of its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class MD5BitFunctionNode extends UnaryBitFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java
index 0d82b6a260e..2e8f5b81eb8 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This function is an instruction to negate its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class MathFunctionNode extends MultiArgFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java
index 8496f88eb1c..0ce18adeae8 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to return the maximum value of all its arguments.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class MaxFunctionNode extends NumericFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java
index f7c18077791..fe2e473a61c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to return the minimum value of all its arguments.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class MinFunctionNode extends NumericFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java
index a2c919b1d4d..94e1c98f974 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to modulo the arguments in order.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class ModuloFunctionNode extends NumericFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java
index 4f201e98bfb..1daef4f6419 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java
@@ -10,7 +10,7 @@ import java.util.List;
* <p>This is an abstract super-class for all functions that accepts multiple arguments. This node implements the
* necessary API for manipulating arguments.</p>
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class MultiArgFunctionNode extends FunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java
index b55e86ba5fe..a9848b8ccca 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to multiply all arguments.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class MultiplyFunctionNode extends NumericFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java
index 0fdf07d6291..ab967eda024 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to negate its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class NegateFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java
index dd24c1f9efe..25ea8c58b49 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to negate its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class NormalizeSubjectFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java
index bc66e0d1899..5b3a0673491 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java
@@ -6,7 +6,7 @@ import com.yahoo.vespa.objects.ObjectVisitor;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class NullResultNode extends ResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java
index f949dc67936..102c598402a 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to negate its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class NumElemFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java
index 70a5cdcaf98..d828895d3c5 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumericResultNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This is a superclass for all numerical results.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
abstract public class NumericResultNode extends SingleResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java
index 6f34f261543..215df07ec6a 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to perform bitwise OR on the result of all arguments.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class OrFunctionNode extends BitFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java
index a72d9d41318..699b5faf506 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java
@@ -2,7 +2,7 @@
package com.yahoo.searchlib.expression;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class PositiveInfinityResultNode extends ResultNode {
// The global class identifier shared with C++.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java
index eef386735a1..cab5221e9de 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java
@@ -6,7 +6,7 @@ import com.yahoo.vespa.objects.ObjectVisitor;
import com.yahoo.vespa.objects.Serializer;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class RawBucketResultNode extends BucketResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java
index caed1de4134..85212fa53f2 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java
@@ -7,7 +7,7 @@ import com.yahoo.vespa.objects.Serializer;
import java.util.ArrayList;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class RawBucketResultNodeVector extends ResultNodeVector {
// The global class identifier shared with C++.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java
index ad40fc5026f..2288f1c9289 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNode.java
@@ -11,7 +11,7 @@ import java.util.Arrays;
/**
* This result holds a byte array value.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class RawResultNode extends SingleResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java
index dc791b7ce69..9c18ff076b3 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class RawResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java
index 90077238925..02ad64d8b98 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This abstract expression node represents a function to execute.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class RelevanceNode extends ExpressionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java
index 7a31e1598f6..bd0fe0e4861 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNode.java
@@ -6,7 +6,7 @@ import com.yahoo.vespa.objects.Identifiable;
/**
* This abstract expression node represents the result value of execution.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class ResultNode extends Identifiable implements Comparable<ResultNode> {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java
index e6d2818e39d..26471327229 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ResultNodeVector.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class ResultNodeVector extends ResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java
index 7aa9cd92163..88818d6626b 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java
@@ -5,7 +5,7 @@ package com.yahoo.searchlib.expression;
* This class will revert the order on any multivalues. Nothing is done to single value types such as integers, float,
* strings and Raw values.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ReverseFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java
index 2c9b940cbf0..554cfb72f38 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/SingleResultNode.java
@@ -2,7 +2,7 @@
package com.yahoo.searchlib.expression;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public abstract class SingleResultNode extends ResultNode {
// The global class identifier shared with C++.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java
index 0b0f1e1ed5b..961a423952f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java
@@ -2,7 +2,7 @@
package com.yahoo.searchlib.expression;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class SortFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java
index de748394ca3..d0929690f33 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to concatenate the bits of all arguments in order.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class StrCatFunctionNode extends MultiArgFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java
index dbec8903177..c3091fdf9fc 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to negate its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class StrLenFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java
index 89570c702ec..33082749c26 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class StringBucketResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java
index f428e2aef9f..89b0313998f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNode.java
@@ -9,7 +9,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This result holds a string.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class StringResultNode extends SingleResultNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java
index ba172f5db01..05b379bca9d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
/**
* This result holds nothing.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class StringResultNodeVector extends ResultNodeVector {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java
index 4511797d3dd..93a0ca259cb 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to negate its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class ToFloatFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java
index 8ff20216374..286318b9abe 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to negate its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class ToIntFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java
index 490d19ad9a8..e1e775225f7 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to negate its argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class ToStringFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java
index 233023d1a2e..9531f8fa28e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This function is a request to use the Unicode Collation Algorithm specification when sorting this field.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class UcaFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java
index 05afc5d99b9..c3c154ff410 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This is an abstract super-class for all unary functions that operator on bit values.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class UnaryBitFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java
index 84264f47ef4..13006c6e5da 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This is an abstract super-class for all functions that accept only a single argument.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public abstract class UnaryFunctionNode extends MultiArgFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java
index 57fa01c97de..49e8c947795 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java
@@ -7,7 +7,7 @@ package com.yahoo.searchlib.expression;
* the first 8 bits of the result with the next 8 bits of the result, and then XOR that number with the next 8 bits of
* the result.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class XorBitFunctionNode extends UnaryBitFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java
index 036d7fc8f16..bbcb26f3ac6 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java
@@ -4,7 +4,7 @@ package com.yahoo.searchlib.expression;
/**
* This function is an instruction to perform bitwise XOR on the result of all arguments in order.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class XorFunctionNode extends BitFunctionNode {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java
index 54e86f8353c..8c60aa52894 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
/**
* This function decompose two-dimensonal zcurve values into x and y values.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ZCurveFunctionNode extends UnaryFunctionNode {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java
index 2f271ec84db..77b6726c11c 100755..100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.objects.ObjectPredicate;
import junit.framework.TestCase;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class AggregationTestCase extends TestCase {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
index 2c5e65c03e4..62486e63f7f 100755..100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
@@ -11,7 +11,7 @@ import java.nio.ByteBuffer;
import java.util.Arrays;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class ExpressionTestCase extends TestCase {
diff --git a/searchlib/src/vespa/searchlib/aggregation/OWNERS b/searchlib/src/vespa/searchlib/aggregation/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchlib/src/vespa/searchlib/aggregation/OWNERS
+++ b/searchlib/src/vespa/searchlib/aggregation/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchlib/src/vespa/searchlib/attribute/OWNERS b/searchlib/src/vespa/searchlib/attribute/OWNERS
index 7066165775a..fda83fc8cf8 100644
--- a/searchlib/src/vespa/searchlib/attribute/OWNERS
+++ b/searchlib/src/vespa/searchlib/attribute/OWNERS
@@ -1,3 +1,3 @@
tegge
geirst
-balder
+baldersheim
diff --git a/searchlib/src/vespa/searchlib/docstore/OWNERS b/searchlib/src/vespa/searchlib/docstore/OWNERS
index 3e9fc8ab356..d14485102db 100644
--- a/searchlib/src/vespa/searchlib/docstore/OWNERS
+++ b/searchlib/src/vespa/searchlib/docstore/OWNERS
@@ -1,2 +1,2 @@
-balder
+baldersheim
tegge
diff --git a/searchlib/src/vespa/searchlib/expression/OWNERS b/searchlib/src/vespa/searchlib/expression/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchlib/src/vespa/searchlib/expression/OWNERS
+++ b/searchlib/src/vespa/searchlib/expression/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchlib/src/vespa/searchlib/grouping/OWNERS b/searchlib/src/vespa/searchlib/grouping/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchlib/src/vespa/searchlib/grouping/OWNERS
+++ b/searchlib/src/vespa/searchlib/grouping/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchlib/src/vespa/searchlib/parsequery/OWNERS b/searchlib/src/vespa/searchlib/parsequery/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchlib/src/vespa/searchlib/parsequery/OWNERS
+++ b/searchlib/src/vespa/searchlib/parsequery/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchlib/src/vespa/searchlib/query/OWNERS b/searchlib/src/vespa/searchlib/query/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchlib/src/vespa/searchlib/query/OWNERS
+++ b/searchlib/src/vespa/searchlib/query/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchlib/src/vespa/searchlib/transactionlog/OWNERS b/searchlib/src/vespa/searchlib/transactionlog/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/OWNERS
+++ b/searchlib/src/vespa/searchlib/transactionlog/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/searchsummary/OWNERS b/searchsummary/OWNERS
index 9673ef97e16..6aeaba5f2a8 100644
--- a/searchsummary/OWNERS
+++ b/searchsummary/OWNERS
@@ -1,2 +1,2 @@
geirst
-balder
+baldersheim
diff --git a/staging_vespalib/OWNERS b/staging_vespalib/OWNERS
index 30c53a630b0..3853ae0ffae 100644
--- a/staging_vespalib/OWNERS
+++ b/staging_vespalib/OWNERS
@@ -1,3 +1,3 @@
arnej27959
havardpe
-balder
+baldersheim
diff --git a/streamingvisitors/OWNERS b/streamingvisitors/OWNERS
index f62763ab1da..465c0e30113 100644
--- a/streamingvisitors/OWNERS
+++ b/streamingvisitors/OWNERS
@@ -1,2 +1,2 @@
-balder
+baldersheim
geirst
diff --git a/vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java b/vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java
index eea51bf7787..0e3c819632f 100644
--- a/vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java
+++ b/vdslib/src/test/java/com/yahoo/vdslib/SearchResultTestCase.java
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- * @author balder
+ * @author baldersheim
*/
public class SearchResultTestCase {
diff --git a/vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java b/vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java
index c1cb0cc3e6c..c06ba4a2245 100644
--- a/vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java
+++ b/vespajlib/developernotes/CopyOnWriteHashMapBenchmark.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public class RcuHashMapBenchmark {
diff --git a/vespajlib/developernotes/Utf8MicroBencmark.java b/vespajlib/developernotes/Utf8MicroBencmark.java
index ff1ae4ce3a2..280aa75c8bc 100644
--- a/vespajlib/developernotes/Utf8MicroBencmark.java
+++ b/vespajlib/developernotes/Utf8MicroBencmark.java
@@ -2,7 +2,7 @@
package com.yahoo.text;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java b/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java
index 8df46e113a2..64ff6d736ea 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ArraySet.java
@@ -19,7 +19,7 @@ import java.util.Set;
* </p>
*
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author balder
+ * @author baldersheim
* @since 5.1.4
*
* @param <E>
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java b/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java
index 98cc443fd71..23fed831d1f 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ConcurrentResourcePool.java
@@ -8,11 +8,7 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 13.11.12
- * Time: 20:57
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class ConcurrentResourcePool<T> implements Iterable<T> {
diff --git a/vespajlib/src/main/java/com/yahoo/collections/MethodCache.java b/vespajlib/src/main/java/com/yahoo/collections/MethodCache.java
index 5dd9f68e5cc..f15c383be76 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/MethodCache.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/MethodCache.java
@@ -7,11 +7,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 6/12/13
- * Time: 9:03 AM
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public final class MethodCache {
private final String methodName;
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java b/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java
index 44d99f78cfe..d6fe032e0e3 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ResourceFactory.java
@@ -2,7 +2,7 @@
package com.yahoo.collections;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public abstract class ResourceFactory<T> {
diff --git a/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java b/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java
index dcf73425f6d..112a77b069d 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/ResourcePool.java
@@ -9,7 +9,7 @@ import java.util.Iterator;
* <p>This implements a simple stack based resource pool. If you are out of resources new are allocated from the
* factory.</p>
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public final class ResourcePool<T> implements Iterable<T> {
diff --git a/vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java b/vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java
index cbf12bd3d94..e94a4b9b802 100644
--- a/vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java
+++ b/vespajlib/src/main/java/com/yahoo/compress/IntegerCompressor.java
@@ -4,7 +4,9 @@ package com.yahoo.compress;
import java.nio.ByteBuffer;
/**
- * TODO: balder
+ * Utility for bytewise compressing of integers into a ByteBuffer.
+ *
+ * @author: baldersheim
*/
public class IntegerCompressor {
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java b/vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java
index e15a3734094..2c32791fb56 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/CopyOnWriteHashMap.java
@@ -12,7 +12,7 @@ import java.util.Set;
* it back as active again. Here are no locks, but the cost is that inserts will happen a lot more than necessary. The
* map reference is volatile, but on most multicpu machines that has no cost unless modified.</p>
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public class CopyOnWriteHashMap<K, V> implements Map<K, V> {
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
index 5be6da8c66d..c3b6af0c1d8 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadFactoryFactory.java
@@ -7,11 +7,7 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 24.04.13
- * Time: 19:00
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class ThreadFactoryFactory {
static public synchronized ThreadFactory getThreadFactory(String name) {
diff --git a/vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java b/vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java
index 65016ff5384..a769aa4bda4 100644
--- a/vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java
+++ b/vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java
@@ -14,7 +14,7 @@ import java.nio.charset.CharsetEncoder;
* Base class for writers needing to accept binary data.
*
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public abstract class AbstractByteWriter extends GenericWriter implements
WritableByteTransmitter {
diff --git a/vespajlib/src/main/java/com/yahoo/java7compat/Util.java b/vespajlib/src/main/java/com/yahoo/java7compat/Util.java
index 8a838308fbb..36bc23eba52 100644
--- a/vespajlib/src/main/java/com/yahoo/java7compat/Util.java
+++ b/vespajlib/src/main/java/com/yahoo/java7compat/Util.java
@@ -2,7 +2,7 @@
package com.yahoo.java7compat;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
diff --git a/vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java b/vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java
index 1a11e30dd9d..15979c00b3c 100644
--- a/vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java
+++ b/vespajlib/src/main/java/com/yahoo/text/AbstractUtf8Array.java
@@ -4,7 +4,7 @@ package com.yahoo.text;
import java.nio.ByteBuffer;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public abstract class AbstractUtf8Array implements Comparable<AbstractUtf8Array> {
diff --git a/vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java b/vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java
index 258f5f74d14..433bed8abe6 100644
--- a/vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java
+++ b/vespajlib/src/main/java/com/yahoo/text/CaseInsensitiveIdentifier.java
@@ -2,11 +2,7 @@
package com.yahoo.text;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 11.11.12
- * Time: 11:25
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class CaseInsensitiveIdentifier extends Identifier {
private final Identifier original;
diff --git a/vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java b/vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java
index 364cb87d6f7..e52fb294bb1 100644
--- a/vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java
+++ b/vespajlib/src/main/java/com/yahoo/text/DataTypeIdentifier.java
@@ -2,11 +2,7 @@
package com.yahoo.text;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 11.11.12
- * Time: 21:11
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class DataTypeIdentifier {
private static final byte [] ARRAY = {'a', 'r', 'r', 'a', 'y'};
diff --git a/vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java b/vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java
index a7876d620b9..eb36eb4e396 100644
--- a/vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java
+++ b/vespajlib/src/main/java/com/yahoo/text/ForwardWriter.java
@@ -6,7 +6,7 @@ import java.io.IOException;
/**
* Wraps another writer and also converting IOException to Exceptions.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public class ForwardWriter extends GenericWriter {
diff --git a/vespajlib/src/main/java/com/yahoo/text/GenericWriter.java b/vespajlib/src/main/java/com/yahoo/text/GenericWriter.java
index 0a07b617352..e231a41f08e 100644
--- a/vespajlib/src/main/java/com/yahoo/text/GenericWriter.java
+++ b/vespajlib/src/main/java/com/yahoo/text/GenericWriter.java
@@ -9,7 +9,7 @@ import java.io.Writer;
* java.io.Writer, but it allows for more overrides for speed.
* This introduces additional interfaces in addition to the java.lang.Writer.
* The purpose is to allow for optimizations.
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
diff --git a/vespajlib/src/main/java/com/yahoo/text/Identifier.java b/vespajlib/src/main/java/com/yahoo/text/Identifier.java
index 2d74b61e1e0..006c1baa65d 100644
--- a/vespajlib/src/main/java/com/yahoo/text/Identifier.java
+++ b/vespajlib/src/main/java/com/yahoo/text/Identifier.java
@@ -2,11 +2,9 @@
package com.yahoo.text;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 11.11.12
- * Time: 10:37
* This class is used to represent a legal identifier of [a-zA-Z_][a-zA-Z_0-9]*
+ *
+ * @author baldersheim
*/
public class Identifier extends Utf8Array {
public Identifier(String s) {
diff --git a/vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java b/vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java
index b89092e9780..1ea9dc5eab9 100644
--- a/vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java
+++ b/vespajlib/src/main/java/com/yahoo/text/JavaWriterWriter.java
@@ -7,7 +7,7 @@ import java.io.Writer;
/**
* Wraps a simple java.lang.Writer. Of course you loose the possible optimizations.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public final class JavaWriterWriter extends GenericWriter {
diff --git a/vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java b/vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java
index b0f5b023a38..5b2d0ccecd0 100644
--- a/vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java
+++ b/vespajlib/src/main/java/com/yahoo/text/LowercaseIdentifier.java
@@ -2,11 +2,7 @@
package com.yahoo.text;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 11.11.12
- * Time: 20:50
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class LowercaseIdentifier extends Identifier {
public LowercaseIdentifier(String s) {
diff --git a/vespajlib/src/main/java/com/yahoo/text/Utf8.java b/vespajlib/src/main/java/com/yahoo/text/Utf8.java
index 9126870117e..0d3386ee093 100644
--- a/vespajlib/src/main/java/com/yahoo/text/Utf8.java
+++ b/vespajlib/src/main/java/com/yahoo/text/Utf8.java
@@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets;
*
* @author arnej27959
* @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*
*/
public final class Utf8 {
diff --git a/vespajlib/src/main/java/com/yahoo/text/Utf8Array.java b/vespajlib/src/main/java/com/yahoo/text/Utf8Array.java
index 30b2e665392..1cb25094466 100644
--- a/vespajlib/src/main/java/com/yahoo/text/Utf8Array.java
+++ b/vespajlib/src/main/java/com/yahoo/text/Utf8Array.java
@@ -9,7 +9,7 @@ import java.nio.ByteBuffer;
* This is a class that has speed as its primary purpose.
* If you have a string, consider Utf8String
* If you have a large backing array consider Utf8PartialArray
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
diff --git a/vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java b/vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java
index c6032e751b7..1b74c56afc4 100644
--- a/vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java
+++ b/vespajlib/src/main/java/com/yahoo/text/Utf8PartialArray.java
@@ -3,7 +3,7 @@ package com.yahoo.text;
/**
* This wraps a window in a backing byte array. Without doing any copying.
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public class Utf8PartialArray extends Utf8Array {
diff --git a/vespajlib/src/main/java/com/yahoo/text/Utf8String.java b/vespajlib/src/main/java/com/yahoo/text/Utf8String.java
index 1f4dfc0d4f6..da0f4a67c83 100644
--- a/vespajlib/src/main/java/com/yahoo/text/Utf8String.java
+++ b/vespajlib/src/main/java/com/yahoo/text/Utf8String.java
@@ -4,7 +4,7 @@ package com.yahoo.text;
/**
* String with Utf8 backing.
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public final class Utf8String extends Utf8Array implements CharSequence
diff --git a/vespajlib/src/main/java/com/yahoo/text/XMLWriter.java b/vespajlib/src/main/java/com/yahoo/text/XMLWriter.java
index ee5ff753c57..c52c4b8a0ea 100644
--- a/vespajlib/src/main/java/com/yahoo/text/XMLWriter.java
+++ b/vespajlib/src/main/java/com/yahoo/text/XMLWriter.java
@@ -15,7 +15,7 @@ import java.util.List;
* using these methods, start tags are closed and newlines inserted automatically as appropriate.
*
* @author bratseth
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class XMLWriter extends ForwardWriter {
diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java
index cf5d2e28af3..e99f71dd918 100644
--- a/vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java
+++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/BufferSerializer.java
@@ -8,7 +8,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
/**
- * @author balder
+ * @author baldersheim
*/
public class BufferSerializer implements Serializer, Deserializer {
protected GrowableByteBuffer buf;
diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java
index abd82f6b251..50197eada63 100644
--- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java
+++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Deserializer.java
@@ -2,7 +2,7 @@
package com.yahoo.vespa.objects;
/**
- * @author balder
+ * @author baldersheim
*/
public interface Deserializer {
byte getByte(FieldBase field);
diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java
index 2a7f9cbff7a..a05eca5cdcf 100644
--- a/vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java
+++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/FieldBase.java
@@ -2,7 +2,7 @@
package com.yahoo.vespa.objects;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public class FieldBase {
private final String name;
diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java
index 7bc9c2f8d6b..e0edc6f4e64 100644
--- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java
+++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Identifiable.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
* of an identifiable object is done through the {@link #create(Deserializer)} or {@link #createFromId(int)} factory
* methods.
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
*/
public class Identifiable extends Selectable implements Cloneable {
diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java
index 85647c58744..0a8ac288337 100644
--- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java
+++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java
@@ -5,7 +5,7 @@ package com.yahoo.vespa.objects;
* This is a class containing the global ids that are given out.
* Must be in sync with version for c++ in staging_vespalib/src/vespalib/objects/ids.h
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*/
public interface Ids {
public static int document = 0x1000;
diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java
index a49d09a212b..b856f78c5d6 100644
--- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java
+++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Selectable.java
@@ -2,7 +2,7 @@
package com.yahoo.vespa.objects;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
*
* This class acts as an interface for traversing a tree, or a graph.
* Every non leaf Object implements {@link #selectMembers(ObjectPredicate, ObjectOperation)} implementing
diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java
index a50252fc70c..5001dd22223 100644
--- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java
+++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Serializer.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.objects;
import java.nio.ByteBuffer;
/**
- * @author balder
+ * @author baldersheim
*/
public interface Serializer {
Serializer putByte(FieldBase field, byte value);
diff --git a/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java b/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java
index 51cdd11bb7d..35a40b87c3b 100644
--- a/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java
+++ b/vespajlib/src/test/java/com/yahoo/collections/CollectionsBenchMark.java
@@ -5,7 +5,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
- * Created by balder on 1/20/14.
+ * @author baldersheim
*/
public class CollectionsBenchMark {
abstract static class BenchMark {
diff --git a/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java b/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java
index 46a70a4c956..95f734ba5f8 100644
--- a/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java
+++ b/vespajlib/src/test/java/com/yahoo/compress/IntegerCompressorTest.java
@@ -10,7 +10,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- * TODO: balder
+ * Test that integers compresses correctly.
+ *
+ * @author: baldersheim
*/
public class IntegerCompressorTest {
private void verifyPositiveNumber(int n, byte [] expected) {
diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java
index 22619e3865e..23d106a2790 100644
--- a/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java
+++ b/vespajlib/src/test/java/com/yahoo/concurrent/CopyOnWriteHashMapTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public class CopyOnWriteHashMapTest {
diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java
index 7fc6a9cc390..b13e4a7af22 100644
--- a/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java
+++ b/vespajlib/src/test/java/com/yahoo/concurrent/ThreadFactoryFactoryTest.java
@@ -9,11 +9,7 @@ import java.util.concurrent.ThreadFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 26.04.13
- * Time: 12:01
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class ThreadFactoryFactoryTest {
diff --git a/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java b/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java
index 1f919978b7a..aebf081f496 100644
--- a/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java
+++ b/vespajlib/src/test/java/com/yahoo/java7compat/UtilTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
index 8ee1a91c970..5963f5a8eca 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
@@ -12,7 +12,7 @@ import java.io.IOException;
import java.lang.Integer;
/**
- * Created by balder on 2/26/14.
+ * @author baldersheim
*/
public class JsonBenchmark {
private static byte [] createJson(int numElements) {
diff --git a/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java
index 6c6b5b62506..57eb86dc092 100644
--- a/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/text/CaseInsensitiveIdentifierTestCase.java
@@ -6,11 +6,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 11.11.12
- * Time: 11:37
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class CaseInsensitiveIdentifierTestCase {
@Test
diff --git a/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java
index b79f65d9eb2..75a5b7b277a 100644
--- a/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/text/DataTypeIdentifierTestCase.java
@@ -5,11 +5,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 12.11.12
- * Time: 08:10
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class DataTypeIdentifierTestCase {
@Test
diff --git a/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java
index 447b109983e..126cc10f5bc 100644
--- a/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/text/IdentifierTestCase.java
@@ -5,11 +5,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 11.11.12
- * Time: 10:58
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class IdentifierTestCase {
@Test
diff --git a/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java b/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java
index 7d6b066a499..00f4010bdf4 100644
--- a/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/text/LowercaseIdentifierTestCase.java
@@ -6,11 +6,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
- * Created with IntelliJ IDEA.
- * User: balder
- * Date: 11.11.12
- * Time: 20:54
- * To change this template use File | Settings | File Templates.
+ * @author baldersheim
*/
public class LowercaseIdentifierTestCase {
@Test
diff --git a/vespalib/OWNERS b/vespalib/OWNERS
index bfae37a0f56..dc761719bf4 100644
--- a/vespalib/OWNERS
+++ b/vespalib/OWNERS
@@ -1,3 +1,3 @@
havardpe
arnej27959
-balder
+baldersheim
diff --git a/vespamalloc/OWNERS b/vespamalloc/OWNERS
index 2b49711c817..d987fcf8c5b 100644
--- a/vespamalloc/OWNERS
+++ b/vespamalloc/OWNERS
@@ -1,2 +1,2 @@
-balder
+baldersheim
vekterli
diff --git a/vsm/OWNERS b/vsm/OWNERS
index f62763ab1da..465c0e30113 100644
--- a/vsm/OWNERS
+++ b/vsm/OWNERS
@@ -1,2 +1,2 @@
-balder
+baldersheim
geirst
diff --git a/yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java b/yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java
index 38c6abf055b..fb0bcae7ca8 100644
--- a/yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java
+++ b/yolean/src/main/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMap.java
@@ -12,7 +12,7 @@ import java.util.Set;
* it back as active again. Here are no locks, but the cost is that inserts will happen a lot more than necessary. The
* map reference is volatile, but on most multi-cpu machines that has no cost unless modified.</p>
*
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public class CopyOnWriteHashMap<K, V> implements Map<K, V> {
diff --git a/yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java b/yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java
index 280fa2bd22f..22f6f726954 100644
--- a/yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java
+++ b/yolean/src/test/java/com/yahoo/yolean/concurrent/CopyOnWriteHashMapTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
* @since 5.2
*/
public class CopyOnWriteHashMapTest {