summaryrefslogtreecommitdiffstats
path: root/container-search/src
diff options
context:
space:
mode:
Diffstat (limited to 'container-search/src')
-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
46 files changed, 49 insertions, 60 deletions
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 {