Non-functional changes only

6 files changed, 26 insertions, 26 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokenRegistry.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokenRegistry.java
index 53fc552204f..be2d9f9f68b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokenRegistry.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokenRegistry.java
@@ -21,7 +21,7 @@ import java.util.logging.Logger;
 public class SpecialTokenRegistry {
 
     /** The log of this */
-    private static Logger log = Logger.getLogger(SpecialTokens.class.getName());
+    private static final Logger log = Logger.getLogger(SpecialTokenRegistry.class.getName());
 
     private static final SpecialTokens nullSpecialTokens = new SpecialTokens();
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
index 95a374316de..f45ecefefa6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
@@ -10,7 +10,7 @@ import java.util.logging.Logger;
 import static com.yahoo.language.LinguisticsCase.toLowerCase;
 
 /**
- * A list of special tokens - string that should be threated as word
+ * A list of special tokens - string that should be treated as word
  * no matter what they contain. Special tokens are case insensitive.
  *
  * @author bratseth
@@ -19,9 +19,9 @@ public class SpecialTokens {
 
     private static final Logger log = Logger.getLogger(SpecialTokens.class.getName());
 
-    private String name;
+    private final String name;
 
-    private List<SpecialToken> specialTokens = new ArrayList<>();
+    private final List<SpecialToken> specialTokens = new ArrayList<>();
 
     private boolean frozen = false;
 
@@ -45,8 +45,7 @@ public class SpecialTokens {
      * Adds a special token to this
      *
      * @param token the special token string to add
-     * @param replace the token to replace instances of the special token with,
-     *        or null to keep the token
+     * @param replace the token to replace instances of the special token with, or null to keep the token
      */
     public void addSpecialToken(String token, String replace) {
         ensureNotFrozen();
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java
index 5e243e52057..2dc2254df68 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java
@@ -7,7 +7,6 @@ import com.yahoo.prelude.Index;
 import com.yahoo.prelude.IndexFacts;
 import com.yahoo.prelude.query.Substring;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -20,7 +19,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.*;
  */
 public final class Tokenizer {
 
-    private List<Token> tokens = new java.util.ArrayList<>();
+    private final List<Token> tokens = new java.util.ArrayList<>();
 
     private String source;
 
@@ -38,7 +37,7 @@ public final class Tokenizer {
 
     /** Creates a tokenizer which initializes from a given Linguistics */
     public Tokenizer(Linguistics linguistics) {
-        this.characterClasses=linguistics.getCharacterClasses();
+        this.characterClasses = linguistics.getCharacterClasses();
     }
 
     /**
@@ -224,9 +223,7 @@ public final class Tokenizer {
     }
 
     private SpecialTokens.SpecialToken getSpecialToken(int start) {
-        if (specialTokens == null) {
-            return null;
-        }
+        if (specialTokens == null) return null;
         return specialTokens.tokenize(source.substring(start), substringSpecialTokens);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
index 4b7d5dc766d..8d1f8212dbf 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
@@ -138,7 +138,7 @@ public class FederationSearcher extends ForkingSearcher {
                 }
             }
 
-            //Allow source groups to use by default.
+            // Allow source groups to use by default.
             if (target.useByDefault())
                 builder.useTargetByDefault(target.id());
         }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
index 97ceee96dfc..36f6fe424a0 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SearchChainResolver.java
@@ -46,14 +46,12 @@ public class SearchChainResolver {
 
     public static class Builder {
 
-        private SortedSet<Target> defaultTargets = new TreeSet<>();
+        private final SortedSet<Target> defaultTargets = new TreeSet<>();
 
-        private final ComponentRegistry<Target> targets = new ComponentRegistry<Target>() {
+        private final ComponentRegistry<Target> targets = new ComponentRegistry<>() {
             @Override
             public void freeze() {
-                for (Target target : allComponents()) {
-                    target.freeze();
-                }
+                allComponents().forEach(Target::freeze);
                 super.freeze();
             }
         };
@@ -70,10 +68,16 @@ public class SearchChainResolver {
             return addSearchChain(searchChainId, new FederationOptions(), documentTypes);
         }
 
-        public Builder addSearchChain(ComponentId searchChainId, FederationOptions federationOptions,
+        public Builder addSearchChain(ComponentId searchChainId,
+                                      FederationOptions federationOptions,
                                       List<String> documentTypes) {
             registerTarget(new SingleTarget(searchChainId,
-                                            new SearchChainInvocationSpec(searchChainId, null, null, federationOptions, documentTypes), false));
+                                            new SearchChainInvocationSpec(searchChainId,
+                                                                          null,
+                                                                          null,
+                                                                          federationOptions,
+                                                                          documentTypes),
+                                            false));
             return this;
         }
 
@@ -86,8 +90,8 @@ public class SearchChainResolver {
         }
 
         public Builder addSourceForProvider(ComponentId sourceId, ComponentId providerId, ComponentId searchChainId,
-                                         boolean isDefaultProviderForSource, FederationOptions federationOptions,
-                                         List<String> documentTypes) {
+                                            boolean isDefaultProviderForSource, FederationOptions federationOptions,
+                                            List<String> documentTypes) {
 
             SearchChainInvocationSpec searchChainInvocationSpec =
                     new SearchChainInvocationSpec(searchChainId, sourceId, providerId, federationOptions, documentTypes);
@@ -158,4 +162,5 @@ public class SearchChainResolver {
     public SortedSet<Target> defaultTargets() {
         return defaultTargets;
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java
index bf4ca9c2a9e..516ee9f968f 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/SourceRefResolver.java
@@ -22,13 +22,12 @@ public class SourceRefResolver {
     public SourceRefResolver(SearchChainResolver searchChainResolver) {
         this.searchChainResolver = searchChainResolver;
     }
+
     public Set<SearchChainInvocationSpec> resolve(ComponentSpecification sourceRef,
                                                   Properties sourceToProviderMap,
-                                                  IndexFacts indexFacts)
-            throws UnresolvedSearchChainException {
-
+                                                  IndexFacts indexFacts) throws UnresolvedSearchChainException {
         try {
-            return new LinkedHashSet<>(Arrays.asList(searchChainResolver.resolve(sourceRef, sourceToProviderMap)));
+            return new LinkedHashSet<>(List.of(searchChainResolver.resolve(sourceRef, sourceToProviderMap)));
         } catch (UnresolvedSourceRefException e) {
             return resolveClustersWithDocument(sourceRef, sourceToProviderMap, indexFacts);
         }