Nonfunctional changes only

3 files changed, 12 insertions, 14 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/Item.java b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
index d9f0dcb7b1c..5a43e65094a 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/Item.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
@@ -68,22 +68,24 @@ public abstract class Item implements Cloneable {
 
     public static final int DEFAULT_WEIGHT = 100;
 
-    /** The relative importancy of this term in the query. Default is 100 */
+    /** The relative importance of this term in the query. Default is 100 */
     private int weight = DEFAULT_WEIGHT;
 
     /**
      * The definitions in Item.ItemCreator must match the ones in
      * searchlib/src/searchlib/parsequery/parse.h
      */
-    public static enum ItemCreator {
+    public enum ItemCreator {
+
         ORIG(0),
         FILTER(1);
 
         public final int code;
 
-        private ItemCreator(int code) {
+        ItemCreator(int code) {
             this.code = code;
         }
+
     }
 
     private boolean fromSpecialToken = false;
diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
index ae54165abef..808d4f43682 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/item/ItemInitializer.java
@@ -15,6 +15,7 @@ import java.util.Map;
  * @author tonytv
  */
 public class ItemInitializer {
+
     private static final String indexProperty = "index";
     private static final String idProperty = "id";
     private static final String significanceProperty = "significance";
diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
index 17a6bb8f1a2..cc0e816852b 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
@@ -1454,25 +1454,20 @@ public class YqlParser implements Parser {
     }
 
     @NonNull
-    private <T extends TaggableItem> T leafStyleSettings(OperatorNode<?> ast,
-            @NonNull
-            T out) {
+    private <T extends TaggableItem> T leafStyleSettings(OperatorNode<?> ast, @NonNull T out) {
         {
-            Map<?, ?> connectivity = getAnnotation(ast, CONNECTIVITY,
-                    Map.class, null, "connectivity settings");
+            Map<?, ?> connectivity = getAnnotation(ast, CONNECTIVITY, Map.class, null, "connectivity settings");
             if (connectivity != null) {
                 connectedItems.add(new ConnectedItem(out, getMapValue(
                         CONNECTIVITY, connectivity, CONNECTION_ID,
                         Integer.class), getMapValue(CONNECTIVITY, connectivity,
                         CONNECTION_WEIGHT, Number.class).doubleValue()));
             }
-            Number significance = getAnnotation(ast, SIGNIFICANCE,
-                    Number.class, null, "term significance");
+            Number significance = getAnnotation(ast, SIGNIFICANCE, Number.class, null, "term significance");
             if (significance != null) {
                 out.setSignificance(significance.doubleValue());
             }
-            Integer uniqueId = getAnnotation(ast, UNIQUE_ID, Integer.class,
-                    null, "term ID", false);
+            Integer uniqueId = getAnnotation(ast, UNIQUE_ID, Integer.class, null, "term ID", false);
             if (uniqueId != null) {
                 out.setUniqueID(uniqueId);
                 identifiedItems.put(uniqueId, out);
@@ -1480,8 +1475,8 @@ public class YqlParser implements Parser {
         }
         {
             Item leaf = (Item) out;
-            Map<?, ?> itemAnnotations = getAnnotation(ast, ANNOTATIONS,
-                    Map.class, Collections.emptyMap(), "item annotation map");
+            Map<?, ?> itemAnnotations = getAnnotation(ast, ANNOTATIONS, 
+                                                      Map.class, Collections.emptyMap(), "item annotation map");
             for (Map.Entry<?, ?> entry : itemAnnotations.entrySet()) {
                 Preconditions.checkArgument(entry.getKey() instanceof String,
                         "Expected String annotation key, got %s.", entry