Random fixup while navigating code.

4 files changed, 9 insertions, 24 deletions

diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java
index cf0951fb035..375d8d962a5 100644
--- a/document/src/main/java/com/yahoo/document/Document.java
+++ b/document/src/main/java/com/yahoo/document/Document.java
@@ -15,14 +15,13 @@ import com.yahoo.document.serialization.SerializationException;
 import com.yahoo.document.serialization.XmlSerializationHelper;
 import com.yahoo.document.serialization.XmlStream;
 import com.yahoo.io.GrowableByteBuffer;
-import com.yahoo.vespa.objects.BufferSerializer;
 import com.yahoo.vespa.objects.Ids;
 import com.yahoo.vespa.objects.Serializer;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -228,7 +227,7 @@ public class Document extends StructuredFieldValue {
 
     @Override
     public Iterator<Map.Entry<Field, FieldValue>> iterator() {
-        return new Iterator<Map.Entry<Field, FieldValue>>() {
+        return new Iterator<>() {
 
             private Iterator<Map.Entry<Field, FieldValue>> headerIt = header.iterator();
             private Iterator<Map.Entry<Field, FieldValue>> bodyIt = body.iterator();
@@ -259,7 +258,7 @@ public class Document extends StructuredFieldValue {
     }
 
     public String toString() {
-        return "document '" + String.valueOf(docId) + "' of type '" + getDataType().getName() + "'";
+        return "document '" + docId + "' of type '" + getDataType().getName() + "'";
     }
 
     public String toXML(String indent) {
@@ -293,11 +292,7 @@ public class Document extends StructuredFieldValue {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         JsonWriter writer = new JsonWriter(buffer);
         writer.write(this);
-        try {
-            return buffer.toString("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        return buffer.toString(StandardCharsets.UTF_8);
     }
 
     /** Returns true if the argument is a document which has the same set of values */
diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java
index f04c93b61ef..3a99c216c3f 100755
--- a/document/src/main/java/com/yahoo/document/DocumentType.java
+++ b/document/src/main/java/com/yahoo/document/DocumentType.java
@@ -71,9 +71,7 @@ public class DocumentType extends StructuredDataType {
         type.headerType = headerType.clone();
         type.bodyType = bodyType.clone();
         type.inherits = new ArrayList<>(inherits.size());
-        for (DocumentType inherited : inherits) {
-            type.inherits.add(inherited);
-        }
+        type.inherits.addAll(inherits);
         return type;
     }
 
@@ -415,7 +413,7 @@ public class DocumentType extends StructuredDataType {
      * @return An iterator for iterating the fields in this documenttype.
      */
     public Iterator<Field> fieldIteratorThisTypeOnly() {
-        return new Iterator<Field>() {
+        return new Iterator<>() {
             Iterator<Field> headerIt = headerType.getFields().iterator();
             Iterator<Field> bodyIt = bodyType.getFields().iterator();
 
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 27bd2a878c7..7087e959328 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/AllFields.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/AllFields.java
@@ -15,7 +15,7 @@ public class AllFields implements FieldSet {
     }
 
     @Override
-    public FieldSet clone() throws CloneNotSupportedException {
+    public FieldSet clone() {
         return new AllFields();
     }
 }
diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java b/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java
index 1f8e32613c5..f787f828c94 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java
@@ -1,19 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
-import com.yahoo.document.Document;
-import com.yahoo.document.Field;
-import com.yahoo.document.datatypes.FieldValue;
-
-import java.lang.Object;
-import java.util.Iterator;
-import java.util.Map;
-
 /**
  * TODO: Move to Java and implement.
  */
 public interface FieldSet {
-    public boolean contains(FieldSet o);
+    boolean contains(FieldSet o);
 
-    public FieldSet clone() throws CloneNotSupportedException;
+    FieldSet clone() throws CloneNotSupportedException;
 }