summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-06-17 08:59:17 +0200
committerGitHub <noreply@github.com>2016-06-17 08:59:17 +0200
commite693aecea5aea0a85035b2676c232bef8d306e6a (patch)
tree26e7e31b741626edd0dbd75f362616f5779c4ef4 /document
parent0e337c833d1ba15ee7d387d1658d3cdfc4f77dad (diff)
parent38ff012425e1d65a5016ff090c5163892ebecc89 (diff)
Merge pull request #19 from yahoo/bratseth/use-github-name-in-author
Use github name in @author
Diffstat (limited to 'document')
-rw-r--r--document/src/main/java/com/yahoo/document/Document.java2
-rwxr-xr-xdocument/src/main/java/com/yahoo/document/DocumentType.java2
-rw-r--r--document/src/main/java/com/yahoo/document/select/DocumentSelector.java2
-rw-r--r--document/src/test/java/com/yahoo/document/DataTypeTestCase.java2
-rw-r--r--document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java15
-rw-r--r--document/src/test/java/com/yahoo/document/update/SerializationTestCase.java2
6 files changed, 8 insertions, 17 deletions
diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java
index 740c91c5c1b..34c952e1cec 100644
--- a/document/src/main/java/com/yahoo/document/Document.java
+++ b/document/src/main/java/com/yahoo/document/Document.java
@@ -25,7 +25,7 @@ import java.util.Map;
* not with primitive types. Support for direct access to primitive types will
* be removed soon.
*
- * @author <a href="bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
* @author <a href="einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
*/
public class Document extends StructuredFieldValue {
diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java
index db38228489d..b703a22255d 100755
--- a/document/src/main/java/com/yahoo/document/DocumentType.java
+++ b/document/src/main/java/com/yahoo/document/DocumentType.java
@@ -17,7 +17,7 @@ import java.util.*;
* any document, it will always inherit the document "document.0".</p>
*
* @author <a href="mailto:thomasg@yahoo-inc.com">Thomas Gundersen</a>
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon S Bratseth</a>
+ * @author bratseth
*/
public class DocumentType extends StructuredDataType {
diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
index aa26efb0c2d..8f287d4a213 100644
--- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
@@ -15,7 +15,7 @@ import com.yahoo.document.select.rule.ExpressionNode;
*
* <p>Document selectors are multithread safe.</p>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class DocumentSelector {
diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
index 89f22e97d5d..7a22541c619 100644
--- a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
@@ -13,7 +13,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class DataTypeTestCase {
diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
index 7712cc06c41..f36b4f1d6db 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTypeTestCase.java
@@ -4,10 +4,8 @@ package com.yahoo.document;
import java.util.Iterator;
/**
- * TODO: Document purpose
- *
- * @author <a href="thomasg@yahoo-inc.com>Thomas Gundersen</a>
- * @author <a href="bratseth@yahoo-inc.com>Jon S Bratseth</a>
+ * @author Thomas Gundersen
+ * @author bratseth
*/
public class DocumentTypeTestCase extends junit.framework.TestCase {
@@ -30,14 +28,6 @@ public class DocumentTypeTestCase extends junit.framework.TestCase {
DocumentTypeManager typeManager = new DocumentTypeManager();
DocumentType child = new DocumentType("child");
- //typeManager.register(child);
-
- /*
- ListIterator inherited = child.inheritedIterator();
- assertTrue(inherited.hasNext());
- assertEquals(new DataTypeName("document", 0), inherited.next());
- assertTrue(!inherited.hasNext());
- */
Iterator inherited;
child.addField("childfield", DataType.INT);
@@ -104,4 +94,5 @@ public class DocumentTypeTestCase extends junit.framework.TestCase {
// TODO: Test uninheriting
}
+
}
diff --git a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
index 0d73138e077..3fbea80c54b 100644
--- a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
@@ -8,7 +8,7 @@ import com.yahoo.document.serialization.*;
import java.io.FileOutputStream;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class SerializationTestCase extends junit.framework.TestCase {