diff options
Diffstat (limited to 'container-search/src/main/java')
6 files changed, 12 insertions, 23 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java index 14604d61c0a..6f360c8b456 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java @@ -21,8 +21,6 @@ import java.io.IOException; import java.util.Optional; import java.util.logging.Level; -import static com.yahoo.container.util.Util.quote; - /** * The searcher which forwards queries to fdispatch nodes, using the fnet/fs4 * network layer. @@ -160,7 +158,7 @@ public class FastSearcher extends VespaBackEndSearcher { } private static Optional<String> quotedSummaryClass(String summaryClass) { - return Optional.of(summaryClass == null ? "[null]" : quote(summaryClass)); + return Optional.of(summaryClass == null ? "[null]" : "'" + summaryClass + "'"); } public String toString() { 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 0c38b38179d..4b7d5dc766d 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 @@ -58,7 +58,6 @@ import java.util.logging.Logger; import static com.google.common.base.Preconditions.checkNotNull; import static com.yahoo.collections.CollectionUtil.first; -import static com.yahoo.container.util.Util.quote; import static com.yahoo.search.federation.StrictContractsConfig.PropagateSourceProperties; /** @@ -105,7 +104,7 @@ public class FederationSearcher extends ForkingSearcher { ComponentRegistry<TargetSelector> targetSelectors) { if (selectorId.isEmpty()) return null; return checkNotNull(targetSelectors.getComponent(selectorId), - "Missing target selector with id" + quote(selectorId)); + "Missing target selector with id '" + selectorId + "'"); } // for testing 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 ee98d033440..bf4ca9c2a9e 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 @@ -1,17 +1,15 @@ // 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.sourceref; -import static com.yahoo.container.util.Util.quote; +import com.yahoo.component.ComponentSpecification; +import com.yahoo.prelude.IndexFacts; +import com.yahoo.processing.request.Properties; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import com.yahoo.component.ComponentSpecification; -import com.yahoo.prelude.IndexFacts; -import com.yahoo.processing.request.Properties; - /** * Maps a source reference to search chain invocation specs. * @@ -65,9 +63,9 @@ public class SourceRefResolver { return searchChainResolver.resolve(new ComponentSpecification(cluster), sourceToProviderMap); } catch (UnresolvedSearchChainException e) { - throw new UnresolvedSearchChainException("Failed to resolve cluster search chain " + quote(cluster) + - " when using source ref " + quote(sourceRef) + - " as a document name."); + throw new UnresolvedSearchChainException("Failed to resolve cluster search chain '" + cluster + + "' when using source ref '" + sourceRef + + "' as a document name."); } } diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedProviderException.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedProviderException.java index 5075b05454b..2ae923714c7 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedProviderException.java +++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedProviderException.java @@ -4,8 +4,6 @@ package com.yahoo.search.federation.sourceref; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; -import static com.yahoo.container.util.Util.quote; - /** * @author Tony Vaagenes */ @@ -17,6 +15,6 @@ class UnresolvedProviderException extends UnresolvedSearchChainException { static UnresolvedSearchChainException createForMissingProvider(ComponentId source, ComponentSpecification provider) { - return new UnresolvedProviderException("No provider " + quote(provider) + " for source " + quote(source) + "."); + return new UnresolvedProviderException("No provider '" + provider + "' for source '" + source + "'."); } } diff --git a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSourceRefException.java b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSourceRefException.java index 233e92c1699..6f0549eaf93 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSourceRefException.java +++ b/container-search/src/main/java/com/yahoo/search/federation/sourceref/UnresolvedSourceRefException.java @@ -3,8 +3,6 @@ package com.yahoo.search.federation.sourceref; import com.yahoo.component.ComponentSpecification; -import static com.yahoo.container.util.Util.quote; - /** * @author Tony Vaagenes */ @@ -16,6 +14,6 @@ class UnresolvedSourceRefException extends UnresolvedSearchChainException { static UnresolvedSearchChainException createForMissingSourceRef(ComponentSpecification source) { - return new UnresolvedSourceRefException("Could not resolve source ref " + quote(source) + "."); + return new UnresolvedSourceRefException("Could not resolve source ref '" + source + "'."); } } diff --git a/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java b/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java index 3addc1fdb4e..c0f0ee80730 100644 --- a/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java +++ b/container-search/src/main/java/com/yahoo/search/query/ParameterParser.java @@ -3,8 +3,6 @@ package com.yahoo.search.query; import com.yahoo.processing.IllegalInputException; -import static com.yahoo.container.util.Util.quote; - /** * Wrapper class to avoid code duplication of common parsing requirements. * @@ -40,7 +38,7 @@ public class ParameterParser { double multiplier = parseUnit(time.substring(unitOffset)); return (long) (measure * multiplier); } catch (RuntimeException e) { - throw new IllegalInputException("Error parsing " + quote(time), e); + throw new IllegalInputException("Error parsing '" + time + "'", e); } } @@ -55,7 +53,7 @@ public class ParameterParser { } } if (unitOffset == 0) { - throw new IllegalInputException("Invalid number " + quote(time)); + throw new IllegalInputException("Invalid number '" + time + "'"); } return unitOffset; } |