Don't output value

2 files changed, 4 insertions, 5 deletions

diff --git a/document/src/main/java/com/yahoo/document/annotation/Annotation.java b/document/src/main/java/com/yahoo/document/annotation/Annotation.java
index 012e21ecb85..237ca6db58b 100644
--- a/document/src/main/java/com/yahoo/document/annotation/Annotation.java
+++ b/document/src/main/java/com/yahoo/document/annotation/Annotation.java
@@ -221,9 +221,9 @@ public class Annotation implements Comparable<Annotation> {
 
     @Override
     public String toString() {
-        return type.getName() +  " annotation, " +
-               (value == null ? "no value" : "value '" + value + "'") + ", " +
-               (spanNode == null ? "no span" : "span " + spanNode);
+        return type + " annotation " +
+               ((value == null) ? " (no value)" : " (with value)") +
+               ((spanNode == null) ? " (no span)" : (" with span "+spanNode));
     }
 
 
diff --git a/document/src/main/java/com/yahoo/document/datatypes/Struct.java b/document/src/main/java/com/yahoo/document/datatypes/Struct.java
index 0b1bbf5d3ca..bb54b41069b 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Struct.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Struct.java
@@ -218,8 +218,7 @@ public class Struct extends StructuredFieldValue {
         StringBuilder retVal = new StringBuilder();
         retVal.append("Struct (").append(getDataType()).append("): ");
         int [] increasing = getInOrder();
-        for (int i = 0; i < increasing.length; i++) {
-            int id = increasing[i];
+        for (int id : increasing) {
             retVal.append(getDataType().getField(id)).append("=").append(values.get(id)).append(", ");
         }
         return retVal.toString();