Use named constants instead of strings sprinkled all over.

6 files changed, 24 insertions, 33 deletions

diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java
index f73fd634e0e..af4aa62f21f 100755
--- a/document/src/main/java/com/yahoo/document/DocumentType.java
+++ b/document/src/main/java/com/yahoo/document/DocumentType.java
@@ -4,6 +4,7 @@ package com.yahoo.document;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.yahoo.document.datatypes.FieldValue;
+import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.document.serialization.DocumentWriter;
 import com.yahoo.vespa.objects.Ids;
 import com.yahoo.vespa.objects.ObjectVisitor;
@@ -34,7 +35,6 @@ import java.util.Set;
 // TODO: Remove header/body concept on Vespa 8
 public class DocumentType extends StructuredDataType {
 
-    private static final String ALL = "[all]";
     public static final String DOCUMENT = "[document]";
     public static final int classId = registerClass(Ids.document + 58, DocumentType.class);
     private StructDataType headerType;
@@ -215,8 +215,8 @@ public class DocumentType extends StructuredDataType {
 
             this.fieldSets.put(entry.getKey(), ImmutableSet.copyOf(fields));
         }
-        if ( ! this.fieldSets.containsKey(ALL)) {
-            this.fieldSets.put(ALL, getAllUniqueFields());
+        if ( ! this.fieldSets.containsKey(AllFields.NAME)) {
+            this.fieldSets.put(AllFields.NAME, getAllUniqueFields());
         }
     }
 
@@ -454,7 +454,7 @@ public class DocumentType extends StructuredDataType {
      * @return an unmodifiable snapshot of the all fields in this type
      */
     public Set<Field> fieldSetAll() {
-        return fieldSet(ALL);
+        return fieldSet(AllFields.NAME);
     }
 
     public Set<Field> fieldSet(String name) {
diff --git a/document/src/main/java/com/yahoo/document/fieldset/AllFields.java b/document/src/main/java/com/yahoo/document/fieldset/AllFields.java
index 7087e959328..247d2829124 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/AllFields.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/AllFields.java
@@ -2,13 +2,10 @@
 package com.yahoo.document.fieldset;
 
 /**
- * Created with IntelliJ IDEA.
- * User: thomasg
- * Date: 4/25/12
- * Time: 3:18 PM
- * To change this template use File | Settings | File Templates.
+ * @author Thomas Gundersen
  */
 public class AllFields implements FieldSet {
+    public static final String NAME = "[all]";
     @Override
     public boolean contains(FieldSet o) {
         return true;
diff --git a/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java b/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java
index 29b8348d501..eeac213e2b4 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java
@@ -2,13 +2,10 @@
 package com.yahoo.document.fieldset;
 
 /**
- * Created with IntelliJ IDEA.
- * User: thomasg
- * Date: 4/25/12
- * Time: 3:21 PM
- * To change this template use File | Settings | File Templates.
+ * @author Thomas Gundersen
  */
 public class DocIdOnly implements FieldSet {
+    public static final String NAME = "[id]";
     @Override
     public boolean contains(FieldSet o) {
         return (o instanceof DocIdOnly || o instanceof NoFields);
diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
index 862a374f182..285c78ef0ab 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
@@ -20,9 +20,9 @@ public class FieldSetRepo {
 
     FieldSet parseSpecialValues(String name)
     {
-        if (name.equals("[id]")) { return new DocIdOnly(); }
-        else if (name.equals("[all]")) { return (new AllFields()); }
-        else if (name.equals("[none]")) { return (new NoFields()); }
+        if (name.equals(DocIdOnly.NAME)) { return new DocIdOnly(); }
+        else if (name.equals(AllFields.NAME)) { return (new AllFields()); }
+        else if (name.equals(NoFields.NAME)) { return (new NoFields()); }
         else if (name.equals("[docid]")) { return (new DocIdOnly()); }
         else {
             throw new IllegalArgumentException(
@@ -93,11 +93,11 @@ public class FieldSetRepo {
 
             return buffer.toString();
         } else if (fieldSet instanceof AllFields) {
-            return "[all]";
+            return AllFields.NAME;
         } else if (fieldSet instanceof NoFields) {
-            return "[none]";
+            return NoFields.NAME;
         } else if (fieldSet instanceof DocIdOnly) {
-            return "[docid]";
+            return DocIdOnly.NAME;
         } else {
             throw new IllegalArgumentException("Unknown field set type " + fieldSet);
         }
diff --git a/document/src/main/java/com/yahoo/document/fieldset/NoFields.java b/document/src/main/java/com/yahoo/document/fieldset/NoFields.java
index fe3426db143..91663067db0 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/NoFields.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/NoFields.java
@@ -2,13 +2,10 @@
 package com.yahoo.document.fieldset;
 
 /**
- * Created with IntelliJ IDEA.
- * User: thomasg
- * Date: 4/25/12
- * Time: 3:18 PM
- * To change this template use File | Settings | File Templates.
+ * @author Thomas Gundersen
  */
 public class NoFields implements FieldSet {
+    public static final String NAME = "[none]";
     @Override
     public boolean contains(FieldSet o) {
         return (o instanceof NoFields);
diff --git a/document/src/test/java/com/yahoo/document/fieldset/FieldSetTestCase.java b/document/src/test/java/com/yahoo/document/fieldset/FieldSetTestCase.java
index 5219285fbba..fa0e3c82d01 100644
--- a/document/src/test/java/com/yahoo/document/fieldset/FieldSetTestCase.java
+++ b/document/src/test/java/com/yahoo/document/fieldset/FieldSetTestCase.java
@@ -31,9 +31,9 @@ public class FieldSetTestCase extends DocumentTestCaseBase {
     public void testParsing() {
         FieldSetRepo repo = new FieldSetRepo();
 
-        assertTrue(repo.parse(docMan, "[all]") instanceof AllFields);
-        assertTrue(repo.parse(docMan, "[none]") instanceof NoFields);
-        assertTrue(repo.parse(docMan, "[id]") instanceof DocIdOnly);
+        assertTrue(repo.parse(docMan, AllFields.NAME) instanceof AllFields);
+        assertTrue(repo.parse(docMan, NoFields.NAME) instanceof NoFields);
+        assertTrue(repo.parse(docMan, DocIdOnly.NAME) instanceof DocIdOnly);
 
         FieldCollection collection = (FieldCollection)repo.parse(docMan, "testdoc:stringattr,intattr");
         assertEquals(2, collection.size());
@@ -123,7 +123,7 @@ public class FieldSetTestCase extends DocumentTestCaseBase {
         Document doc = getTestDocument();
         doc.removeFieldValue("rawattr");
 
-        assertEquals("floatattr:3.56,stringattr:tjohei,intattr:50,byteattr:30", doCopyFields(doc, "[all]"));
+        assertEquals("floatattr:3.56,stringattr:tjohei,intattr:50,byteattr:30", doCopyFields(doc, AllFields.NAME));
         assertEquals("floatattr:3.56,byteattr:30", doCopyFields(doc, "testdoc:floatattr,byteattr"));
     }
 
@@ -139,7 +139,7 @@ public class FieldSetTestCase extends DocumentTestCaseBase {
         Document doc = getTestDocument();
         doc.removeFieldValue("rawattr");
 
-        assertEquals("floatattr:3.56,stringattr:tjohei,intattr:50,byteattr:30", doStripFields(doc, "[all]"));
+        assertEquals("floatattr:3.56,stringattr:tjohei,intattr:50,byteattr:30", doStripFields(doc, AllFields.NAME));
         assertEquals("floatattr:3.56,byteattr:30", doStripFields(doc, "testdoc:floatattr,byteattr"));
     }
 
@@ -147,9 +147,9 @@ public class FieldSetTestCase extends DocumentTestCaseBase {
     public void testSerialize() {
         String fieldSets[] =
                 {
-                        "[all]",
-                        "[none]",
-                        "[docid]",
+                        AllFields.NAME,
+                        NoFields.NAME,
+                        DocIdOnly.NAME,
                         "testdoc:rawattr",
                         "testdoc:rawattr,intattr"
                 };