summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2018-02-09 12:43:54 +0100
committerGitHub <noreply@github.com>2018-02-09 12:43:54 +0100
commit8d490683a1fea3fa31aca2f9444c30f2fae421b5 (patch)
tree252f599302435ee0136bf43945a5a692c4e1dde8
parent4f55d543f0569d992a21f69b4b3c1309790de74d (diff)
parent522947aab9fd2e5576ded21840883cea4b3a271d (diff)
Merge pull request #4993 from vespa-engine/bratseth/nonfunctional-changes
Nonfunctional changes
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java4
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/TextMatch.java2
-rw-r--r--indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java2
3 files changed, 3 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java
index 1de7ce62df7..2bfc7a418de 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java
@@ -29,9 +29,7 @@ public class ExactMatch extends Processor {
public void process() {
for (SDField field : search.allConcreteFields()) {
Matching.Type matching = field.getMatching().getType();
- if (matching.equals(Matching.Type.EXACT) ||
- matching.equals(Matching.Type.WORD))
- {
+ if (matching.equals(Matching.Type.EXACT) || matching.equals(Matching.Type.WORD)) {
implementExactMatch(field, search);
} else if (field.getMatching().getExactMatchTerminator() != null) {
warn(search, field, "exact-terminator requires 'exact' matching to have any effect.");
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TextMatch.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TextMatch.java
index a4d7b1b4054..02655906f65 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TextMatch.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/TextMatch.java
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
/**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
*/
public class TextMatch extends Processor {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
index b01bd96e506..e60ba141c9b 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
@@ -11,7 +11,7 @@ import com.yahoo.vespa.objects.ObjectOperation;
import com.yahoo.vespa.objects.ObjectPredicate;
/**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
*/
public class ForEachExpression extends CompositeExpression {