Nonfunctional changes only

3 files changed, 16 insertions, 18 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
index fb56e10445a..5051108ea9b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
@@ -196,14 +196,14 @@ public abstract class AbstractParser implements CustomParser {
      * @param input The string to normalize.
      * @return The normalized string.
      */
-    protected String normalize(final String input) {
+    protected String normalize(String input) {
         if (input == null || input.length() == 0) {
             return input;
         }
         return environment.getLinguistics().getNormalizer().normalize(input);
     }
 
-    protected void setState(final Language queryLanguage, IndexFacts.Session indexFacts) {
+    protected void setState(Language queryLanguage, IndexFacts.Session indexFacts) {
         this.indexFacts = indexFacts;
         language = queryLanguage;
         submodes.reset();
@@ -229,18 +229,18 @@ public abstract class AbstractParser implements CustomParser {
      * @param unwashed The item whose phrases to simplify.
      * @return The simplified item.
      */
-    public static Item simplifyPhrases(final Item unwashed) {
+    public static Item simplifyPhrases(Item unwashed) {
         if (unwashed == null) {
             return unwashed;
         } else if (unwashed instanceof PhraseItem) {
             return collapsePhrase((PhraseItem) unwashed);
         } else if (unwashed instanceof CompositeItem) {
-            final CompositeItem composite = (CompositeItem) unwashed;
-            final ListIterator<Item> i = composite.getItemIterator();
+            CompositeItem composite = (CompositeItem) unwashed;
+            ListIterator<Item> i = composite.getItemIterator();
 
             while (i.hasNext()) {
-                final Item original = i.next();
-                final Item transformed = simplifyPhrases(original);
+                Item original = i.next();
+                Item transformed = simplifyPhrases(original);
 
                 if (original != transformed) {
                     i.set(transformed);
@@ -252,11 +252,10 @@ public abstract class AbstractParser implements CustomParser {
         }
     }
 
-    private static Item collapsePhrase(final PhraseItem phrase) {
+    private static Item collapsePhrase(PhraseItem phrase) {
         if (phrase.getItemCount() == 1 && phrase.getItem(0) instanceof WordItem) {
             // TODO: Other stuff which needs propagation?
-            final WordItem word = (WordItem) phrase.getItem(0);
-
+            WordItem word = (WordItem) phrase.getItem(0);
             word.setWeight(phrase.getWeight());
             return word;
         } else {
@@ -270,8 +269,8 @@ public abstract class AbstractParser implements CustomParser {
     // internally
     // -JSB
     // TODO: Use segmenting for forced phrase searches?
-    protected Item segment(final Token token) {
-        final String normalizedToken = normalize(token.toString());
+    protected Item segment(Token token) {
+        String normalizedToken = normalize(token.toString());
 
         if (token.isSpecial()) {
             final WordItem w = new WordItem(token.toString(), true, token.substring);
@@ -294,11 +293,10 @@ public abstract class AbstractParser implements CustomParser {
             return new WordItem(segments.get(0), "", true, token.substring);
         }
 
-        final CompositeItem composite = new PhraseSegmentItem(token.toString(),
-                normalizedToken, true, false, token.substring);
+        CompositeItem composite = new PhraseSegmentItem(token.toString(), normalizedToken, true, false, token.substring);
         int n = 0;
-        for (final String segment : segments) {
-            final WordItem w = new WordItem(segment, "", true, token.substring);
+        for (String segment : segments) {
+            WordItem w = new WordItem(segment, "", true, token.substring);
             w.setFromSegmented(true);
             w.setSegmentIndex(n++);
             w.setStemmed(false);
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java
index 3043cb27247..e0089fb89ea 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java
@@ -15,7 +15,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.*;
 /**
  * Parser for queries of type any.
  *
- * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class AnyParser extends SimpleParser {
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java
index bf0939d17c1..c155ed4fbbd 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Model.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Model.java
@@ -125,7 +125,7 @@ public class Model implements Cloneable {
      * @return the language determined, never null
      */
     // TODO: We can support multiple languages per query by changing searchers which call this
-    //       to look up the query to use at each point form item.getLanguage
+    //       to look up the query to use at each point from item.getLanguage
     //       with this as fallback for query branches where no parent item specifies language
     public Language getParsingLanguage() {
         Language language = getLanguage();