Merge branch 'master' into dybis/update-author

32 files changed, 34 insertions, 43 deletions

diff --git a/document/OWNERS b/document/OWNERS
index 1037590124e..9dc0c2d970d 100644
--- a/document/OWNERS
+++ b/document/OWNERS
@@ -1 +1 @@
-balder
+baldersheim
diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java
index 740c91c5c1b..34c952e1cec 100644
--- a/document/src/main/java/com/yahoo/document/Document.java
+++ b/document/src/main/java/com/yahoo/document/Document.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * not with primitive types. Support for direct access to primitive types will
  * be removed soon.
  *
- * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
  * @author <a href="einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
  */
 public class Document extends StructuredFieldValue {
diff --git a/document/src/main/java/com/yahoo/document/DocumentRemove.java b/document/src/main/java/com/yahoo/document/DocumentRemove.java
index 8d4f37d5583..aa0ffbc000a 100644
--- a/document/src/main/java/com/yahoo/document/DocumentRemove.java
+++ b/document/src/main/java/com/yahoo/document/DocumentRemove.java
@@ -2,7 +2,7 @@
 package com.yahoo.document;
 
 /**
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
  */
 public class DocumentRemove extends DocumentOperation {
 
diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java
index db38228489d..b703a22255d 100755
--- a/document/src/main/java/com/yahoo/document/DocumentType.java
+++ b/document/src/main/java/com/yahoo/document/DocumentType.java
@@ -17,7 +17,7 @@ import java.util.*;
  * any document, it will always inherit the document "document.0".</p>
  *
  * @author <a href="mailto:thomasg@yahoo-inc.com">Thomas Gundersen</a>
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
  */
 public class DocumentType extends StructuredDataType {
 
diff --git a/document/src/main/java/com/yahoo/document/annotation/Span.java b/document/src/main/java/com/yahoo/document/annotation/Span.java
index 87bd568b94a..a6132078c54 100644
--- a/document/src/main/java/com/yahoo/document/annotation/Span.java
+++ b/document/src/main/java/com/yahoo/document/annotation/Span.java
@@ -10,7 +10,7 @@ import java.util.NoSuchElementException;
  * This class represents a range of characters from a string.&nbsp;This is the leaf node
  * in a Span tree. Its boundaries are defined as inclusive-from and exclusive-to.
  *
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
  */
 public class Span extends SpanNode {
diff --git a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
index 82e3ff36c1c..bee29478219 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
@@ -15,7 +15,7 @@ import java.util.Optional;
 /**
  * Field value class that wraps a tensor.
  *
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public class TensorFieldValue extends FieldValue {
 
diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
index aa26efb0c2d..8f287d4a213 100644
--- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
@@ -15,7 +15,7 @@ import com.yahoo.document.select.rule.ExpressionNode;
  *
  * <p>Document selectors are multithread safe.</p>
  *
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
  */
 public class DocumentSelector {
 
diff --git a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
index b444c2d5ac2..79411894664 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
@@ -4,7 +4,7 @@ package com.yahoo.document.select.simple;
 import com.yahoo.document.select.rule.IdNode;
 
 /**
- * @author balder
+ * @author baldersheim
  */
 public class IdSpecParser extends Parser {
     private IdNode id;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
index 52a0b0a2c4f..3d0ae1ae2a8 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
@@ -4,7 +4,7 @@ package com.yahoo.document.select.simple;
 import com.yahoo.document.select.rule.LiteralNode;
 
 /**
- * @author balder
+ * @author baldersheim
  */
 public class IntegerParser extends Parser {
     private LiteralNode value;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
index 58da1e0c179..a1ddee75ff2 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
@@ -2,7 +2,7 @@
 package com.yahoo.document.select.simple;
 
 /**
- * @author balder
+ * @author baldersheim
  */
 public class OperatorParser extends Parser {
     private String operator;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/Parser.java b/document/src/main/java/com/yahoo/document/select/simple/Parser.java
index 169f100de83..fa2e5d2910b 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/Parser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/Parser.java
@@ -2,7 +2,7 @@
 package com.yahoo.document.select.simple;
 
 /**
- * @author balder
+ * @author baldersheim
  */
 public abstract class Parser {
     public abstract boolean parse(CharSequence s);
diff --git a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
index df3507e67c8..dd76202cfb2 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
@@ -5,7 +5,7 @@ import com.yahoo.document.select.rule.ComparisonNode;
 import com.yahoo.document.select.rule.ExpressionNode;
 
 /**
- * @author balder
+ * @author baldersheim
  */
 public class SelectionParser extends Parser {
     private ExpressionNode node;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
index e18c2dad8e2..42047a63e5a 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
@@ -4,7 +4,7 @@ package com.yahoo.document.select.simple;
 import com.yahoo.document.select.rule.LiteralNode;
 
 /**
- * @author balder
+ * @author baldersheim
  */
 public class StringParser extends Parser {
     private LiteralNode value;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
index def358e0624..e4c1a3293b1 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
@@ -8,7 +8,7 @@ import com.yahoo.io.GrowableByteBuffer;
  *
  * A particular instance of this class is tied to a version of the document format.
  *
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public interface DocumentDeserializer extends DocumentReader, DocumentUpdateReader, FieldReader, AnnotationReader, SpanNodeReader, SpanTreeReader {
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java
index cef5b024837..e6b5590b073 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java
@@ -7,7 +7,7 @@ import com.yahoo.io.GrowableByteBuffer;
 /**
  * Factory for creating document de-serializers tied to a document format.
  *
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public class DocumentDeserializerFactory {
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
index 8a5e889eb8c..52a62caf296 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
@@ -10,7 +10,7 @@ import com.yahoo.document.DocumentTypeManager;
  * This interface is used to implement custom deserialization of document updates.
  *
  * @author <a href="mailto:ravishar@yahoo-inc.com">Ravi Sharma</a>
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
  */
 public interface DocumentReader {
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java
index 6eb0fc60c3f..c1d53430bdc 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java
@@ -8,7 +8,7 @@ import com.yahoo.io.GrowableByteBuffer;
  *
  * A particular instance of this class is tied to a version of the document format.
  *
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public interface DocumentSerializer extends DocumentWriter, SpanNodeWriter, AnnotationWriter, SpanTreeWriter, DocumentUpdateWriter {
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
index 50268161aad..760858680a3 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
@@ -6,7 +6,7 @@ import com.yahoo.io.GrowableByteBuffer;
 /**
  * Factory for creating document serializers tied to a document format.
  *
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public class DocumentSerializerFactory {
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java
index 808b5d90517..d6dd1ad35ac 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java
@@ -8,7 +8,7 @@ package com.yahoo.document.serialization;
  * Flags currently used:
  *   0) create-if-non-existent.
  *
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public class DocumentUpdateFlags {
     private byte flags;
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
index c3e51b2602a..49e61f64e3d 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
@@ -76,7 +76,7 @@ import static com.yahoo.text.Utf8.calculateStringPositions;
  * Class used for de-serializing documents on the Vespa 4.2 document format.
  *
  * @deprecated Please use {@link com.yahoo.document.serialization.VespaDocumentDeserializerHead} instead for new code.
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
  */
 @Deprecated // OK: Don't remove on Vespa 6: Mail may have documents on this format still
 // When removing: Move content of this class into VespaDocumentDeserializerHead (and subclass VespaDocumentSerializerHead in that)
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
index 927075a25b5..83dc9df2826 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
@@ -12,7 +12,7 @@ import com.yahoo.io.GrowableByteBuffer;
 /**
  * Class used for de-serializing documents on the current head document format.
  *
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
  */
 public class VespaDocumentDeserializerHead extends VespaDocumentDeserializer42 {
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
index 64aea73d000..a3f1b0a74d4 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
@@ -22,7 +22,7 @@ import static com.yahoo.text.Utf8.calculateBytePositions;
  * Class used for serializing documents on the Vespa 4.2 document format.
  *
  * @deprecated Please use {@link com.yahoo.document.serialization.VespaDocumentSerializerHead} instead for new code.
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
  */
 @Deprecated // OK: Don't remove on Vespa 6: Mail may have documents on this format still
 // When removing: Move content into VespaDocumentSerializerHead
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
index 7f4c1960122..df15c9fda0b 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
@@ -11,7 +11,7 @@ import com.yahoo.io.GrowableByteBuffer;
 /**
  * Class used for serializing documents on the current head document format.
  *
- * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a>
+ * @author baldersheim
  */
 public class VespaDocumentSerializerHead extends VespaDocumentSerializer42 {
 
diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
index 89f22e97d5d..7a22541c619 100644
--- a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
@@ -13,7 +13,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 /**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
  */
 public class DataTypeTestCase {
 
diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
index 7712cc06c41..f36b4f1d6db 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
@@ -4,10 +4,8 @@ package com.yahoo.document;
 import java.util.Iterator;
 
 /**
- * TODO: Document purpose
- *
- * @author <a href="thomasg@yahoo-inc.com>Thomas Gundersen</a>
- * @author <a href="bratseth@yahoo-inc.com>Jon S Bratseth</a>
+ * @author Thomas Gundersen
+ * @author bratseth
  */
 public class DocumentTypeTestCase extends junit.framework.TestCase {
 
@@ -30,14 +28,6 @@ public class DocumentTypeTestCase extends junit.framework.TestCase {
         DocumentTypeManager typeManager = new DocumentTypeManager();
 
         DocumentType child = new DocumentType("child");
-        //typeManager.register(child);
-
-        /*
-        ListIterator inherited = child.inheritedIterator();
-        assertTrue(inherited.hasNext());
-        assertEquals(new DataTypeName("document", 0), inherited.next());
-        assertTrue(!inherited.hasNext());
-        */
         Iterator inherited;
 
         child.addField("childfield", DataType.INT);
@@ -104,4 +94,5 @@ public class DocumentTypeTestCase extends junit.framework.TestCase {
 
         // TODO: Test uninheriting
     }
+
 }
diff --git a/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java
index c7f88ac64e9..5a63453564d 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/NumericFieldValueTestCase.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 /**
- * Created by balder on 8/6/15.
+ * @author baldersheim
  */
 public class NumericFieldValueTestCase {
     @Test
diff --git a/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java
index 2c76d5ec547..a02446eee76 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/RawTestCase.java
@@ -8,7 +8,7 @@ import java.nio.ByteBuffer;
 import static org.junit.Assert.*;
 
 /**
- * Created by balder on 10/21/14.
+ * @author baldersheim
  */
 public class RawTestCase {
     @Test
diff --git a/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java
index 7c01f8ab300..3b9cac85634 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java
@@ -10,7 +10,7 @@ import static org.junit.Assert.assertTrue;
 
 
 /**
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public class TensorFieldValueTestCase {
 
diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java
index 18e517fb74e..f3987085e32 100644
--- a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java
+++ b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java
@@ -16,7 +16,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * Helper class with utils used in serialization and deserialization test cases.
  *
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public class SerializationTestUtils {
 
diff --git a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
index 62f9ea9f4d3..f0334ee7e4f 100644
--- a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
@@ -15,7 +15,7 @@ import static com.yahoo.document.serialization.SerializationTestUtils.serializeD
 import static org.junit.Assert.assertEquals;
 
 /**
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public class TensorFieldValueSerializationTestCase {
 
diff --git a/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java b/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java
index d54562862b7..1f04b9e1e71 100644
--- a/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java
+++ b/document/src/test/java/com/yahoo/document/serialization/TestDocumentFactory.java
@@ -8,7 +8,7 @@ import com.yahoo.document.DocumentTypeManager;
 /**
  * Helper class for creating a document for a given document type.
  *
- * @author <a href="mailto:geirst@yahoo-inc.com">Geir Storli</a>
+ * @author geirst
  */
 public class TestDocumentFactory {
 
diff --git a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
index 0d73138e077..3fbea80c54b 100644
--- a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
@@ -8,7 +8,7 @@ import com.yahoo.document.serialization.*;
 import java.io.FileOutputStream;
 
 /**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
  */
 public class SerializationTestCase extends junit.framework.TestCase {