Nonfunctional changes only

5 files changed, 27 insertions, 17 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetLanguage.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetLanguage.java
index 5b872e9db5e..38c1d1a94d3 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetLanguage.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetLanguage.java
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Check that no text field appears before a field that sets language.
  *
- * @author <a href="mailto:gunnarga@yahoo-inc.com">Gunnar Gauslaa Bergem</a>
+ * @author Gunnar Gauslaa Bergem
  */
 public class SetLanguage extends Processor {
 
@@ -32,13 +32,12 @@ public class SetLanguage extends Processor {
                 textFieldsWithoutLanguage.add(field.getName());
             }
             if (field.containsExpression(SetLanguageExpression.class) && !textFieldsWithoutLanguage.isEmpty()) {
-                StringBuffer fieldString = new StringBuffer();
+                StringBuilder fieldString = new StringBuilder();
                 for (String fieldName : textFieldsWithoutLanguage) {
                     fieldString.append(fieldName).append(" ");
                 }
                 warn(search, field, "Field '" + field.getName() + "' sets the language for this document, " +
-                        "and should be defined as the first field in the searchdefinition. If you have both header and body fields, this field "+
-                        "should be header, if you require it to affect subsequent header fields and/or any body fields. " +
+                        "and should be defined as the first field in the searchdefinition." +
                         "Preceding text fields that will not have their language set: " +
                         fieldString.toString() +
                         " (This warning is omitted for any subsequent fields that also do set_language.)");
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
index 0c0a83cdf1b..2f02c9fd19f 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
@@ -2,11 +2,12 @@
 package com.yahoo.vespa.indexinglanguage.expressions;
 
 import com.yahoo.document.DataType;
-import com.yahoo.document.DocumentType;
 import com.yahoo.language.Language;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * Sets the language in the execution context.
+ *
+ * @author Simon Thoresen
  */
 public class SetLanguageExpression extends Expression {
 
@@ -47,4 +48,5 @@ public class SetLanguageExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageTestCase.java
index c69af6ba0f2..270c6ab4386 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageTestCase.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public class SetLanguageTestCase {
 
@@ -34,10 +34,19 @@ public class SetLanguageTestCase {
     }
 
     @Test
-    public void requireThatLanguageIsSet() {
+    public void testsettingEnglish() {
         ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
         ctx.setValue(new StringFieldValue("en"));
         new SetLanguageExpression().execute(ctx);
         assertEquals(Language.ENGLISH, ctx.getLanguage());
     }
+
+    @Test
+    public void testSettingUnknown() {
+        ExecutionContext ctx = new ExecutionContext(new SimpleTestAdapter());
+        ctx.setValue(new StringFieldValue("unknown"));
+        new SetLanguageExpression().execute(ctx);
+        assertEquals(Language.UNKNOWN, ctx.getLanguage());
+    }
+
 }
diff --git a/linguistics/src/main/java/com/yahoo/language/Language.java b/linguistics/src/main/java/com/yahoo/language/Language.java
index df1685433fa..ab8bcd4459f 100644
--- a/linguistics/src/main/java/com/yahoo/language/Language.java
+++ b/linguistics/src/main/java/com/yahoo/language/Language.java
@@ -8,7 +8,7 @@ import java.util.Locale;
 import java.util.Map;
 
 /**
- * @author rpito
+ * @author Rich Pito
  */
 public enum Language {
 
@@ -87,14 +87,14 @@ public enum Language {
     /** Language tag "chr". */
     CHEROKEE("chr"),
 
-    /** 
+    /**
      * Language tag "zh-hans".
      *
      * @see #fromLocale(Locale)
      */
     CHINESE_SIMPLIFIED("zh-hans"),
 
-    /** 
+    /**
      * Language tag "zh-hant".
      *
      * @see #fromLocale(Locale)
@@ -173,7 +173,7 @@ public enum Language {
     /** Language tag "ha". */
     HAUSA("ha"),
 
-    /** 
+    /**
      * Language tag "he".
      *
      * @see #fromLocale(Locale)
@@ -189,7 +189,7 @@ public enum Language {
     /** Language tag "is". */
     ICELANDIC("is"),
 
-    /** 
+    /**
      * Language tag "id".
      *
      * @see #fromLocale(Locale)
@@ -298,7 +298,7 @@ public enum Language {
     /** Language tag "ne". */
     NEPALI("ne"),
 
-    /** 
+    /**
      * Language tag "nb".
      *
      * @see #fromLocale(Locale)
@@ -476,7 +476,7 @@ public enum Language {
     /** Language tag "xh". */
     XHOSA("xh"),
 
-    /** 
+    /**
      * Language tag "yi".
      *
      * @see #fromLocale(Locale)
diff --git a/linguistics/src/main/java/com/yahoo/language/LocaleFactory.java b/linguistics/src/main/java/com/yahoo/language/LocaleFactory.java
index 552dd611b1f..2bc510bb038 100644
--- a/linguistics/src/main/java/com/yahoo/language/LocaleFactory.java
+++ b/linguistics/src/main/java/com/yahoo/language/LocaleFactory.java
@@ -4,7 +4,7 @@ package com.yahoo.language;
 import java.util.Locale;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public final class LocaleFactory {
 
@@ -15,7 +15,7 @@ public final class LocaleFactory {
     }
 
     /**
-     * <p>Implements a simple parser for RFC5646 language tags. The language tag is parsed into a Locale.</p>
+     * Implements a simple parser for RFC5646 language tags. The language tag is parsed into a Locale.
      *
      * @param tag The language tag to parse.
      * @return The corrseponding Locale.