Merge pull request #23109 from vespa-engine/bratseth/cleanup-579

No functional changes

4 files changed, 8 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/processing/DictionaryProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/DictionaryProcessor.java
index 3209fd1703d..9c6c446b82d 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/DictionaryProcessor.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/DictionaryProcessor.java
@@ -19,9 +19,11 @@ import com.yahoo.vespa.model.container.search.QueryProfiles;
  * @author baldersheim
  */
 public class DictionaryProcessor extends Processor {
+
     public DictionaryProcessor(Schema schema, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) {
         super(schema, deployLogger, rankProfileRegistry, queryProfiles);
     }
+
     @Override
     public void process(boolean validate, boolean documentsOnly) {
         for (SDField field : schema.allConcreteFields()) {
@@ -51,4 +53,5 @@ public class DictionaryProcessor extends Processor {
             }
         }
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java
index 1956b87a689..45a546259ae 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java
@@ -62,7 +62,7 @@ public class DictionaryTestCase {
     Schema verifyDictionaryControl(Dictionary.Type expected, String type, String ... cfg) throws ParseException
     {
         String def = TestUtil.joinLines(
-                "search test {",
+                "schema test {",
                 "    document test {",
                 "        field n1 type " + type + " {",
                 "            indexing: summary | attribute",
diff --git a/document/src/main/java/com/yahoo/document/ReferenceDataType.java b/document/src/main/java/com/yahoo/document/ReferenceDataType.java
index 8cf6b665acf..ee1afa086d7 100644
--- a/document/src/main/java/com/yahoo/document/ReferenceDataType.java
+++ b/document/src/main/java/com/yahoo/document/ReferenceDataType.java
@@ -16,7 +16,7 @@ public class ReferenceDataType extends DataType {
     // Magic number for Identifiable, see document/util/identifiable.h
     public static final int classId = registerClass(Ids.document + 68, ReferenceDataType.class);
 
-    private StructuredDataType targetType;
+    private final StructuredDataType targetType;
 
     public ReferenceDataType(DocumentType targetType, int id) {
         this((StructuredDataType)targetType, id);
diff --git a/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java
index b76c3f2989f..ebc39b14eb1 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java
@@ -49,6 +49,7 @@ public class ReferenceFieldValue extends FieldValue {
     /**
      * Creates a reference pointing to a particular document instance in the document
      * type referenced by <code>referenceType</code>.
+     *
      * @param referenceType reference target type
      * @param documentId document ID of the same document type as that given by <code>referenceType</code>
      * @throws IllegalArgumentException if documentId is not of the expected document type
@@ -64,7 +65,7 @@ public class ReferenceFieldValue extends FieldValue {
     }
 
     private static void requireIdOfMatchingType(ReferenceDataType referenceType, DocumentId id) {
-        final String expectedTypeName = referenceType.getTargetType().getName();
+        String expectedTypeName = referenceType.getTargetType().getName();
         if (!id.getDocType().equals(expectedTypeName)) {
             throw new IllegalArgumentException(String.format(
                     "Can't assign document ID '%s' (of type '%s') to reference of document type '%s'",
@@ -87,9 +88,7 @@ public class ReferenceFieldValue extends FieldValue {
     }
 
     @Override
-    public void printXml(XmlStream xml) {
-        // TODO do we need/want this?
-    }
+    public void printXml(XmlStream xml) { }
 
     @Override
     public void clear() {