summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/grouping/request
diff options
context:
space:
mode:
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/grouping/request')
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/AggregatorNode.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/AllOperation.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/AttributeValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/AvgAggregator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/BucketResolver.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/BucketValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ConstantValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DocumentValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DoubleBucket.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DoubleValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/EachOperation.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ExpressionVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/GroupingExpression.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/GroupingNode.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/LongBucket.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/LongValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MathResolver.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MaxAggregator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MinAggregator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/NowFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/PredefinedFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/RelevanceValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/StringValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/SumAggregator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/SummaryValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/XorAggregator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/YmumValue.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/parser/GroupingParserInput.java2
66 files changed, 66 insertions, 66 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
index 76e49bc975b..8cb27569e67 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents an add-function in a {@link GroupingExpression}. It evaluates to a number that equals the
* result of adding the results of all arguments together in the order they were given to the constructor.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class AddFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AggregatorNode.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AggregatorNode.java
index ef41b18d21d..323f1ac769a 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AggregatorNode.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AggregatorNode.java
@@ -6,7 +6,7 @@ package com.yahoo.search.grouping.request;
* can not be used as a document-level expression (i.e. level 0, see {@link GroupingExpression#resolveLevel(int)}). The
* contained expression is evaluated at the level of the aggregator minus 1.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public abstract class AggregatorNode extends GroupingExpression {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AllOperation.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AllOperation.java
index 9d26c4e281d..b809706331f 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AllOperation.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AllOperation.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This is a grouping operation that processes the input list as a whole, as opposed to {@link EachOperation} which
* processes each element of that list separately.
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public class AllOperation extends GroupingOperation {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
index ec4a71c3d24..5f2617acf16 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents an and-function in a {@link GroupingExpression}. It evaluates to a long that equals the result
* of and'ing the results of all arguments together in the order they were given to the constructor.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class AndFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java
index d917d633e4e..faf565647c7 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents a document attribute function in a {@link GroupingExpression}. It evaluates to the value of the
* named attribute in the input {@link com.yahoo.search.result.Hit}.
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public class AttributeFunction extends DocumentValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeValue.java
index ba50cb42b13..d83888b3107 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeValue.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents a document attribute value in a {@link GroupingExpression}. It evaluates to the value of the
* named attribute in the input {@link com.yahoo.search.result.Hit}.
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public class AttributeValue extends DocumentValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AvgAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AvgAggregator.java
index 4ac64ef35fc..d7e3232ea5f 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AvgAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AvgAggregator.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents an average-aggregator in a {@link GroupingExpression}. It evaluates to the average value that
* the contained expression evaluated to over all the inputs.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class AvgAggregator extends AggregatorNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
index aed409361b3..55c4d355589 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a min-function in a {@link GroupingExpression}. It evaluates to a number that equals the
* average of the results of all arguments.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class AvgFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/BucketResolver.java b/container-search/src/main/java/com/yahoo/search/grouping/request/BucketResolver.java
index bb54b0e5a02..c36c8af5c34 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/BucketResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/BucketResolver.java
@@ -11,7 +11,7 @@ import java.util.List;
* {@link #resolve(GroupingExpression)} to retrieve the list of corresponding
* grouping expression object.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class BucketResolver {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/BucketValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/BucketValue.java
index b053f7ede43..c73b7199394 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/BucketValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/BucketValue.java
@@ -6,7 +6,7 @@ package com.yahoo.search.grouping.request;
* 'from' and 'to'. The range is inclusive-from and exclusive-to. All supported data types are represented as subclasses
* of this.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class BucketValue extends GroupingExpression implements Comparable<BucketValue> {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
index ae6161ec9d9..5e51c8e35a0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a cat-function in a {@link GroupingExpression}. It evaluates to a byte array that equals the
* concatenation of the binary result of all arguments in the order they were given to the constructor.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class CatFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ConstantValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ConstantValue.java
index b986cf2efb9..ad8c1ef1cc9 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ConstantValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ConstantValue.java
@@ -6,7 +6,7 @@ package com.yahoo.search.grouping.request;
* this expression type can be used at any input level (see {@link GroupingExpression#resolveLevel(int)}). All supported
* data types are represented as subclasses of this.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
@SuppressWarnings("rawtypes")
public abstract class ConstantValue<T extends Comparable> extends GroupingExpression {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
index 39f9c31766b..19a6c939087 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/CountAggregator.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents an count-aggregator in a {@link GroupingExpression}. It evaluates to the number of elements
* there are in the input.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class CountAggregator extends AggregatorNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java
index bcf81f1fbe6..b3a4c451b6b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DateFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a timestamp-formatter function in a {@link GroupingExpression}. It evaluates to a string on the
* form "YYYY-MM-DD" of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class DateFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java
index 55b99c26ad7..5d82a80352b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfMonthFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a day-of-month timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
* equals the day of month (1-31) of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class DayOfMonthFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java
index 2b30968456e..f2135427bf5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfWeekFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a day-of-week timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
* equals the day of week (0 - 6) of the result of the argument, Monday being 0.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class DayOfWeekFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java
index 0589b960b98..15f158ef2f1 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DayOfYearFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a day-of-year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
* equals the day of year (0-365) of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class DayOfYearFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
index ad5e339bae6..f50dcde2d56 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
@@ -8,7 +8,7 @@ import java.util.List;
* of dividing the results of all arguments in the order they were given to the constructor (divide first argument by
* second, result by third, ...).
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class DivFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java
index b350d38fde3..188e642e7d7 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents a document id specific value in a {@link GroupingExpression}. It evaluates to the namespace-
* specific value of the document id of the input {@link com.yahoo.search.result.Hit}.
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public class DocIdNsSpecificValue extends DocumentValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DocumentValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DocumentValue.java
index 57eb88a67d3..f8756b81163 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DocumentValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DocumentValue.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents a document value in a {@link GroupingExpression}. As such, the subclasses of this can only be
* used as document-level expressions (i.e. level 0, see {@link GroupingExpression#resolveLevel(int)}).
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public abstract class DocumentValue extends GroupingExpression {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DoubleBucket.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DoubleBucket.java
index 5cbfd2b4ee4..d71ec8093fd 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DoubleBucket.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DoubleBucket.java
@@ -5,7 +5,7 @@ import java.text.ChoiceFormat;
/**
* This class represents a {@link Double} bucket in a {@link PredefinedFunction}.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class DoubleBucket extends BucketValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
index 227a95b1d3f..d43e8412623 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a predefined bucket-function in a {@link GroupingExpression} for expressions that evaluate to a
* double.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class DoublePredefined extends PredefinedFunction {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DoubleValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DoubleValue.java
index 867683c94ef..5dad65aaabf 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DoubleValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DoubleValue.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
/**
* This class represents a constant {@link Double} value in a {@link GroupingExpression}.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class DoubleValue extends ConstantValue<Double> {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/EachOperation.java b/container-search/src/main/java/com/yahoo/search/grouping/request/EachOperation.java
index db501f2325a..1a7074a2c6e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/EachOperation.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/EachOperation.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This is a grouping operation that processes each element of the input list separately, as opposed to {@link
* AllOperation} which processes that list as a whole.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class EachOperation extends GroupingOperation {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ExpressionVisitor.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ExpressionVisitor.java
index 84626061a3f..a341bee2568 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ExpressionVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ExpressionVisitor.java
@@ -6,7 +6,7 @@ package com.yahoo.search.grouping.request;
* GroupingOperation}. It is used by the {@link com.yahoo.search.grouping.GroupingValidator} to ensure that all
* referenced attributes are valid for the cluster being queried.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public interface ExpressionVisitor {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java
index 0898439da87..f44394c6193 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/FixedWidthFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a fixed-width bucket-function in a {@link GroupingExpression}. It maps the input into the given
* number of buckets by the result of the argument expression.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class FixedWidthFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java b/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java
index ce4442fa781..1a059d79b1a 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/FunctionNode.java
@@ -8,7 +8,7 @@ import java.util.*;
* to {@link AggregatorNode} and {@link DocumentValue} that operate on inputs), this expression type can be used at any
* input level (see {@link GroupingExpression#resolveLevel(int)}).
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public abstract class FunctionNode extends GroupingExpression implements Iterable<GroupingExpression> {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingExpression.java b/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingExpression.java
index d15608fcbeb..2f7691156e5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingExpression.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingExpression.java
@@ -9,7 +9,7 @@ import java.util.List;
* This class represents an expression in a {@link GroupingOperation}. You may manually construct this expression, or
* you may use the {@link com.yahoo.search.grouping.request.parser.GroupingParser} to generate one from a query-string.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public abstract class GroupingExpression extends GroupingNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingNode.java b/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingNode.java
index 918bff3c218..148b4243a4b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingNode.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingNode.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This is the abstract super class of both {@link GroupingOperation} and {@link GroupingExpression}. All nodes can be
* assigned a {@link String} label which in turn can be used to identify the corresponding result objects.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public abstract class GroupingNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java b/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java
index ccce5fa8241..4c29ca7d98d 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/GroupingOperation.java
@@ -16,7 +16,7 @@ import java.util.*;
* com.yahoo.search.grouping.GroupingRequest} using the {@link com.yahoo.search.grouping.GroupingRequest#setRootOperation(GroupingOperation)}
* method.
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public abstract class GroupingOperation extends GroupingNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java
index 42982df637d..faf1c1e0289 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/HourOfDayFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents an hour-of-day timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
* equals the hour of day (0-23) of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class HourOfDayFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/LongBucket.java b/container-search/src/main/java/com/yahoo/search/grouping/request/LongBucket.java
index cd8e807b1a6..fd363320033 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/LongBucket.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/LongBucket.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
/**
* This class represents a {@link Long} bucket in a {@link PredefinedFunction}.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class LongBucket extends BucketValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
index ee9d57b5b30..98acc800ed7 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a predefined bucket-function in a {@link GroupingExpression} for expressions that evaluate to a
* long.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class LongPredefined extends PredefinedFunction {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/LongValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/LongValue.java
index 2f5d833a5be..4c4eb1c409d 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/LongValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/LongValue.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
/**
* This class represents a constant {@link Long} value in a {@link GroupingExpression}.
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public class LongValue extends ConstantValue<Long> {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MathResolver.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MathResolver.java
index 75b897a60c1..8aa841930e3 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MathResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MathResolver.java
@@ -10,7 +10,7 @@ import java.util.Stack;
* operation simply push operator-expression pairs onto it, before calling {@link #resolve()} to retrieve the single
* corresponding grouping expression object.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class MathResolver {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MaxAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MaxAggregator.java
index 7de8dd62f27..54dc7c6b3bd 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MaxAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MaxAggregator.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents an maximum-aggregator in a {@link GroupingExpression}. It evaluates to the maximum value that
* the contained expression evaluated to over all the inputs.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class MaxAggregator extends AggregatorNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
index 570379afe66..731c1c4eba4 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a max-function in a {@link GroupingExpression}. It evaluates to a number that equals the
* largest of the results of all arguments.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class MaxFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java b/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java
index 701a2d1cc38..6ae33b804e9 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/Md5Function.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents an md5-function in a {@link GroupingExpression}. It evaluates to a long that equals the md5 of
* the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class Md5Function extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MinAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MinAggregator.java
index c15fa4cb954..1a24527dcfc 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MinAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MinAggregator.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents an minimum-aggregator in a {@link GroupingExpression}. It evaluates to the minimum value that
* the contained expression evaluated to over all the inputs.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class MinAggregator extends AggregatorNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
index 05f6f9d9abf..478684dd73e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a min-function in a {@link GroupingExpression}. It evaluates to a number that equals the
* smallest of the results of all arguments.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class MinFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java
index 81815490bf1..d2442b8455e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MinuteOfHourFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a minute-of-hour timestamp-function in a {@link GroupingExpression}. It evaluates to a long
* that equals the minute of hour (0-59) of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class MinuteOfHourFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
index ac6bee5a04e..a3fd1041e6e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
@@ -8,7 +8,7 @@ import java.util.List;
* of mod'ing the results of all arguments in the order they were given to the constructor (modulo first argument by
* second, result by third, ...).
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class ModFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java
index 4540efff23e..96e08562e42 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MonthOfYearFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a month-of-year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that
* equals the month of year (1-12) of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class MonthOfYearFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
index 60b4729ce33..84584270f58 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a mul-function in a {@link GroupingExpression}. It evaluates to a number that equals the result
* of multiplying the results of all arguments together in the order they were given to the constructor.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class MulFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java
index 1429f3a8605..7e05b02b59e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/NegFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a negate-function in a {@link GroupingExpression}. It evaluates to a number that equals the
* negative of the results of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class NegFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/NowFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/NowFunction.java
index ae1cd4f247d..24dd888e98d 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/NowFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/NowFunction.java
@@ -7,7 +7,7 @@ import java.util.Collections;
* This class represents a now-function in a {@link GroupingExpression}. It evaluates to a long that equals the number
* of seconds since midnight, January 1, 1970 UTC.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class NowFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
index 592709c4c91..ad1809f312f 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents an or-function in a {@link GroupingExpression}. It evaluates to a long that equals the result
* of or'ing the results of all arguments together in the order they were given to the constructor.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class OrFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/PredefinedFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/PredefinedFunction.java
index 7f880ffc2fc..ebae4b238b4 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/PredefinedFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/PredefinedFunction.java
@@ -9,7 +9,7 @@ import java.util.List;
* This class represents a predefined bucket-function in a {@link GroupingExpression}. It maps the input into one of the
* given buckets by the result of the argument expression.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public abstract class PredefinedFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/RelevanceValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/RelevanceValue.java
index 84a1ca34c24..01735c0bdab 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/RelevanceValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/RelevanceValue.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents a document relevance score in a {@link GroupingExpression}. It evaluates to the relevance of
* the input {@link com.yahoo.search.result.Hit}.
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public class RelevanceValue extends DocumentValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java
index 8402f607a33..b83065af629 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SecondOfMinuteFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a second-of-minute timestamp-function in a {@link GroupingExpression}. It evaluates to a long
* that equals the second of minute (0-59) of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class SecondOfMinuteFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
index 4366446f84e..4b7055ffb89 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SizeFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a size-function in a {@link GroupingExpression}. It evaluates to a number that equals the
* number of elements in the result of the argument (e.g. the number of elements in an array).
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class SizeFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
index d0fd495cc42..97dcc909254 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a strcat-function in a {@link GroupingExpression}. It evaluates to a string that equals the
* contatenation of the string results of all arguments in the order they were given to the constructor.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class StrCatFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java
index 2aaefa8e99a..e9ca48b3db3 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StrLenFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a strcat-function in a {@link GroupingExpression}. It evaluates to a long that equals the
* number of bytes in the string result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class StrLenFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java
index fbbe08dbcf4..80e85ed9e78 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
/**
* This class represents a {@link String} bucket in a {@link PredefinedFunction}.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class StringBucket extends BucketValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
index 618f5e3bb25..465ff96157d 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents a predefined bucket-function in a {@link GroupingExpression} for expressions that evaluate to a
* string.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class StringPredefined extends PredefinedFunction {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StringValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StringValue.java
index 78bc8960fc7..4fc630c7b1b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StringValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StringValue.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request;
/**
* This class represents a constant {@link String} value in a {@link GroupingExpression}.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class StringValue extends ConstantValue<String> {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
index e28f6f3b412..1d0456ffcf2 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
@@ -8,7 +8,7 @@ import java.util.List;
* of subtracting the results of all arguments in the order they were given to the constructor (subtract second argument
* from first, third from result, ...).
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class SubFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SumAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SumAggregator.java
index 369f5637e8f..b50dd84e27e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SumAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SumAggregator.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents an sum-aggregator in a {@link GroupingExpression}. It evaluates to the sum of the values that
* the contained expression evaluated to over all the inputs.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class SumAggregator extends AggregatorNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SummaryValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SummaryValue.java
index e4358f4d57d..6cdaa3b2e4a 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SummaryValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SummaryValue.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents a document summary in a {@link GroupingExpression}. It evaluates to the summary of the input
* {@link com.yahoo.search.result.Hit} that corresponds to the named summary class.
*
- * @author Simon Thoresen
+ * @author Simon Thoresen Hult
*/
public class SummaryValue extends DocumentValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java b/container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java
index 3b1040a0b2e..c12d32044da 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/TimeFunctions.java
@@ -6,7 +6,7 @@ package com.yahoo.search.grouping.request;
* per-function factory methods, this class also contains a {@link #newInstance(com.yahoo.search.grouping.request.TimeFunctions.Type,
* GroupingExpression)} method which is useful for runtime construction of grouping requests.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public abstract class TimeFunctions {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorAggregator.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorAggregator.java
index 31cbe46e0cb..18ce7abd96c 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorAggregator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorAggregator.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents an xor-aggregator in a {@link GroupingExpression}. It evaluates to the xor of the values that
* the contained expression evaluated to over all the inputs.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class XorAggregator extends AggregatorNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
index 21928a2f060..2f6061a3aa2 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents an xor-function in a {@link GroupingExpression}. It evaluates to a long that equals the xor of
* 'width' bits over the binary representation of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class XorBitFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
index d0fbac7e055..c3a5f5d88ad 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
@@ -7,7 +7,7 @@ import java.util.List;
* This class represents an xor-function in a {@link GroupingExpression}. It evaluates to a long that equals the result
* of and'ing the results of all arguments together in the order they were given to the constructor.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class XorFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java
index 9d880939892..5bda8231929 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/YearFunction.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
* This class represents a year timestamp-function in a {@link GroupingExpression}. It evaluates to a long that equals
* the full year (e.g. 2010) of the result of the argument.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class YearFunction extends FunctionNode {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/YmumValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/YmumValue.java
index 7bec89f6218..c5749c4673d 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/YmumValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/YmumValue.java
@@ -5,7 +5,7 @@ package com.yahoo.search.grouping.request;
* This class represents a document checksum in a {@link GroupingExpression}. It evaluates to the YMUM checksum of the
* input {@link com.yahoo.search.result.Hit}.
*
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class YmumValue extends DocumentValue {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/parser/GroupingParserInput.java b/container-search/src/main/java/com/yahoo/search/grouping/request/parser/GroupingParserInput.java
index 0c71348d368..189281485da 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/parser/GroupingParserInput.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/parser/GroupingParserInput.java
@@ -4,7 +4,7 @@ package com.yahoo.search.grouping.request.parser;
import com.yahoo.javacc.FastCharStream;
/**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen Hult
*/
public class GroupingParserInput extends FastCharStream implements CharStream {