diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-12-04 15:35:40 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-12-04 15:35:40 -0800 |
commit | 0e0e807a86cb367eb1d3d79c14368878b9ea676d (patch) | |
tree | bdeb7ddac2658b02363c8638643010d90a135b0e /container-search/src/main | |
parent | 7700f411ea6f4a3e7c0599fae239ec84c18c0038 (diff) |
Non-functional changes only
Diffstat (limited to 'container-search/src/main')
5 files changed, 25 insertions, 28 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java index 3dabf9bc649..395d8853603 100644 --- a/container-search/src/main/java/com/yahoo/search/Query.java +++ b/container-search/src/main/java/com/yahoo/search/Query.java @@ -226,9 +226,8 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { } public static QueryProfileType getArgumentType() { return argumentType; } - /** The aliases of query properties */ - private static Map<String,CompoundName> propertyAliases; + private static Map<String, CompoundName> propertyAliases; static { Map<String,CompoundName> propertyAliasesBuilder = new HashMap<>(); addAliases(Query.getArgumentType(), propertyAliasesBuilder); 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 499cb634295..6e36881ae63 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 @@ -115,7 +115,8 @@ public class FederationSearcher extends ForkingSearcher { this(searchChainResolver, false, PropagateSourceProperties.ALL, null); } - private FederationSearcher(SearchChainResolver searchChainResolver, boolean strictSearchchain, + private FederationSearcher(SearchChainResolver searchChainResolver, + boolean strictSearchchain, PropagateSourceProperties.Enum propagateSourceProperties, TargetSelector targetSelector) { this.searchChainResolver = searchChainResolver; @@ -295,9 +296,11 @@ public class FederationSearcher extends ForkingSearcher { } } - private Object getSourceOrProviderProperty(Query query, CompoundName propertyName, - String sourceName, String providerName, - Object defaultValue) { + private Object getSourceOrProviderProperty(Query query, + CompoundName propertyName, + String sourceName, + String providerName, + Object defaultValue) { Object result = getProperty(query, new SourceKey(sourceName, propertyName.toString())); if (result == null) result = getProperty(query, new ProviderKey(providerName, propertyName.toString())); diff --git a/container-search/src/main/java/com/yahoo/search/federation/selection/FederationTarget.java b/container-search/src/main/java/com/yahoo/search/federation/selection/FederationTarget.java index 7ade9a0eaf9..8ccbe39cc5a 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/selection/FederationTarget.java +++ b/container-search/src/main/java/com/yahoo/search/federation/selection/FederationTarget.java @@ -1,12 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.federation.selection; -import java.util.Optional; import com.yahoo.component.chain.Chain; import com.yahoo.search.Searcher; import com.yahoo.search.searchchain.model.federation.FederationOptions; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; /** * Represents a search chain that the federation searcher should send a query to, @@ -22,11 +21,8 @@ public final class FederationTarget<T> { private final T customData; public FederationTarget(Chain<Searcher> chain, FederationOptions federationOptions, T customData) { - checkNotNull(chain); - checkNotNull(federationOptions); - - this.chain = chain; - this.federationOptions = federationOptions; + this.chain = Objects.requireNonNull(chain, "chain cannot be null"); + this.federationOptions = Objects.requireNonNull(federationOptions, "federationOptions cannot be null"); this.customData = customData; } @@ -62,9 +58,7 @@ public final class FederationTarget<T> { @Override public int hashCode() { - int result = chain.hashCode(); - result = 31 * result + federationOptions.hashCode(); - return result; + return Objects.hash(chain, federationOptions); } } diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java index ac39e986ff0..a4a82d27f8e 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/PropertyAliases.java @@ -20,14 +20,14 @@ import java.util.Map; public class PropertyAliases extends Properties { /** A map from aliases to standard names */ - private final Map<String,CompoundName> aliases; + private final Map<String, CompoundName> aliases; /** * Creates an instance with a set of aliases. The given aliases will be used directly by this class. * To make this class immutable and thread safe, relinquish ownership of the parameter map. */ - public PropertyAliases(Map<String,CompoundName> aliases) { - this.aliases=aliases; + public PropertyAliases(Map<String, CompoundName> aliases) { + this.aliases = aliases; } /** @@ -42,20 +42,21 @@ public class PropertyAliases extends Properties { } @Override - public Map<String, Object> listProperties(CompoundName property,Map<String,String> context, - com.yahoo.processing.request.Properties substitution) { - return super.listProperties(unalias(property),context,substitution); + public Map<String, Object> listProperties(CompoundName property, + Map<String,String> context, + com.yahoo.processing.request.Properties substitution) { + return super.listProperties(unalias(property), context, substitution); } @Override - public Object get(CompoundName name,Map<String,String> context, + public Object get(CompoundName name, Map<String,String> context, com.yahoo.processing.request.Properties substitution) { return super.get(unalias(name),context,substitution); } @Override - public void set(CompoundName name,Object value,Map<String,String> context) { - super.set(unalias(name),value,context); + public void set(CompoundName name, Object value, Map<String,String> context) { + super.set(unalias(name), value, context); } } diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java index 4cdd4488f7b..c06c84fcc36 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java @@ -38,13 +38,13 @@ public class QueryProperties extends Properties { } public void setParentQuery(Query query) { - this.query=query; + this.query = query; super.setParentQuery(query); } - @SuppressWarnings("deprecation") @Override - public Object get(CompoundName key, Map<String,String> context, + public Object get(CompoundName key, + Map<String,String> context, com.yahoo.processing.request.Properties substitution) { if (key.size() == 2 && key.first().equals(Model.MODEL)) { Model model = query.getModel(); |