diff options
Diffstat (limited to 'container-search')
4 files changed, 14 insertions, 16 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/XMLField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/XMLField.java index 00bdc474119..cbf48d58313 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/XMLField.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/XMLField.java @@ -29,10 +29,6 @@ public class XMLField extends DocsumField { @Override public Object convert(Inspector value) { - /* In Vespa 6 the backend will send an XML-formatted string to represent - * positions data. This will change in next version to sending an object - * or an array of objects instead, suitable for the PositionsData class. - */ if (value.type() == Type.OBJECT || value.type() == Type.ARRAY) { return new PositionsData(value); } diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java index 1657b45b1b4..cf4f5f360ad 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java @@ -8,18 +8,20 @@ import com.yahoo.component.chain.dependencies.Dependencies; import com.yahoo.component.chain.model.ChainedComponentModel; import com.yahoo.search.Searcher; import com.yahoo.search.searchchain.model.federation.FederationSearcherModel; -import com.yahoo.search.searchchain.model.federation.FederationSearcherModel.TargetSpec; -import org.apache.commons.collections.CollectionUtils; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; /** * Defines the searcher models used in the vespa and native search chains, except for federation. * * @author Tony Vaagenes */ -@SuppressWarnings({"rawtypes", "deprecation", "unchecked"}) +@SuppressWarnings({"rawtypes", "unchecked"}) public class VespaSearchers { public static final Collection<ChainedComponentModel> vespaSearcherModels = toSearcherModels( @@ -58,7 +60,7 @@ public class VespaSearchers { private static FederationSearcherModel federationSearcherModel() { return new FederationSearcherModel(new ComponentSpecification("federation"), Dependencies.emptyDependencies(), - Collections.<TargetSpec>emptyList(), true); + Collections.emptyList(), true); } private static boolean allAdded(Collection<ChainedComponentModel> searcherModels, Set<ComponentId> componentIds) { diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java index 316baa26198..0dcfab92a8e 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java @@ -20,7 +20,6 @@ import net.jcip.annotations.Immutable; */ @Immutable public class LocalProviderSpec { - @SuppressWarnings("unchecked") public static final Collection<ChainedComponentModel> searcherModels = toSearcherModels( com.yahoo.prelude.querytransform.CJKSearcher.class, @@ -63,7 +62,7 @@ public class LocalProviderSpec { } @SafeVarargs - private static final Collection<ChainedComponentModel> toSearcherModels(Class<? extends Searcher>... searchers) { + private static Collection<ChainedComponentModel> toSearcherModels(Class<? extends Searcher>... searchers) { List<ChainedComponentModel> searcherModels = new ArrayList<>(); for (Class<? extends Searcher> c : searchers) { diff --git a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java index f326903bff5..30d0bc6f0e1 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java +++ b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java @@ -645,6 +645,7 @@ public class VespaSerializer { } private static class SameElementSerializer extends Serializer { + @Override void onExit(StringBuilder destination, Item item) { } @@ -654,7 +655,6 @@ public class VespaSerializer { } static boolean serialize(StringBuilder destination, Item item, boolean includeField) { - SameElementItem sameElement = (SameElementItem) item; if (includeField) { @@ -669,10 +669,11 @@ public class VespaSerializer { Item current = sameElement.getItem(i); if (current instanceof WordItem) { new WordSerializer().serialize(destination, current); + } else if (current instanceof IntItem) { + new NumberSerializer().serialize(destination, current); } else { - throw new IllegalArgumentException( - "Serializing of " + current.getClass().getSimpleName() - + " in same_element is not implemented, please report this as a bug."); + throw new IllegalArgumentException("Serializing of " + current.getClass().getSimpleName() + + " in same_element is not implemented, please report this as a bug."); } } destination.append(')'); |