From 4e5d87a9baa4176a1089f7afd1f433a8da275725 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 13 Jun 2017 18:43:39 +0200 Subject: Copyright header --- container-search/build-osgi-bundles.xml | 2 +- container-search/pom.xml | 2 +- .../src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 | 2 +- .../src/main/java/com/yahoo/data/JsonProducer.java | 2 +- .../src/main/java/com/yahoo/data/XmlProducer.java | 2 +- .../src/main/java/com/yahoo/data/package-info.java | 2 +- .../src/main/java/com/yahoo/fs4/BasicPacket.java | 2 +- .../main/java/com/yahoo/fs4/BufferTooSmallException.java | 2 +- .../main/java/com/yahoo/fs4/ChannelTimeoutException.java | 2 +- .../src/main/java/com/yahoo/fs4/DocsumPacket.java | 2 +- .../src/main/java/com/yahoo/fs4/DocumentInfo.java | 2 +- .../src/main/java/com/yahoo/fs4/EolPacket.java | 2 +- .../src/main/java/com/yahoo/fs4/ErrorPacket.java | 2 +- .../src/main/java/com/yahoo/fs4/FS4Properties.java | 2 +- .../src/main/java/com/yahoo/fs4/GetDocSumsPacket.java | 2 +- .../src/main/java/com/yahoo/fs4/HexByteIterator.java | 2 +- .../src/main/java/com/yahoo/fs4/MapEncoder.java | 2 +- container-search/src/main/java/com/yahoo/fs4/Packet.java | 2 +- .../src/main/java/com/yahoo/fs4/PacketDecoder.java | 2 +- .../src/main/java/com/yahoo/fs4/PacketDumper.java | 2 +- .../src/main/java/com/yahoo/fs4/PacketListener.java | 2 +- .../java/com/yahoo/fs4/PacketNotificationsBroadcaster.java | 2 +- .../src/main/java/com/yahoo/fs4/PacketQueryTracer.java | 2 +- .../src/main/java/com/yahoo/fs4/PingPacket.java | 2 +- .../src/main/java/com/yahoo/fs4/PongPacket.java | 2 +- .../src/main/java/com/yahoo/fs4/QueryPacket.java | 2 +- .../src/main/java/com/yahoo/fs4/QueryPacketData.java | 2 +- .../src/main/java/com/yahoo/fs4/QueryResultPacket.java | 2 +- .../src/main/java/com/yahoo/fs4/mplex/Backend.java | 4 ++-- .../src/main/java/com/yahoo/fs4/mplex/ConnectionPool.java | 2 +- .../src/main/java/com/yahoo/fs4/mplex/FS4Channel.java | 2 +- .../src/main/java/com/yahoo/fs4/mplex/FS4Connection.java | 2 +- .../java/com/yahoo/fs4/mplex/InvalidChannelException.java | 2 +- .../src/main/java/com/yahoo/fs4/mplex/ListenerPool.java | 2 +- .../java/com/yahoo/prelude/ConfigurationException.java | 2 +- .../src/main/java/com/yahoo/prelude/Freshness.java | 2 +- .../src/main/java/com/yahoo/prelude/Index.java | 2 +- .../src/main/java/com/yahoo/prelude/IndexFacts.java | 2 +- .../src/main/java/com/yahoo/prelude/IndexModel.java | 2 +- .../src/main/java/com/yahoo/prelude/Location.java | 2 +- container-search/src/main/java/com/yahoo/prelude/Ping.java | 2 +- container-search/src/main/java/com/yahoo/prelude/Pong.java | 2 +- .../src/main/java/com/yahoo/prelude/SearchDefinition.java | 2 +- .../src/main/java/com/yahoo/prelude/cache/Cache.java | 2 +- .../main/java/com/yahoo/prelude/cache/QueryCacheKey.java | 2 +- .../java/com/yahoo/prelude/cluster/ClusterMonitor.java | 2 +- .../java/com/yahoo/prelude/cluster/ClusterSearcher.java | 2 +- .../src/main/java/com/yahoo/prelude/cluster/Hasher.java | 2 +- .../com/yahoo/prelude/cluster/MonitorConfiguration.java | 2 +- .../main/java/com/yahoo/prelude/cluster/NodeMonitor.java | 2 +- .../main/java/com/yahoo/prelude/cluster/package-info.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/ByteField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/CacheControl.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/CacheKey.java | 2 +- .../java/com/yahoo/prelude/fastsearch/CacheParams.java | 2 +- .../java/com/yahoo/prelude/fastsearch/ClusterParams.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/DataField.java | 2 +- .../src/main/java/com/yahoo/prelude/fastsearch/Docsum.java | 2 +- .../com/yahoo/prelude/fastsearch/DocsumDefinition.java | 2 +- .../com/yahoo/prelude/fastsearch/DocsumDefinitionSet.java | 2 +- .../java/com/yahoo/prelude/fastsearch/DocsumField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/DocsumPacketKey.java | 2 +- .../com/yahoo/prelude/fastsearch/DocumentDatabase.java | 2 +- .../java/com/yahoo/prelude/fastsearch/DoubleField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/FS4ResourcePool.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/FastHit.java | 2 +- .../java/com/yahoo/prelude/fastsearch/FastSearcher.java | 2 +- .../com/yahoo/prelude/fastsearch/FeatureDataField.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/FloatField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/GroupingListHit.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/Int64Field.java | 2 +- .../java/com/yahoo/prelude/fastsearch/IntegerField.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/JSONField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/LongdataField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/LongstringField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/PacketCache.java | 2 +- .../java/com/yahoo/prelude/fastsearch/PacketWrapper.java | 2 +- .../java/com/yahoo/prelude/fastsearch/RankProfile.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/ShortField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/StringField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/StructDataField.java | 2 +- .../com/yahoo/prelude/fastsearch/SummaryParameters.java | 2 +- .../java/com/yahoo/prelude/fastsearch/TensorField.java | 1 + .../com/yahoo/prelude/fastsearch/TimeoutException.java | 2 +- .../com/yahoo/prelude/fastsearch/VariableLengthField.java | 2 +- .../com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java | 2 +- .../main/java/com/yahoo/prelude/fastsearch/XMLField.java | 2 +- .../java/com/yahoo/prelude/fastsearch/package-info.java | 2 +- .../yahoo/prelude/hitfield/AnnotateStringFieldPart.java | 2 +- .../com/yahoo/prelude/hitfield/BoldCloseFieldPart.java | 2 +- .../java/com/yahoo/prelude/hitfield/BoldOpenFieldPart.java | 2 +- .../java/com/yahoo/prelude/hitfield/FieldIterator.java | 2 +- .../main/java/com/yahoo/prelude/hitfield/FieldPart.java | 2 +- .../src/main/java/com/yahoo/prelude/hitfield/HitField.java | 2 +- .../com/yahoo/prelude/hitfield/ImmutableFieldPart.java | 2 +- .../main/java/com/yahoo/prelude/hitfield/JSONString.java | 2 +- .../java/com/yahoo/prelude/hitfield/MarkupFieldPart.java | 2 +- .../src/main/java/com/yahoo/prelude/hitfield/RawData.java | 2 +- .../com/yahoo/prelude/hitfield/SeparatorFieldPart.java | 2 +- .../java/com/yahoo/prelude/hitfield/StringFieldPart.java | 2 +- .../com/yahoo/prelude/hitfield/TokenFieldIterator.java | 2 +- .../main/java/com/yahoo/prelude/hitfield/XMLString.java | 2 +- .../main/java/com/yahoo/prelude/hitfield/XmlRenderer.java | 2 +- .../main/java/com/yahoo/prelude/hitfield/package-info.java | 2 +- .../java/com/yahoo/prelude/logging/AccessLogEntry.java | 2 +- .../main/java/com/yahoo/prelude/logging/package-info.java | 2 +- .../src/main/java/com/yahoo/prelude/package-info.java | 2 +- .../src/main/java/com/yahoo/prelude/query/AndItem.java | 2 +- .../main/java/com/yahoo/prelude/query/AndSegmentItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/BlockItem.java | 2 +- .../java/com/yahoo/prelude/query/CompositeIndexedItem.java | 2 +- .../main/java/com/yahoo/prelude/query/CompositeItem.java | 2 +- .../com/yahoo/prelude/query/CompositeTaggableItem.java | 2 +- .../main/java/com/yahoo/prelude/query/DotProductItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/EquivItem.java | 2 +- .../main/java/com/yahoo/prelude/query/ExactStringItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/FalseItem.java | 2 +- .../main/java/com/yahoo/prelude/query/HasIndexItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/Highlight.java | 2 +- .../src/main/java/com/yahoo/prelude/query/IndexedItem.java | 2 +- .../java/com/yahoo/prelude/query/IndexedSegmentItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/IntItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/Item.java | 2 +- .../src/main/java/com/yahoo/prelude/query/ItemHelper.java | 2 +- .../src/main/java/com/yahoo/prelude/query/Limit.java | 2 +- .../main/java/com/yahoo/prelude/query/MarkerWordItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/NearItem.java | 2 +- .../com/yahoo/prelude/query/NonReducibleCompositeItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/NotItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/NullItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/ONearItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/OrItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/PhraseItem.java | 2 +- .../java/com/yahoo/prelude/query/PhraseSegmentItem.java | 2 +- .../java/com/yahoo/prelude/query/PredicateQueryItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/PrefixItem.java | 2 +- .../java/com/yahoo/prelude/query/PureWeightedInteger.java | 2 +- .../java/com/yahoo/prelude/query/PureWeightedItem.java | 2 +- .../java/com/yahoo/prelude/query/PureWeightedString.java | 2 +- .../java/com/yahoo/prelude/query/QueryCanonicalizer.java | 2 +- .../main/java/com/yahoo/prelude/query/QueryException.java | 2 +- .../src/main/java/com/yahoo/prelude/query/RangeItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/RankItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/RegExpItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/SegmentItem.java | 2 +- .../main/java/com/yahoo/prelude/query/SegmentingRule.java | 2 +- .../java/com/yahoo/prelude/query/SimpleIndexedItem.java | 2 +- .../java/com/yahoo/prelude/query/SimpleTaggableItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/Substring.java | 2 +- .../main/java/com/yahoo/prelude/query/SubstringItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/SuffixItem.java | 2 +- .../main/java/com/yahoo/prelude/query/TaggableItem.java | 2 +- .../java/com/yahoo/prelude/query/TaggableSegmentItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/TermItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/TermType.java | 2 +- .../src/main/java/com/yahoo/prelude/query/ToolBox.java | 2 +- .../src/main/java/com/yahoo/prelude/query/WandItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/WeakAndItem.java | 2 +- .../main/java/com/yahoo/prelude/query/WeightedSetItem.java | 2 +- .../java/com/yahoo/prelude/query/WordAlternativesItem.java | 2 +- .../src/main/java/com/yahoo/prelude/query/WordItem.java | 2 +- .../main/java/com/yahoo/prelude/query/package-info.java | 2 +- .../com/yahoo/prelude/query/parser/AbstractParser.java | 2 +- .../com/yahoo/prelude/query/parser/AdvancedParser.java | 2 +- .../java/com/yahoo/prelude/query/parser/AllParser.java | 2 +- .../java/com/yahoo/prelude/query/parser/AnyParser.java | 2 +- .../java/com/yahoo/prelude/query/parser/CustomParser.java | 2 +- .../com/yahoo/prelude/query/parser/ParseException.java | 2 +- .../java/com/yahoo/prelude/query/parser/PhraseParser.java | 2 +- .../com/yahoo/prelude/query/parser/ProgrammaticParser.java | 2 +- .../java/com/yahoo/prelude/query/parser/SimpleParser.java | 2 +- .../yahoo/prelude/query/parser/SpecialTokenRegistry.java | 2 +- .../java/com/yahoo/prelude/query/parser/SpecialTokens.java | 2 +- .../com/yahoo/prelude/query/parser/StructuredParser.java | 2 +- .../main/java/com/yahoo/prelude/query/parser/Token.java | 2 +- .../java/com/yahoo/prelude/query/parser/TokenPosition.java | 2 +- .../java/com/yahoo/prelude/query/parser/Tokenizer.java | 2 +- .../yahoo/prelude/query/parser/UnicodePropertyDump.java | 2 +- .../java/com/yahoo/prelude/query/parser/WebParser.java | 2 +- .../java/com/yahoo/prelude/query/parser/package-info.java | 2 +- .../prelude/query/textualrepresentation/Discloser.java | 2 +- .../textualrepresentation/TextualQueryRepresentation.java | 2 +- .../java/com/yahoo/prelude/querytransform/CJKSearcher.java | 2 +- .../prelude/querytransform/CollapsePhraseSearcher.java | 2 +- .../prelude/querytransform/IndexCombinatorSearcher.java | 2 +- .../yahoo/prelude/querytransform/LiteralBoostSearcher.java | 2 +- .../yahoo/prelude/querytransform/NoRankingSearcher.java | 2 +- .../yahoo/prelude/querytransform/NonPhrasingSearcher.java | 2 +- .../yahoo/prelude/querytransform/NormalizingSearcher.java | 2 +- .../com/yahoo/prelude/querytransform/PhraseMatcher.java | 2 +- .../com/yahoo/prelude/querytransform/PhrasingSearcher.java | 2 +- .../com/yahoo/prelude/querytransform/QueryRewrite.java | 2 +- .../com/yahoo/prelude/querytransform/RecallSearcher.java | 2 +- .../com/yahoo/prelude/querytransform/StemmingSearcher.java | 2 +- .../com/yahoo/prelude/querytransform/package-info.java | 2 +- .../java/com/yahoo/prelude/searcher/BlendingSearcher.java | 2 +- .../java/com/yahoo/prelude/searcher/CachingSearcher.java | 2 +- .../com/yahoo/prelude/searcher/DocumentSourceSearcher.java | 2 +- .../yahoo/prelude/searcher/FieldCollapsingSearcher.java | 2 +- .../main/java/com/yahoo/prelude/searcher/FillSearcher.java | 2 +- .../java/com/yahoo/prelude/searcher/JSONDebugSearcher.java | 2 +- .../java/com/yahoo/prelude/searcher/JuniperSearcher.java | 2 +- .../yahoo/prelude/searcher/MultipleResultsSearcher.java | 2 +- .../main/java/com/yahoo/prelude/searcher/PosSearcher.java | 2 +- .../com/yahoo/prelude/searcher/QuerySnapshotSearcher.java | 2 +- .../yahoo/prelude/searcher/QueryValidatingSearcher.java | 2 +- .../java/com/yahoo/prelude/searcher/QuotingSearcher.java | 2 +- .../yahoo/prelude/searcher/ValidatePredicateSearcher.java | 2 +- .../yahoo/prelude/searcher/ValidateSortingSearcher.java | 2 +- .../main/java/com/yahoo/prelude/searcher/package-info.java | 2 +- .../main/java/com/yahoo/prelude/semantics/RuleBase.java | 2 +- .../com/yahoo/prelude/semantics/RuleBaseException.java | 2 +- .../java/com/yahoo/prelude/semantics/RuleImporter.java | 2 +- .../java/com/yahoo/prelude/semantics/SemanticSearcher.java | 2 +- .../prelude/semantics/benchmark/RuleBaseBenchmark.java | 2 +- .../java/com/yahoo/prelude/semantics/benchmark/rules.sr | 2 +- .../yahoo/prelude/semantics/config/RuleConfigDeriver.java | 2 +- .../com/yahoo/prelude/semantics/config/package-info.java | 2 +- .../com/yahoo/prelude/semantics/engine/Choicepoint.java | 2 +- .../com/yahoo/prelude/semantics/engine/Evaluation.java | 2 +- .../prelude/semantics/engine/EvaluationException.java | 2 +- .../com/yahoo/prelude/semantics/engine/FlattenedItem.java | 2 +- .../java/com/yahoo/prelude/semantics/engine/Match.java | 2 +- .../java/com/yahoo/prelude/semantics/engine/NameSpace.java | 2 +- .../yahoo/prelude/semantics/engine/ParameterNameSpace.java | 2 +- .../yahoo/prelude/semantics/engine/ReferencedMatches.java | 2 +- .../com/yahoo/prelude/semantics/engine/RuleEngine.java | 2 +- .../com/yahoo/prelude/semantics/engine/RuleEvaluation.java | 2 +- .../java/com/yahoo/prelude/semantics/package-info.java | 2 +- .../com/yahoo/prelude/semantics/parser/package-info.java | 2 +- .../yahoo/prelude/semantics/rule/AddingProductionRule.java | 2 +- .../com/yahoo/prelude/semantics/rule/AndCondition.java | 2 +- .../com/yahoo/prelude/semantics/rule/ChoiceCondition.java | 2 +- .../yahoo/prelude/semantics/rule/ComparisonCondition.java | 2 +- .../yahoo/prelude/semantics/rule/CompositeCondition.java | 2 +- .../prelude/semantics/rule/CompositeItemCondition.java | 2 +- .../java/com/yahoo/prelude/semantics/rule/Condition.java | 2 +- .../yahoo/prelude/semantics/rule/ConditionReference.java | 2 +- .../yahoo/prelude/semantics/rule/EllipsisCondition.java | 2 +- .../com/yahoo/prelude/semantics/rule/LiteralCondition.java | 2 +- .../prelude/semantics/rule/LiteralPhraseProduction.java | 2 +- .../prelude/semantics/rule/LiteralTermProduction.java | 2 +- .../com/yahoo/prelude/semantics/rule/NamedCondition.java | 2 +- .../yahoo/prelude/semantics/rule/NamespaceProduction.java | 2 +- .../com/yahoo/prelude/semantics/rule/NotCondition.java | 2 +- .../java/com/yahoo/prelude/semantics/rule/Production.java | 2 +- .../com/yahoo/prelude/semantics/rule/ProductionList.java | 2 +- .../com/yahoo/prelude/semantics/rule/ProductionRule.java | 2 +- .../prelude/semantics/rule/ReferenceTermProduction.java | 2 +- .../prelude/semantics/rule/ReplacingProductionRule.java | 2 +- .../yahoo/prelude/semantics/rule/SequenceCondition.java | 2 +- .../com/yahoo/prelude/semantics/rule/SuperCondition.java | 2 +- .../com/yahoo/prelude/semantics/rule/TermCondition.java | 2 +- .../com/yahoo/prelude/semantics/rule/TermProduction.java | 2 +- .../com/yahoo/prelude/statistics/StatisticsSearcher.java | 2 +- .../java/com/yahoo/prelude/statistics/package-info.java | 2 +- .../src/main/java/com/yahoo/prelude/templates/Context.java | 2 +- .../com/yahoo/prelude/templates/DefaultTemplateSet.java | 2 +- .../com/yahoo/prelude/templates/FormattingOptions.java | 2 +- .../com/yahoo/prelude/templates/GenericTemplateSet.java | 2 +- .../main/java/com/yahoo/prelude/templates/HitContext.java | 2 +- .../templates/LogExceptionUserTemplateDelegator.java | 2 +- .../main/java/com/yahoo/prelude/templates/MapContext.java | 2 +- .../java/com/yahoo/prelude/templates/PageTemplateSet.java | 2 +- .../com/yahoo/prelude/templates/SearchRendererAdaptor.java | 2 +- .../main/java/com/yahoo/prelude/templates/Template.java | 2 +- .../main/java/com/yahoo/prelude/templates/TemplateSet.java | 2 +- .../java/com/yahoo/prelude/templates/TiledTemplateSet.java | 2 +- .../java/com/yahoo/prelude/templates/UserTemplate.java | 2 +- .../java/com/yahoo/prelude/templates/package-info.java | 2 +- container-search/src/main/java/com/yahoo/search/Query.java | 2 +- .../src/main/java/com/yahoo/search/Result.java | 2 +- .../src/main/java/com/yahoo/search/Searcher.java | 2 +- .../src/main/java/com/yahoo/search/cache/package-info.java | 4 ++-- .../java/com/yahoo/search/cluster/BaseNodeMonitor.java | 2 +- .../main/java/com/yahoo/search/cluster/ClusterMonitor.java | 2 +- .../java/com/yahoo/search/cluster/ClusterSearcher.java | 2 +- .../src/main/java/com/yahoo/search/cluster/Hasher.java | 2 +- .../com/yahoo/search/cluster/MonitorConfiguration.java | 2 +- .../main/java/com/yahoo/search/cluster/NodeManager.java | 2 +- .../java/com/yahoo/search/cluster/PingableSearcher.java | 2 +- .../java/com/yahoo/search/cluster/TrafficNodeMonitor.java | 2 +- .../main/java/com/yahoo/search/cluster/package-info.java | 2 +- .../search/config/dispatchprototype/package-info.java | 2 +- .../main/java/com/yahoo/search/config/package-info.java | 2 +- .../java/com/yahoo/search/debug/BackendStatistics.java | 2 +- .../java/com/yahoo/search/debug/DebugMethodHandler.java | 2 +- .../main/java/com/yahoo/search/debug/DebugRpcAdaptor.java | 2 +- .../java/com/yahoo/search/debug/IndentStringBuilder.java | 2 +- .../java/com/yahoo/search/debug/JrtMethodSignature.java | 2 +- .../java/com/yahoo/search/debug/OutputSearchChain.java | 2 +- .../yahoo/search/debug/SearchChainTextRepresentation.java | 2 +- .../main/java/com/yahoo/search/debug/SearcherUtils.java | 2 +- .../src/main/java/com/yahoo/search/debug/TracePackets.java | 2 +- .../src/main/java/com/yahoo/search/dispatch/Client.java | 2 +- .../main/java/com/yahoo/search/dispatch/Dispatcher.java | 2 +- .../src/main/java/com/yahoo/search/dispatch/RpcClient.java | 2 +- .../main/java/com/yahoo/search/dispatch/SearchCluster.java | 1 + .../java/com/yahoo/search/federation/CommonFields.java | 2 +- .../java/com/yahoo/search/federation/FederationResult.java | 1 + .../com/yahoo/search/federation/FederationSearcher.java | 2 +- .../com/yahoo/search/federation/ForwardingSearcher.java | 2 +- .../java/com/yahoo/search/federation/TimeoutException.java | 2 +- .../federation/http/ConfiguredHTTPClientSearcher.java | 2 +- .../federation/http/ConfiguredHTTPProviderSearcher.java | 2 +- .../search/federation/http/ConfiguredSearcherHelper.java | 2 +- .../java/com/yahoo/search/federation/http/Connection.java | 2 +- .../search/federation/http/GzipDecompressingEntity.java | 2 +- .../yahoo/search/federation/http/HTTPClientSearcher.java | 2 +- .../com/yahoo/search/federation/http/HTTPParameters.java | 2 +- .../yahoo/search/federation/http/HTTPProviderSearcher.java | 2 +- .../com/yahoo/search/federation/http/HTTPSearcher.java | 2 +- .../com/yahoo/search/federation/http/TimedHttpEntity.java | 2 +- .../java/com/yahoo/search/federation/http/TimedStream.java | 2 +- .../com/yahoo/search/federation/http/TimeoutException.java | 2 +- .../com/yahoo/search/federation/http/package-info.java | 2 +- .../java/com/yahoo/search/federation/package-info.java | 2 +- .../search/federation/selection/FederationTarget.java | 2 +- .../yahoo/search/federation/selection/TargetSelector.java | 2 +- .../yahoo/search/federation/selection/package-info.java | 2 +- .../federation/sourceref/SearchChainInvocationSpec.java | 2 +- .../search/federation/sourceref/SearchChainResolver.java | 2 +- .../yahoo/search/federation/sourceref/SingleTarget.java | 2 +- .../search/federation/sourceref/SourceRefResolver.java | 2 +- .../yahoo/search/federation/sourceref/SourcesTarget.java | 2 +- .../java/com/yahoo/search/federation/sourceref/Target.java | 2 +- .../federation/sourceref/UnresolvedProviderException.java | 2 +- .../sourceref/UnresolvedSearchChainException.java | 2 +- .../federation/sourceref/UnresolvedSourceRefException.java | 2 +- .../com/yahoo/search/federation/vespa/QueryMarshaller.java | 2 +- .../com/yahoo/search/federation/vespa/ResultBuilder.java | 2 +- .../com/yahoo/search/federation/vespa/VespaSearcher.java | 2 +- .../com/yahoo/search/federation/vespa/package-info.java | 2 +- .../main/java/com/yahoo/search/grouping/Continuation.java | 2 +- .../com/yahoo/search/grouping/GroupingQueryParser.java | 2 +- .../java/com/yahoo/search/grouping/GroupingRequest.java | 2 +- .../java/com/yahoo/search/grouping/GroupingValidator.java | 2 +- .../search/grouping/UnavailableAttributeException.java | 2 +- .../com/yahoo/search/grouping/UniqueGroupingSearcher.java | 2 +- .../main/java/com/yahoo/search/grouping/package-info.java | 2 +- .../com/yahoo/search/grouping/request/AddFunction.java | 2 +- .../com/yahoo/search/grouping/request/AggregatorNode.java | 2 +- .../com/yahoo/search/grouping/request/AllOperation.java | 2 +- .../com/yahoo/search/grouping/request/AndFunction.java | 2 +- .../com/yahoo/search/grouping/request/ArrayAtLookup.java | 2 +- .../yahoo/search/grouping/request/AttributeFunction.java | 2 +- .../com/yahoo/search/grouping/request/AttributeValue.java | 2 +- .../com/yahoo/search/grouping/request/AvgAggregator.java | 2 +- .../com/yahoo/search/grouping/request/AvgFunction.java | 2 +- .../com/yahoo/search/grouping/request/BooleanValue.java | 2 +- .../com/yahoo/search/grouping/request/BucketResolver.java | 2 +- .../com/yahoo/search/grouping/request/BucketValue.java | 2 +- .../com/yahoo/search/grouping/request/CatFunction.java | 2 +- .../com/yahoo/search/grouping/request/ConstantValue.java | 2 +- .../search/grouping/request/ConstantValueComparator.java | 2 +- .../com/yahoo/search/grouping/request/CountAggregator.java | 2 +- .../com/yahoo/search/grouping/request/DateFunction.java | 2 +- .../yahoo/search/grouping/request/DayOfMonthFunction.java | 2 +- .../yahoo/search/grouping/request/DayOfWeekFunction.java | 2 +- .../yahoo/search/grouping/request/DayOfYearFunction.java | 2 +- .../yahoo/search/grouping/request/DebugWaitFunction.java | 2 +- .../com/yahoo/search/grouping/request/DivFunction.java | 2 +- .../search/grouping/request/DocIdNsSpecificValue.java | 2 +- .../com/yahoo/search/grouping/request/DocumentValue.java | 2 +- .../com/yahoo/search/grouping/request/DoubleBucket.java | 2 +- .../yahoo/search/grouping/request/DoublePredefined.java | 2 +- .../com/yahoo/search/grouping/request/DoubleValue.java | 2 +- .../com/yahoo/search/grouping/request/EachOperation.java | 2 +- .../yahoo/search/grouping/request/ExpressionVisitor.java | 2 +- .../yahoo/search/grouping/request/FixedWidthFunction.java | 2 +- .../com/yahoo/search/grouping/request/FunctionNode.java | 2 +- .../yahoo/search/grouping/request/GroupingExpression.java | 2 +- .../com/yahoo/search/grouping/request/GroupingNode.java | 2 +- .../yahoo/search/grouping/request/GroupingOperation.java | 2 +- .../yahoo/search/grouping/request/HourOfDayFunction.java | 2 +- .../java/com/yahoo/search/grouping/request/Infinite.java | 2 +- .../com/yahoo/search/grouping/request/InfiniteValue.java | 2 +- .../yahoo/search/grouping/request/InterpolatedLookup.java | 2 +- .../java/com/yahoo/search/grouping/request/LongBucket.java | 2 +- .../com/yahoo/search/grouping/request/LongPredefined.java | 2 +- .../java/com/yahoo/search/grouping/request/LongValue.java | 2 +- .../yahoo/search/grouping/request/MathACosFunction.java | 2 +- .../yahoo/search/grouping/request/MathACosHFunction.java | 2 +- .../yahoo/search/grouping/request/MathASinFunction.java | 2 +- .../yahoo/search/grouping/request/MathASinHFunction.java | 2 +- .../yahoo/search/grouping/request/MathATanFunction.java | 2 +- .../yahoo/search/grouping/request/MathATanHFunction.java | 2 +- .../yahoo/search/grouping/request/MathCbrtFunction.java | 2 +- .../com/yahoo/search/grouping/request/MathCosFunction.java | 2 +- .../yahoo/search/grouping/request/MathCosHFunction.java | 2 +- .../com/yahoo/search/grouping/request/MathExpFunction.java | 2 +- .../yahoo/search/grouping/request/MathFloorFunction.java | 2 +- .../com/yahoo/search/grouping/request/MathFunctions.java | 2 +- .../yahoo/search/grouping/request/MathHypotFunction.java | 2 +- .../yahoo/search/grouping/request/MathLog10Function.java | 2 +- .../yahoo/search/grouping/request/MathLog1pFunction.java | 2 +- .../com/yahoo/search/grouping/request/MathLogFunction.java | 2 +- .../com/yahoo/search/grouping/request/MathPowFunction.java | 2 +- .../com/yahoo/search/grouping/request/MathResolver.java | 2 +- .../com/yahoo/search/grouping/request/MathSinFunction.java | 2 +- .../yahoo/search/grouping/request/MathSinHFunction.java | 2 +- .../yahoo/search/grouping/request/MathSqrtFunction.java | 2 +- .../com/yahoo/search/grouping/request/MathTanFunction.java | 2 +- .../yahoo/search/grouping/request/MathTanHFunction.java | 2 +- .../com/yahoo/search/grouping/request/MaxAggregator.java | 2 +- .../com/yahoo/search/grouping/request/MaxFunction.java | 2 +- .../com/yahoo/search/grouping/request/Md5Function.java | 2 +- .../com/yahoo/search/grouping/request/MinAggregator.java | 2 +- .../com/yahoo/search/grouping/request/MinFunction.java | 2 +- .../search/grouping/request/MinuteOfHourFunction.java | 2 +- .../com/yahoo/search/grouping/request/ModFunction.java | 2 +- .../yahoo/search/grouping/request/MonthOfYearFunction.java | 2 +- .../com/yahoo/search/grouping/request/MulFunction.java | 2 +- .../com/yahoo/search/grouping/request/NegFunction.java | 2 +- .../search/grouping/request/NormalizeSubjectFunction.java | 2 +- .../com/yahoo/search/grouping/request/NowFunction.java | 2 +- .../java/com/yahoo/search/grouping/request/OrFunction.java | 2 +- .../yahoo/search/grouping/request/PredefinedFunction.java | 2 +- .../java/com/yahoo/search/grouping/request/RawBucket.java | 2 +- .../java/com/yahoo/search/grouping/request/RawBuffer.java | 2 +- .../com/yahoo/search/grouping/request/RawPredefined.java | 2 +- .../java/com/yahoo/search/grouping/request/RawValue.java | 2 +- .../com/yahoo/search/grouping/request/RelevanceValue.java | 2 +- .../com/yahoo/search/grouping/request/ReverseFunction.java | 2 +- .../search/grouping/request/SecondOfMinuteFunction.java | 2 +- .../com/yahoo/search/grouping/request/SizeFunction.java | 2 +- .../com/yahoo/search/grouping/request/SortFunction.java | 2 +- .../grouping/request/StandardDeviationAggregator.java | 2 +- .../com/yahoo/search/grouping/request/StrCatFunction.java | 2 +- .../com/yahoo/search/grouping/request/StrLenFunction.java | 2 +- .../com/yahoo/search/grouping/request/StringBucket.java | 2 +- .../yahoo/search/grouping/request/StringPredefined.java | 2 +- .../com/yahoo/search/grouping/request/StringValue.java | 2 +- .../com/yahoo/search/grouping/request/SubFunction.java | 2 +- .../com/yahoo/search/grouping/request/SumAggregator.java | 2 +- .../com/yahoo/search/grouping/request/SummaryValue.java | 2 +- .../com/yahoo/search/grouping/request/TimeFunctions.java | 2 +- .../yahoo/search/grouping/request/ToDoubleFunction.java | 2 +- .../com/yahoo/search/grouping/request/ToLongFunction.java | 2 +- .../com/yahoo/search/grouping/request/ToRawFunction.java | 2 +- .../yahoo/search/grouping/request/ToStringFunction.java | 2 +- .../com/yahoo/search/grouping/request/UcaFunction.java | 2 +- .../com/yahoo/search/grouping/request/XorAggregator.java | 2 +- .../com/yahoo/search/grouping/request/XorBitFunction.java | 2 +- .../com/yahoo/search/grouping/request/XorFunction.java | 2 +- .../com/yahoo/search/grouping/request/YearFunction.java | 2 +- .../java/com/yahoo/search/grouping/request/YmumValue.java | 2 +- .../com/yahoo/search/grouping/request/ZCurveXFunction.java | 2 +- .../com/yahoo/search/grouping/request/ZCurveYFunction.java | 2 +- .../com/yahoo/search/grouping/request/package-info.java | 2 +- .../grouping/request/parser/GroupingParserInput.java | 2 +- .../com/yahoo/search/grouping/result/AbstractList.java | 2 +- .../com/yahoo/search/grouping/result/BucketGroupId.java | 2 +- .../com/yahoo/search/grouping/result/DoubleBucketId.java | 2 +- .../java/com/yahoo/search/grouping/result/DoubleId.java | 2 +- .../main/java/com/yahoo/search/grouping/result/Group.java | 2 +- .../java/com/yahoo/search/grouping/result/GroupId.java | 2 +- .../java/com/yahoo/search/grouping/result/GroupList.java | 2 +- .../java/com/yahoo/search/grouping/result/HitList.java | 2 +- .../java/com/yahoo/search/grouping/result/HitRenderer.java | 2 +- .../com/yahoo/search/grouping/result/LongBucketId.java | 2 +- .../main/java/com/yahoo/search/grouping/result/LongId.java | 2 +- .../main/java/com/yahoo/search/grouping/result/NullId.java | 2 +- .../java/com/yahoo/search/grouping/result/RawBucketId.java | 2 +- .../main/java/com/yahoo/search/grouping/result/RawId.java | 2 +- .../java/com/yahoo/search/grouping/result/RootGroup.java | 2 +- .../main/java/com/yahoo/search/grouping/result/RootId.java | 2 +- .../com/yahoo/search/grouping/result/StringBucketId.java | 2 +- .../java/com/yahoo/search/grouping/result/StringId.java | 2 +- .../com/yahoo/search/grouping/result/ValueGroupId.java | 2 +- .../com/yahoo/search/grouping/result/package-info.java | 2 +- .../yahoo/search/grouping/vespa/CompositeContinuation.java | 2 +- .../yahoo/search/grouping/vespa/ContinuationDecoder.java | 2 +- .../yahoo/search/grouping/vespa/EncodableContinuation.java | 2 +- .../yahoo/search/grouping/vespa/ExpressionConverter.java | 2 +- .../com/yahoo/search/grouping/vespa/GroupingExecutor.java | 2 +- .../com/yahoo/search/grouping/vespa/GroupingTransform.java | 2 +- .../java/com/yahoo/search/grouping/vespa/HitConverter.java | 2 +- .../com/yahoo/search/grouping/vespa/IntegerDecoder.java | 2 +- .../com/yahoo/search/grouping/vespa/IntegerEncoder.java | 2 +- .../yahoo/search/grouping/vespa/OffsetContinuation.java | 2 +- .../com/yahoo/search/grouping/vespa/RequestBuilder.java | 2 +- .../com/yahoo/search/grouping/vespa/ResultBuilder.java | 2 +- .../java/com/yahoo/search/grouping/vespa/ResultId.java | 2 +- .../java/com/yahoo/search/handler/HttpSearchResponse.java | 2 +- .../main/java/com/yahoo/search/handler/SearchHandler.java | 2 +- .../main/java/com/yahoo/search/handler/SearchResponse.java | 2 +- .../main/java/com/yahoo/search/handler/package-info.java | 2 +- .../main/java/com/yahoo/search/intent/model/Intent.java | 2 +- .../java/com/yahoo/search/intent/model/IntentModel.java | 2 +- .../java/com/yahoo/search/intent/model/IntentNode.java | 2 +- .../com/yahoo/search/intent/model/InterpretationNode.java | 2 +- .../src/main/java/com/yahoo/search/intent/model/Node.java | 2 +- .../java/com/yahoo/search/intent/model/ParentNode.java | 2 +- .../main/java/com/yahoo/search/intent/model/Source.java | 2 +- .../java/com/yahoo/search/intent/model/SourceNode.java | 2 +- .../java/com/yahoo/search/intent/model/package-info.java | 2 +- .../src/main/java/com/yahoo/search/match/DocumentDb.java | 2 +- .../src/main/java/com/yahoo/search/package-info.java | 2 +- .../java/com/yahoo/search/pagetemplates/PageTemplate.java | 2 +- .../yahoo/search/pagetemplates/PageTemplateRegistry.java | 2 +- .../yahoo/search/pagetemplates/PageTemplateSearcher.java | 2 +- .../search/pagetemplates/PlaceholderMappingVisitor.java | 2 +- .../pagetemplates/PlaceholderReferenceCreatingVisitor.java | 2 +- .../java/com/yahoo/search/pagetemplates/SourceVisitor.java | 2 +- .../pagetemplates/config/PageTemplateConfigurer.java | 2 +- .../search/pagetemplates/config/PageTemplateXMLReader.java | 2 +- .../yahoo/search/pagetemplates/config/package-info.java | 2 +- .../com/yahoo/search/pagetemplates/engine/Organizer.java | 2 +- .../search/pagetemplates/engine/RelevanceComparator.java | 2 +- .../com/yahoo/search/pagetemplates/engine/Resolution.java | 2 +- .../com/yahoo/search/pagetemplates/engine/Resolver.java | 2 +- .../search/pagetemplates/engine/SourceOrderComparator.java | 2 +- .../yahoo/search/pagetemplates/engine/package-info.java | 2 +- .../engine/resolvers/DeterministicResolver.java | 2 +- .../pagetemplates/engine/resolvers/RandomResolver.java | 2 +- .../pagetemplates/engine/resolvers/ResolverRegistry.java | 2 +- .../pagetemplates/engine/resolvers/package-info.java | 2 +- .../yahoo/search/pagetemplates/model/AbstractChoice.java | 2 +- .../java/com/yahoo/search/pagetemplates/model/Choice.java | 2 +- .../java/com/yahoo/search/pagetemplates/model/Layout.java | 2 +- .../com/yahoo/search/pagetemplates/model/MapChoice.java | 2 +- .../com/yahoo/search/pagetemplates/model/PageElement.java | 2 +- .../search/pagetemplates/model/PageTemplateVisitor.java | 2 +- .../com/yahoo/search/pagetemplates/model/Placeholder.java | 2 +- .../com/yahoo/search/pagetemplates/model/Renderer.java | 2 +- .../java/com/yahoo/search/pagetemplates/model/Section.java | 2 +- .../java/com/yahoo/search/pagetemplates/model/Source.java | 2 +- .../com/yahoo/search/pagetemplates/model/package-info.java | 2 +- .../java/com/yahoo/search/pagetemplates/package-info.java | 2 +- .../yahoo/search/pagetemplates/result/SectionHitGroup.java | 2 +- .../yahoo/search/pagetemplates/result/package-info.java | 2 +- .../src/main/java/com/yahoo/search/query/Model.java | 2 +- .../main/java/com/yahoo/search/query/ParameterParser.java | 2 +- .../src/main/java/com/yahoo/search/query/Presentation.java | 2 +- .../src/main/java/com/yahoo/search/query/Properties.java | 2 +- .../src/main/java/com/yahoo/search/query/QueryHelper.java | 2 +- .../src/main/java/com/yahoo/search/query/QueryTree.java | 2 +- .../src/main/java/com/yahoo/search/query/Ranking.java | 2 +- .../src/main/java/com/yahoo/search/query/SessionId.java | 2 +- .../src/main/java/com/yahoo/search/query/Sorting.java | 2 +- .../java/com/yahoo/search/query/context/QueryContext.java | 2 +- .../java/com/yahoo/search/query/context/package-info.java | 2 +- .../src/main/java/com/yahoo/search/query/package-info.java | 2 +- .../main/java/com/yahoo/search/query/parser/Parsable.java | 2 +- .../main/java/com/yahoo/search/query/parser/Parser.java | 2 +- .../com/yahoo/search/query/parser/ParserEnvironment.java | 2 +- .../java/com/yahoo/search/query/parser/ParserFactory.java | 2 +- .../java/com/yahoo/search/query/parser/package-info.java | 2 +- .../query/profile/AllReferencesQueryProfileVisitor.java | 2 +- .../search/query/profile/AllTypesQueryProfileVisitor.java | 2 +- .../query/profile/AllUnoverridableQueryProfileVisitor.java | 2 +- .../search/query/profile/AllValuesQueryProfileVisitor.java | 2 +- .../query/profile/BackedOverridableQueryProfile.java | 2 +- .../com/yahoo/search/query/profile/CopyOnWriteContent.java | 2 +- .../com/yahoo/search/query/profile/DimensionBinding.java | 2 +- .../com/yahoo/search/query/profile/DimensionValues.java | 2 +- .../main/java/com/yahoo/search/query/profile/DumpTool.java | 2 +- .../query/profile/FieldDescriptionQueryProfileVisitor.java | 2 +- .../com/yahoo/search/query/profile/ModelObjectMap.java | 2 +- .../search/query/profile/OverridableQueryProfile.java | 2 +- .../search/query/profile/PrefixQueryProfileVisitor.java | 2 +- .../java/com/yahoo/search/query/profile/QueryProfile.java | 2 +- .../yahoo/search/query/profile/QueryProfileCompiler.java | 2 +- .../yahoo/search/query/profile/QueryProfileProperties.java | 2 +- .../yahoo/search/query/profile/QueryProfileRegistry.java | 2 +- .../yahoo/search/query/profile/QueryProfileVariant.java | 2 +- .../yahoo/search/query/profile/QueryProfileVariants.java | 2 +- .../yahoo/search/query/profile/QueryProfileVisitor.java | 2 +- .../query/profile/SingleValueQueryProfileVisitor.java | 2 +- .../com/yahoo/search/query/profile/SubstituteString.java | 2 +- .../com/yahoo/search/query/profile/compiled/Binding.java | 2 +- .../query/profile/compiled/CompiledQueryProfile.java | 2 +- .../profile/compiled/CompiledQueryProfileRegistry.java | 2 +- .../search/query/profile/compiled/DimensionalMap.java | 2 +- .../search/query/profile/compiled/DimensionalValue.java | 2 +- .../yahoo/search/query/profile/compiled/package-info.java | 2 +- .../query/profile/config/QueryProfileConfigurer.java | 2 +- .../search/query/profile/config/QueryProfileXMLReader.java | 2 +- .../yahoo/search/query/profile/config/package-info.java | 2 +- .../java/com/yahoo/search/query/profile/package-info.java | 2 +- .../yahoo/search/query/profile/types/FieldDescription.java | 2 +- .../com/yahoo/search/query/profile/types/FieldType.java | 2 +- .../search/query/profile/types/PrimitiveFieldType.java | 2 +- .../yahoo/search/query/profile/types/QueryFieldType.java | 2 +- .../search/query/profile/types/QueryProfileFieldType.java | 2 +- .../yahoo/search/query/profile/types/QueryProfileType.java | 2 +- .../query/profile/types/QueryProfileTypeRegistry.java | 2 +- .../yahoo/search/query/profile/types/TensorFieldType.java | 2 +- .../com/yahoo/search/query/profile/types/package-info.java | 2 +- .../com/yahoo/search/query/properties/CloneHelper.java | 1 + .../yahoo/search/query/properties/DefaultProperties.java | 2 +- .../com/yahoo/search/query/properties/PropertyAliases.java | 2 +- .../com/yahoo/search/query/properties/PropertyMap.java | 2 +- .../com/yahoo/search/query/properties/QueryProperties.java | 2 +- .../search/query/properties/QueryPropertyAliases.java | 2 +- .../search/query/properties/RequestContextProperties.java | 2 +- .../com/yahoo/search/query/properties/SubProperties.java | 2 +- .../com/yahoo/search/query/properties/package-info.java | 2 +- .../java/com/yahoo/search/query/ranking/Diversity.java | 2 +- .../java/com/yahoo/search/query/ranking/MatchPhase.java | 2 +- .../main/java/com/yahoo/search/query/ranking/Matching.java | 1 + .../java/com/yahoo/search/query/ranking/RankFeatures.java | 2 +- .../com/yahoo/search/query/ranking/RankProperties.java | 2 +- .../java/com/yahoo/search/query/ranking/SoftTimeout.java | 1 + .../java/com/yahoo/search/query/ranking/package-info.java | 2 +- .../yahoo/search/query/rewrite/QueryRewriteSearcher.java | 2 +- .../com/yahoo/search/query/rewrite/RewriterConstants.java | 2 +- .../com/yahoo/search/query/rewrite/RewriterFeatures.java | 2 +- .../java/com/yahoo/search/query/rewrite/RewriterUtils.java | 2 +- .../query/rewrite/SearchChainDispatcherSearcher.java | 2 +- .../java/com/yahoo/search/query/rewrite/package-info.java | 2 +- .../query/rewrite/rewriters/GenericExpansionRewriter.java | 2 +- .../search/query/rewrite/rewriters/MisspellRewriter.java | 2 +- .../yahoo/search/query/rewrite/rewriters/NameRewriter.java | 2 +- .../yahoo/search/query/rewrite/rewriters/package-info.java | 2 +- .../yahoo/search/query/textserialize/TextSerialize.java | 2 +- .../query/textserialize/item/AndNotRestConverter.java | 2 +- .../query/textserialize/item/CompositeConverter.java | 2 +- .../query/textserialize/item/ExactStringConverter.java | 2 +- .../search/query/textserialize/item/IntConverter.java | 2 +- .../search/query/textserialize/item/ItemArguments.java | 2 +- .../yahoo/search/query/textserialize/item/ItemContext.java | 2 +- .../query/textserialize/item/ItemExecutorRegistry.java | 2 +- .../search/query/textserialize/item/ItemFormConverter.java | 2 +- .../search/query/textserialize/item/ItemFormHandler.java | 2 +- .../search/query/textserialize/item/ItemInitializer.java | 2 +- .../yahoo/search/query/textserialize/item/ListUtil.java | 2 +- .../search/query/textserialize/item/NearConverter.java | 2 +- .../search/query/textserialize/item/PrefixConverter.java | 2 +- .../query/textserialize/item/SubStringConverter.java | 2 +- .../search/query/textserialize/item/SuffixConverter.java | 2 +- .../search/query/textserialize/item/TermConverter.java | 2 +- .../yahoo/search/query/textserialize/item/TypeCheck.java | 2 +- .../search/query/textserialize/item/WordConverter.java | 2 +- .../com/yahoo/search/query/textserialize/package-info.java | 2 +- .../query/textserialize/parser/DispatchFormHandler.java | 2 +- .../query/textserialize/serializer/DispatchForm.java | 2 +- .../query/textserialize/serializer/ItemIdMapper.java | 2 +- .../textserialize/serializer/QueryTreeSerializer.java | 2 +- .../search/query/textserialize/serializer/Serializer.java | 2 +- .../search/querytransform/AllLowercasingSearcher.java | 2 +- .../search/querytransform/BooleanAttributeParser.java | 2 +- .../com/yahoo/search/querytransform/BooleanSearcher.java | 2 +- .../search/querytransform/DefaultPositionSearcher.java | 2 +- .../com/yahoo/search/querytransform/LegacyCombinator.java | 2 +- .../yahoo/search/querytransform/LowercasingSearcher.java | 2 +- .../com/yahoo/search/querytransform/NGramSearcher.java | 2 +- .../com/yahoo/search/querytransform/QueryCombinator.java | 2 +- .../com/yahoo/search/querytransform/QueryTreeUtil.java | 2 +- .../yahoo/search/querytransform/RangeQueryOptimizer.java | 2 +- .../com/yahoo/search/querytransform/SortingDegrader.java | 2 +- .../search/querytransform/VespaLowercasingSearcher.java | 2 +- .../java/com/yahoo/search/querytransform/WandSearcher.java | 2 +- .../java/com/yahoo/search/querytransform/package-info.java | 2 +- .../java/com/yahoo/search/rendering/DefaultRenderer.java | 2 +- .../main/java/com/yahoo/search/rendering/JsonRenderer.java | 2 +- .../src/main/java/com/yahoo/search/rendering/Renderer.java | 2 +- .../java/com/yahoo/search/rendering/RendererRegistry.java | 2 +- .../java/com/yahoo/search/rendering/SectionedRenderer.java | 2 +- .../com/yahoo/search/rendering/SyncDefaultRenderer.java | 2 +- .../main/java/com/yahoo/search/rendering/package-info.java | 2 +- .../java/com/yahoo/search/result/ChainableComparator.java | 2 +- .../src/main/java/com/yahoo/search/result/Coverage.java | 2 +- .../main/java/com/yahoo/search/result/DeepHitIterator.java | 2 +- .../main/java/com/yahoo/search/result/DefaultErrorHit.java | 2 +- .../src/main/java/com/yahoo/search/result/ErrorHit.java | 2 +- .../main/java/com/yahoo/search/result/ErrorMessage.java | 2 +- .../src/main/java/com/yahoo/search/result/FeatureData.java | 2 +- .../main/java/com/yahoo/search/result/FieldComparator.java | 2 +- .../src/main/java/com/yahoo/search/result/Hit.java | 2 +- .../src/main/java/com/yahoo/search/result/HitGroup.java | 2 +- .../com/yahoo/search/result/HitGroupsLastComparator.java | 2 +- .../src/main/java/com/yahoo/search/result/HitIterator.java | 2 +- .../src/main/java/com/yahoo/search/result/HitOrderer.java | 2 +- .../main/java/com/yahoo/search/result/HitSortOrderer.java | 2 +- .../com/yahoo/search/result/MetaHitsFirstComparator.java | 2 +- .../src/main/java/com/yahoo/search/result/NanNumber.java | 2 +- .../src/main/java/com/yahoo/search/result/Relevance.java | 2 +- .../main/java/com/yahoo/search/result/StructuredData.java | 2 +- .../src/main/java/com/yahoo/search/result/Templating.java | 2 +- .../main/java/com/yahoo/search/result/package-info.java | 2 +- .../java/com/yahoo/search/searchchain/AsyncExecution.java | 2 +- .../main/java/com/yahoo/search/searchchain/Execution.java | 2 +- .../java/com/yahoo/search/searchchain/ForkingSearcher.java | 2 +- .../java/com/yahoo/search/searchchain/FutureResult.java | 2 +- .../main/java/com/yahoo/search/searchchain/PhaseNames.java | 2 +- .../java/com/yahoo/search/searchchain/SearchChain.java | 2 +- .../com/yahoo/search/searchchain/SearchChainRegistry.java | 2 +- .../com/yahoo/search/searchchain/SearcherRegistry.java | 2 +- .../yahoo/search/searchchain/example/ExampleSearcher.java | 2 +- .../com/yahoo/search/searchchain/model/VespaSearchers.java | 2 +- .../searchchain/model/federation/FederationOptions.java | 2 +- .../model/federation/FederationSearcherModel.java | 2 +- .../searchchain/model/federation/HttpProviderSpec.java | 2 +- .../searchchain/model/federation/LocalProviderSpec.java | 2 +- .../search/searchchain/model/federation/package-info.java | 2 +- .../com/yahoo/search/searchchain/model/package-info.java | 2 +- .../java/com/yahoo/search/searchchain/package-info.java | 2 +- .../searchchain/testutil/DocumentSourceSearcher.java | 2 +- .../com/yahoo/search/searchers/CacheControlSearcher.java | 2 +- .../yahoo/search/searchers/ConnectionControlSearcher.java | 2 +- .../com/yahoo/search/searchers/InputCheckingSearcher.java | 2 +- .../com/yahoo/search/searchers/RateLimitingSearcher.java | 2 +- .../yahoo/search/searchers/ValidateMatchPhaseSearcher.java | 2 +- .../main/java/com/yahoo/search/searchers/package-info.java | 2 +- .../main/java/com/yahoo/search/statistics/ElapsedTime.java | 2 +- .../java/com/yahoo/search/statistics/PeakQpsSearcher.java | 2 +- .../main/java/com/yahoo/search/statistics/TimeTracker.java | 2 +- .../java/com/yahoo/search/statistics/TimingSearcher.java | 2 +- .../java/com/yahoo/search/statistics/package-info.java | 2 +- .../java/com/yahoo/search/yql/ArgumentsTypeChecker.java | 2 +- .../com/yahoo/search/yql/CaseInsensitiveFileStream.java | 2 +- .../com/yahoo/search/yql/CaseInsensitiveInputStream.java | 2 +- .../main/java/com/yahoo/search/yql/ExpressionOperator.java | 2 +- .../src/main/java/com/yahoo/search/yql/FieldFiller.java | 2 +- .../src/main/java/com/yahoo/search/yql/FieldFilter.java | 2 +- .../java/com/yahoo/search/yql/JavaListTypeChecker.java | 2 +- .../main/java/com/yahoo/search/yql/JavaTypeChecker.java | 2 +- .../java/com/yahoo/search/yql/JavaUnionTypeChecker.java | 2 +- .../src/main/java/com/yahoo/search/yql/Location.java | 2 +- .../java/com/yahoo/search/yql/MinimalQueryInserter.java | 2 +- .../main/java/com/yahoo/search/yql/NodeTypeChecker.java | 2 +- .../main/java/com/yahoo/search/yql/NullItemException.java | 2 +- .../src/main/java/com/yahoo/search/yql/Operator.java | 2 +- .../src/main/java/com/yahoo/search/yql/OperatorNode.java | 2 +- .../com/yahoo/search/yql/OperatorNodeListTypeChecker.java | 2 +- .../java/com/yahoo/search/yql/OperatorTypeChecker.java | 2 +- .../main/java/com/yahoo/search/yql/OperatorVisitor.java | 2 +- .../src/main/java/com/yahoo/search/yql/ParserBase.java | 2 +- .../java/com/yahoo/search/yql/ProgramCompileException.java | 2 +- .../src/main/java/com/yahoo/search/yql/ProgramParser.java | 2 +- .../main/java/com/yahoo/search/yql/ProjectOperator.java | 2 +- .../main/java/com/yahoo/search/yql/ProjectionBuilder.java | 2 +- .../main/java/com/yahoo/search/yql/SequenceOperator.java | 2 +- .../src/main/java/com/yahoo/search/yql/SortOperator.java | 2 +- .../main/java/com/yahoo/search/yql/StatementOperator.java | 2 +- .../main/java/com/yahoo/search/yql/StringUnescaper.java | 2 +- .../src/main/java/com/yahoo/search/yql/TypeCheckers.java | 2 +- .../src/main/java/com/yahoo/search/yql/TypeOperator.java | 2 +- .../main/java/com/yahoo/search/yql/VespaGroupingStep.java | 2 +- .../main/java/com/yahoo/search/yql/VespaSerializer.java | 2 +- .../src/main/java/com/yahoo/search/yql/YqlParser.java | 2 +- .../src/main/java/com/yahoo/search/yql/YqlQuery.java | 2 +- .../src/main/java/com/yahoo/search/yql/package-info.java | 2 +- .../com/yahoo/text/interpretation/AnnotationClass.java | 2 +- .../java/com/yahoo/text/interpretation/Annotations.java | 2 +- .../java/com/yahoo/text/interpretation/Interpretation.java | 2 +- .../java/com/yahoo/text/interpretation/Modification.java | 2 +- .../src/main/java/com/yahoo/text/interpretation/Span.java | 2 +- .../java/com/yahoo/text/interpretation/package-info.java | 2 +- .../java/com/yahoo/vespa/streamingvisitors/ListMerger.java | 2 +- .../com/yahoo/vespa/streamingvisitors/MetricsSearcher.java | 2 +- .../vespa/streamingvisitors/VdsStreamingSearcher.java | 2 +- .../java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java | 2 +- .../java/com/yahoo/vespa/streamingvisitors/Visitor.java | 2 +- .../com/yahoo/vespa/streamingvisitors/VisitorFactory.java | 2 +- .../com/yahoo/prelude/semantics/parser/SemanticsParser.jj | 2 +- .../yahoo/search/grouping/request/parser/GroupingParser.jj | 2 +- .../com/yahoo/search/query/textserialize/parser/Parser.jj | 2 +- .../src/main/resources/configdefinitions/cluster.def | 2 +- .../main/resources/configdefinitions/documentdb-info.def | 2 +- .../src/main/resources/configdefinitions/emulation.def | 2 +- .../src/main/resources/configdefinitions/federation.def | 2 +- .../src/main/resources/configdefinitions/fs4.def | 2 +- .../src/main/resources/configdefinitions/index-info.def | 2 +- .../src/main/resources/configdefinitions/keyvalue.def | 2 +- .../main/resources/configdefinitions/legacy-emulation.def | 2 +- .../src/main/resources/configdefinitions/lowercasing.def | 2 +- .../src/main/resources/configdefinitions/measure-qps.def | 2 +- .../main/resources/configdefinitions/page-templates.def | 2 +- .../src/main/resources/configdefinitions/provider.def | 2 +- .../resources/configdefinitions/qr-binary-cache-region.def | 2 +- .../main/resources/configdefinitions/qr-binary-cache.def | 2 +- .../src/main/resources/configdefinitions/qr-monitor.def | 2 +- .../src/main/resources/configdefinitions/qr-quotetable.def | 2 +- .../src/main/resources/configdefinitions/qr-start.def | 2 +- .../main/resources/configdefinitions/query-profiles.def | 2 +- .../src/main/resources/configdefinitions/rate-limiting.def | 2 +- .../src/main/resources/configdefinitions/resolvers.def | 2 +- .../src/main/resources/configdefinitions/rewrites.def | 2 +- .../src/main/resources/configdefinitions/search-nodes.def | 2 +- .../configdefinitions/search-with-renderer-handler.def | 2 +- .../resources/configdefinitions/searchchain-forward.def | 2 +- .../main/resources/configdefinitions/semantic-rules.def | 2 +- .../main/resources/configdefinitions/strict-contracts.def | 2 +- .../main/resources/configdefinitions/timing-searcher.def | 2 +- container-search/src/main/sh/invoke | 2 +- .../test/java/com/yahoo/container/test/ConstantFile.java | 2 +- .../test/java/com/yahoo/fs4/PacketQueryTracerTestCase.java | 2 +- .../src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java | 2 +- .../src/test/java/com/yahoo/fs4/test/FastHitTestCase.java | 2 +- .../java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java | 2 +- .../java/com/yahoo/fs4/test/HexByteIteratorTestCase.java | 2 +- .../java/com/yahoo/fs4/test/PacketDecoderTestCase.java | 2 +- .../src/test/java/com/yahoo/fs4/test/PacketTestCase.java | 2 +- .../test/java/com/yahoo/fs4/test/QueryResultTestCase.java | 2 +- .../src/test/java/com/yahoo/fs4/test/QueryTestCase.java | 2 +- .../test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java | 2 +- .../src/test/java/com/yahoo/osgi/test/Calculator.java | 2 +- .../osgi/test/calculatorservice/CalculatorService.java | 2 +- .../src/test/java/com/yahoo/osgi/test/client/Client.java | 2 +- .../com/yahoo/osgi/test/counterservice/CounterService.java | 2 +- .../yahoo/osgi/test/counterservice/CounterServiceImpl.java | 2 +- .../src/test/java/com/yahoo/prelude/IndexFactsFactory.java | 2 +- .../java/com/yahoo/prelude/cache/test/CacheTestCase.java | 2 +- .../com/yahoo/prelude/cluster/ClusterSearcherTestCase.java | 2 +- .../com/yahoo/prelude/cluster/test/HasherTestCase.java | 2 +- .../com/yahoo/prelude/fastsearch/DocsumFieldTestCase.java | 2 +- .../java/com/yahoo/prelude/fastsearch/FieldsTestCase.java | 2 +- .../com/yahoo/prelude/fastsearch/JsonFieldTestCase.java | 2 +- .../com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java | 2 +- .../yahoo/prelude/fastsearch/test/CacheKeyTestCase.java | 2 +- .../prelude/fastsearch/test/DirectSearchTestCase.java | 1 + .../prelude/fastsearch/test/DocsumDefinitionTestCase.java | 2 +- .../prelude/fastsearch/test/FastSearcherTestCase.java | 2 +- .../yahoo/prelude/fastsearch/test/FastSearcherTester.java | 1 + .../com/yahoo/prelude/fastsearch/test/MockDispatcher.java | 1 + .../yahoo/prelude/fastsearch/test/PacketCacheTestCase.java | 2 +- .../prelude/fastsearch/test/PacketWrapperTestCase.java | 2 +- .../yahoo/prelude/fastsearch/test/PartialFillTestCase.java | 2 +- .../prelude/fastsearch/test/fs4mock/DispatchThread.java | 2 +- .../yahoo/prelude/fastsearch/test/fs4mock/MockBackend.java | 1 + .../prelude/fastsearch/test/fs4mock/MockFDispatch.java | 2 +- .../fastsearch/test/fs4mock/MockFS4ResourcePool.java | 1 + .../prelude/fastsearch/test/fs4mock/MockFSChannel.java | 1 + .../fastsearch/test/fs4mock/NonWorkingMockFSChannel.java | 1 + .../com/yahoo/prelude/hitfield/XmlRendererTestCase.java | 2 +- .../com/yahoo/prelude/hitfield/test/HitFieldTestCase.java | 2 +- .../yahoo/prelude/hitfield/test/JSONStringTestCase.java | 2 +- .../prelude/hitfield/test/TokenFieldIteratorTestCase.java | 2 +- .../java/com/yahoo/prelude/query/ItemHelperTestCase.java | 2 +- .../java/com/yahoo/prelude/query/ItemLabelTestCase.java | 2 +- .../com/yahoo/prelude/query/ItemsCommonStuffTestCase.java | 2 +- .../com/yahoo/prelude/query/TaggableItemsTestCase.java | 2 +- .../yahoo/prelude/query/WordAlternativesItemTestCase.java | 2 +- .../com/yahoo/prelude/query/parser/TestLinguistics.java | 2 +- .../java/com/yahoo/prelude/query/parser/TestSegmenter.java | 2 +- .../prelude/query/parser/UnicodePropertyDumpTestCase.java | 2 +- .../parser/test/ExactMatchAndDefaultIndexTestCase.java | 2 +- .../com/yahoo/prelude/query/parser/test/ParseTestCase.java | 2 +- .../com/yahoo/prelude/query/parser/test/ParsingTester.java | 2 +- .../yahoo/prelude/query/parser/test/SubstringTestCase.java | 2 +- .../yahoo/prelude/query/parser/test/TokenizerTestCase.java | 2 +- .../prelude/query/parser/test/WashPhrasesTestCase.java | 2 +- .../yahoo/prelude/query/test/DotProductItemTestCase.java | 2 +- .../java/com/yahoo/prelude/query/test/IntItemTestCase.java | 2 +- .../com/yahoo/prelude/query/test/ItemEncodingTestCase.java | 2 +- .../com/yahoo/prelude/query/test/PhraseItemTestCase.java | 2 +- .../prelude/query/test/PredicateQueryItemTestCase.java | 4 ++-- .../query/test/QueryCanonicalizerMicroBenchmark.java | 2 +- .../prelude/query/test/QueryCanonicalizerTestCase.java | 2 +- .../yahoo/prelude/query/test/QueryLanguageTestCase.java | 2 +- .../java/com/yahoo/prelude/query/test/QueryTestCase.java | 2 +- .../com/yahoo/prelude/query/test/RangeItemTestCase.java | 2 +- .../com/yahoo/prelude/query/test/SegmentItemTestCase.java | 2 +- .../com/yahoo/prelude/query/test/WandItemTestCase.java | 2 +- .../yahoo/prelude/query/test/WeightedSetItemTestCase.java | 2 +- .../test/TextualQueryRepresentationTestCase.java | 2 +- .../prelude/querytransform/test/CJKSearcherTestCase.java | 2 +- .../test/CollapsePhraseSearcherTestCase.java | 2 +- .../querytransform/test/IndexCombinatorTestCase.java | 2 +- .../querytransform/test/LiteralBoostSearcherTestCase.java | 2 +- .../querytransform/test/NoRankingSearcherTestCase.java | 2 +- .../querytransform/test/NonPhrasingSearcherTestCase.java | 2 +- .../querytransform/test/NormalizingSearcherTestCase.java | 2 +- .../prelude/querytransform/test/PhraseMatcherTestCase.java | 2 +- .../querytransform/test/PhrasingSearcherTestCase.java | 2 +- .../prelude/querytransform/test/QueryRewriteTestCase.java | 2 +- .../querytransform/test/RecallSearcherTestCase.java | 2 +- .../querytransform/test/StemmingSearcherTestCase.java | 2 +- .../prelude/searcher/test/BlendingSearcherTestCase.java | 2 +- .../prelude/searcher/test/CachingSearcherTestCase.java | 2 +- .../prelude/searcher/test/ErrorHitRenderTestCase.java | 2 +- .../searcher/test/FieldCollapsingSearcherTestCase.java | 2 +- .../prelude/searcher/test/JSONDebugSearcherTestCase.java | 2 +- .../prelude/searcher/test/JuniperSearcherTestCase.java | 2 +- .../prelude/searcher/test/MultipleResultsTestCase.java | 2 +- .../yahoo/prelude/searcher/test/PosSearcherTestCase.java | 2 +- .../searcher/test/QuerySnapshotSearcherTestCase.java | 2 +- .../searcher/test/QueryValidatingSearcherTestCase.java | 2 +- .../prelude/searcher/test/QuotingSearcherTestCase.java | 2 +- .../searcher/test/ValidatePredicateSearcherTestCase.java | 2 +- .../searcher/test/ValidateSortingSearcherTestCase.java | 2 +- .../test/java/com/yahoo/prelude/searcher/test/testhit.xml | 2 +- .../semantics/config/test/RuleConfigDeriverTestCase.java | 2 +- .../semantics/parser/test/SemanticsParserTestCase.java | 2 +- .../java/com/yahoo/prelude/semantics/parser/test/rules.sr | 2 +- .../com/yahoo/prelude/semantics/test/AlibabaTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/AnchorTestCase.java | 2 +- .../yahoo/prelude/semantics/test/AutomataNotTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/AutomataTestCase.java | 2 +- .../yahoo/prelude/semantics/test/BacktrackingTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/BlendingTestCase.java | 2 +- .../java/com/yahoo/prelude/semantics/test/CJKTestCase.java | 2 +- .../yahoo/prelude/semantics/test/ComparisonTestCase.java | 2 +- .../yahoo/prelude/semantics/test/ComparisonsTestCase.java | 2 +- .../yahoo/prelude/semantics/test/ConditionTestCase.java | 2 +- .../prelude/semantics/test/ConfigurationTestCase.java | 2 +- .../prelude/semantics/test/DuplicateRuleTestCase.java | 2 +- .../yahoo/prelude/semantics/test/Ellipsis2TestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/EllipsisTestCase.java | 2 +- .../yahoo/prelude/semantics/test/ExactMatchTestCase.java | 2 +- .../prelude/semantics/test/ExactMatchTrickTestCase.java | 2 +- .../yahoo/prelude/semantics/test/InheritanceTestCase.java | 2 +- .../prelude/semantics/test/LabelMatchingTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/MatchAllTestCase.java | 2 +- .../semantics/test/MatchOnlyIfNotOnlyTermTestCase.java | 2 +- .../yahoo/prelude/semantics/test/NoStemmingTestCase.java | 2 +- .../java/com/yahoo/prelude/semantics/test/NotTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/NumbersTestCase.java | 2 +- .../yahoo/prelude/semantics/test/NumericTermsTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/OrPhraseTestCase.java | 2 +- .../yahoo/prelude/semantics/test/Parameter2TestCase.java | 2 +- .../yahoo/prelude/semantics/test/ParameterTestCase.java | 2 +- .../yahoo/prelude/semantics/test/PhraseMatchTestCase.java | 2 +- .../prelude/semantics/test/ProductionRuleTestCase.java | 2 +- .../prelude/semantics/test/RuleBaseAbstractTestCase.java | 2 +- .../semantics/test/SegmentSubstitutionTestCase.java | 2 +- .../prelude/semantics/test/SemanticSearcherTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/StemmingTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/StopwordTestCase.java | 2 +- .../java/com/yahoo/prelude/semantics/test/UrlTestCase.java | 2 +- .../yahoo/prelude/semantics/test/WeightingTestCase.java | 2 +- .../com/yahoo/prelude/semantics/test/rulebases/alibaba.sr | 2 +- .../com/yahoo/prelude/semantics/test/rulebases/anchor.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/automatanot.sr | 2 +- .../prelude/semantics/test/rulebases/automatarules.sr | 2 +- .../prelude/semantics/test/rulebases/backtrackingrules.sr | 2 +- .../com/yahoo/prelude/semantics/test/rulebases/blending.sr | 2 +- .../java/com/yahoo/prelude/semantics/test/rulebases/cjk.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/comparison.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/comparisons.sr | 2 +- .../prelude/semantics/test/rulebases/duplicaterules.sr | 2 +- .../com/yahoo/prelude/semantics/test/rulebases/ellipsis.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/ellipsis2.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/exactmatch.sr | 2 +- .../prelude/semantics/test/rulebases/exactmatchtrick.sr | 2 +- .../semantics/test/rulebases/inheritingrules/child1.sr | 2 +- .../semantics/test/rulebases/inheritingrules/child2.sr | 2 +- .../semantics/test/rulebases/inheritingrules/cjk.sr | 2 +- .../semantics/test/rulebases/inheritingrules/grandchild.sr | 2 +- .../test/rulebases/inheritingrules/grandfather.sr | 2 +- .../test/rulebases/inheritingrules/grandmother.sr | 2 +- .../semantics/test/rulebases/inheritingrules/parent.sr | 2 +- .../prelude/semantics/test/rulebases/labelmatching.sr | 2 +- .../test/rulebases/match-only-if-not-only-term.sr | 2 +- .../com/yahoo/prelude/semantics/test/rulebases/matchall.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/nostemming.sr | 2 +- .../java/com/yahoo/prelude/semantics/test/rulebases/not.sr | 2 +- .../com/yahoo/prelude/semantics/test/rulebases/numbers.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/numericterms.sr | 2 +- .../com/yahoo/prelude/semantics/test/rulebases/orphrase.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/parameter.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/parameter2.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/phrasematch.sr | 2 +- .../com/yahoo/prelude/semantics/test/rulebases/rules.sr | 2 +- .../prelude/semantics/test/rulebases/semantic-rules.cfg | 14 +++++++------- .../com/yahoo/prelude/semantics/test/rulebases/stemming.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/stopwords.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/substitution.sr | 2 +- .../java/com/yahoo/prelude/semantics/test/rulebases/url.sr | 2 +- .../yahoo/prelude/semantics/test/rulebases/weighting.sr | 2 +- .../com/yahoo/prelude/templates/test/BoomTemplate.java | 2 +- .../prelude/templates/test/GroupedResultTestCase.java | 2 +- .../yahoo/prelude/templates/test/HitContextTestCase.java | 2 +- .../com/yahoo/prelude/templates/test/TemplateTestCase.java | 2 +- .../com/yahoo/prelude/templates/test/TestTemplate.java | 2 +- .../com/yahoo/prelude/templates/test/TilingTestCase.java | 2 +- .../com/yahoo/prelude/templates/test/templates/templaterc | 5 ----- .../com/yahoo/prelude/templates/test/tilingexample.xml | 2 +- .../com/yahoo/prelude/templates/test/tilingexample2.xml | 2 +- .../test/java/com/yahoo/prelude/test/DummySearcher.java | 2 +- .../java/com/yahoo/prelude/test/GetRawWordTestCase.java | 2 +- .../java/com/yahoo/prelude/test/IndexFactsTestCase.java | 2 +- .../java/com/yahoo/prelude/test/IntegrationTestCase.java | 2 +- .../test/java/com/yahoo/prelude/test/LocationTestCase.java | 2 +- .../java/com/yahoo/prelude/test/NullSetMemberTestCase.java | 2 +- .../test/java/com/yahoo/prelude/test/QueryTestCase.java | 2 +- .../com/yahoo/prelude/test/RankFeatureDumpTestCase.java | 2 +- .../test/java/com/yahoo/prelude/test/ResultTestCase.java | 2 +- .../com/yahoo/prelude/test/integration/FirstSearcher.java | 2 +- .../com/yahoo/prelude/test/integration/SecondSearcher.java | 2 +- .../com/yahoo/prelude/test/integration/ThirdSearcher.java | 2 +- .../com/yahoo/search/StupidSingleThreadedHttpServer.java | 2 +- .../yahoo/search/cluster/test/ClusterSearcherTestCase.java | 2 +- .../search/cluster/test/ClusteredConnectionTestCase.java | 2 +- .../debug/test/SearchChainTextRepresentationTestCase.java | 2 +- .../test/java/com/yahoo/search/dispatch/FillTestCase.java | 2 +- .../test/java/com/yahoo/search/dispatch/MockClient.java | 2 +- .../com/yahoo/search/federation/FederationResultTest.java | 1 + .../federation/http/GzipDecompressingEntityTestCase.java | 2 +- .../yahoo/search/federation/http/HttpParametersTest.java | 2 +- .../com/yahoo/search/federation/http/HttpPostTestCase.java | 2 +- .../com/yahoo/search/federation/http/HttpTestCase.java | 2 +- .../com/yahoo/search/federation/http/PingTestCase.java | 2 +- .../search/federation/http/QueryParametersTestCase.java | 2 +- .../sourceref/test/SearchChainResolverTestCase.java | 2 +- .../sourceref/test/SourceRefResolverTestCase.java | 2 +- .../federation/test/AddHitsWithRelevanceSearcher.java | 2 +- .../com/yahoo/search/federation/test/BlockingSearcher.java | 2 +- .../search/federation/test/DuplicateSourceTestCase.java | 1 + .../search/federation/test/FederationSearcherTest.java | 2 +- .../search/federation/test/FederationSearcherTestCase.java | 2 +- .../com/yahoo/search/federation/test/FederationTester.java | 2 +- .../com/yahoo/search/federation/test/HitCountTestCase.java | 2 +- .../yahoo/search/federation/test/SetHitCountsSearcher.java | 2 +- .../federation/vespa/test/QueryMarshallerTestCase.java | 2 +- .../federation/vespa/test/QueryParametersTestCase.java | 2 +- .../federation/vespa/test/ResultBuilderTestCase.java | 2 +- .../federation/vespa/test/VespaIntegrationTestCase.java | 2 +- .../federation/vespa/test/VespaSearcherTestCase.java | 2 +- .../java/com/yahoo/search/federation/vespa/test/idhits.xml | 2 +- .../com/yahoo/search/federation/vespa/test/nestedhits.xml | 2 +- .../com/yahoo/search/grouping/ContinuationTestCase.java | 2 +- .../yahoo/search/grouping/GroupingQueryParserTestCase.java | 2 +- .../com/yahoo/search/grouping/GroupingRequestTestCase.java | 2 +- .../yahoo/search/grouping/GroupingValidatorTestCase.java | 2 +- .../search/grouping/UniqueGroupingSearcherTestCase.java | 2 +- .../search/grouping/request/BucketResolverTestCase.java | 2 +- .../search/grouping/request/ExpressionVisitorTestCase.java | 2 +- .../search/grouping/request/GroupingOperationTestCase.java | 2 +- .../search/grouping/request/MathFunctionsTestCase.java | 2 +- .../search/grouping/request/MathResolverTestCase.java | 2 +- .../yahoo/search/grouping/request/RawBufferTestCase.java | 2 +- .../com/yahoo/search/grouping/request/RequestTestCase.java | 2 +- .../request/parser/GroupingParserBenchmarkTest.java | 2 +- .../grouping/request/parser/GroupingParserTestCase.java | 2 +- .../com/yahoo/search/grouping/result/GroupIdTestCase.java | 2 +- .../yahoo/search/grouping/result/GroupListTestCase.java | 2 +- .../com/yahoo/search/grouping/result/GroupTestCase.java | 2 +- .../com/yahoo/search/grouping/result/HitListTestCase.java | 2 +- .../yahoo/search/grouping/result/HitRendererTestCase.java | 2 +- .../grouping/vespa/CompositeContinuationTestCase.java | 2 +- .../search/grouping/vespa/GroupingExecutorTestCase.java | 2 +- .../search/grouping/vespa/GroupingTransformTestCase.java | 2 +- .../yahoo/search/grouping/vespa/HitConverterTestCase.java | 2 +- .../search/grouping/vespa/IntegerDecoderTestCase.java | 2 +- .../search/grouping/vespa/IntegerEncoderTestCase.java | 2 +- .../search/grouping/vespa/OffsetContinuationTestCase.java | 2 +- .../search/grouping/vespa/RequestBuilderTestCase.java | 2 +- .../yahoo/search/grouping/vespa/ResultBuilderTestCase.java | 2 +- .../com/yahoo/search/grouping/vespa/ResultIdTestCase.java | 2 +- .../yahoo/search/handler/test/SearchHandlerTestCase.java | 2 +- .../java/com/yahoo/search/match/test/DocumentDbTest.java | 2 +- .../config/test/MapPageTemplateXMLReadingTestCase.java | 2 +- .../config/test/PageTemplateXMLReadingTestCase.java | 2 +- .../pagetemplates/config/test/examples/choiceFooter.xml | 2 +- .../pagetemplates/config/test/examples/choiceHeader.xml | 2 +- .../search/pagetemplates/config/test/examples/footer.xml | 2 +- .../search/pagetemplates/config/test/examples/generic.xml | 2 +- .../search/pagetemplates/config/test/examples/header.xml | 2 +- .../search/pagetemplates/config/test/examples/includer.xml | 2 +- .../config/test/examples/invalidfilename/invalid.xml | 2 +- .../config/test/examples/mapexamples/map1.xml | 2 +- .../search/pagetemplates/config/test/examples/richSerp.xml | 2 +- .../pagetemplates/config/test/examples/richerSerp.xml | 2 +- .../search/pagetemplates/config/test/examples/serp.xml | 2 +- .../pagetemplates/config/test/examples/slottingSerp.xml | 2 +- .../yahoo/search/pagetemplates/engine/test/AnySource.xml | 2 +- .../search/pagetemplates/engine/test/AnySourceResult.xml | 2 +- .../pagetemplates/engine/test/AnySourceTestCase.java | 2 +- .../search/pagetemplates/engine/test/ChoiceOfRenderers.xml | 2 +- .../pagetemplates/engine/test/ChoiceOfRenderersResult.xml | 2 +- .../engine/test/ChoiceOfRenderersTestCase.java | 2 +- .../pagetemplates/engine/test/ChoiceOfSubsections.xml | 2 +- .../engine/test/ChoiceOfSubsectionsResult.xml | 2 +- .../engine/test/ChoiceOfSubsectionsTestCase.java | 2 +- .../pagetemplates/engine/test/ChoiceOfTwoSources.xml | 2 +- .../pagetemplates/engine/test/ChoiceOfTwoSourcesResult.xml | 2 +- .../engine/test/ChoiceOfTwoSourcesTestCase.java | 2 +- .../com/yahoo/search/pagetemplates/engine/test/Choices.xml | 2 +- .../search/pagetemplates/engine/test/ChoicesResult.xml | 2 +- .../search/pagetemplates/engine/test/ChoicesTestCase.java | 2 +- .../engine/test/ExecutionAbstractTestCase.java | 2 +- .../pagetemplates/engine/test/MapSectionsToSections.xml | 2 +- .../engine/test/MapSectionsToSectionsResult.xml | 2 +- .../engine/test/MapSectionsToSectionsTestCase.java | 2 +- .../pagetemplates/engine/test/MapSourcesToSections.xml | 2 +- .../engine/test/MapSourcesToSectionsResult.xml | 2 +- .../engine/test/MapSourcesToSectionsTestCase.java | 2 +- .../com/yahoo/search/pagetemplates/engine/test/Page.xml | 2 +- .../yahoo/search/pagetemplates/engine/test/PageResult.xml | 2 +- .../search/pagetemplates/engine/test/PageTestCase.java | 2 +- .../search/pagetemplates/engine/test/PageWithBlending.xml | 2 +- .../pagetemplates/engine/test/PageWithBlendingResult.xml | 2 +- .../engine/test/PageWithBlendingTestCase.java | 2 +- .../pagetemplates/engine/test/PageWithSourceRenderer.xml | 2 +- .../engine/test/PageWithSourceRendererResult.xml | 2 +- .../engine/test/PageWithSourceRendererTestCase.java | 2 +- .../search/pagetemplates/engine/test/SourceChoice.xml | 2 +- .../pagetemplates/engine/test/SourceChoiceResult.xml | 2 +- .../pagetemplates/engine/test/SourceChoiceTestCase.java | 2 +- .../pagetemplates/engine/test/TwoSectionsFourSources.xml | 2 +- .../engine/test/TwoSectionsFourSourcesResult.xml | 2 +- .../engine/test/TwoSectionsFourSourcesTestCase.java | 2 +- .../pagetemplates/test/PageTemplateSearcherTestCase.java | 2 +- .../yahoo/search/pagetemplates/test/SourceParameters.xml | 2 +- .../pagetemplates/test/SourceParametersTestCase.java | 2 +- .../test/java/com/yahoo/search/query/MatchingTestCase.java | 1 + .../java/com/yahoo/search/query/SoftTimeoutTestCase.java | 1 + .../test/java/com/yahoo/search/query/SortingTestCase.java | 2 +- .../search/query/context/test/ConcurrentTraceTestCase.java | 2 +- .../yahoo/search/query/context/test/LoggingTestCase.java | 2 +- .../search/query/context/test/PropertiesTestCase.java | 2 +- .../com/yahoo/search/query/context/test/TraceTestCase.java | 2 +- .../query/profile/config/test/MultiProfileTestCase.java | 2 +- .../config/test/QueryProfileConfigurationTestCase.java | 2 +- .../config/test/QueryProfileIntegrationTestCase.java | 2 +- .../config/test/TypedProfilesConfigurationTestCase.java | 2 +- .../query/profile/config/test/XmlReadingTestCase.java | 2 +- .../profile/config/test/invalidxml1/illegalSetting.xml | 2 +- .../query/profile/config/test/invalidxml2/unparseable.xml | 2 +- .../query/profile/config/test/invalidxml3/default.xml | 2 +- .../search/query/profile/config/test/klee/production.xml | 2 +- .../query/profile/config/test/klee/twitter_dd-us-0.2.4.xml | 2 +- .../query/profile/config/test/klee/twitter_dd-us.xml | 2 +- .../search/query/profile/config/test/klee/twitter_dd.xml | 2 +- .../profile/config/test/multiprofile/multiprofile1.xml | 2 +- .../config/test/multiprofile/multiprofileDimensions.xml | 2 +- .../query/profile/config/test/multiprofile/parent1.xml | 2 +- .../query/profile/config/test/multiprofile/parent2.xml | 2 +- .../search/query/profile/config/test/news/default.xml | 2 +- .../search/query/profile/config/test/news/yahoo_uk.xml | 2 +- .../query/profile/config/test/news/yahoo_uk_test.xml | 2 +- .../search/query/profile/config/test/newscase1/default.xml | 2 +- .../search/query/profile/config/test/newscase1/parent.xml | 2 +- .../search/query/profile/config/test/newscase2/default.xml | 2 +- .../search/query/profile/config/test/newscase2/parent.xml | 2 +- .../search/query/profile/config/test/newscase3/default.xml | 2 +- .../search/query/profile/config/test/newscase3/parent.xml | 2 +- .../search/query/profile/config/test/newscase4/default.xml | 2 +- .../search/query/profile/config/test/newscase4/parent.xml | 2 +- .../query/profile/config/test/newsfe/backend_news.xml | 2 +- .../search/query/profile/config/test/newsfe/default.xml | 2 +- .../profile/config/test/newsfe2/backend.news.provider.xml | 2 +- .../search/query/profile/config/test/newsfe2/default.xml | 2 +- .../profile/config/test/queryprofilevariants2/default.xml | 2 +- .../config/test/queryprofilevariants2/mandatory.xml | 2 +- .../test/queryprofilevariants2/mandatorySpecified.xml | 2 +- .../profile/config/test/queryprofilevariants2/multi.xml | 2 +- .../config/test/queryprofilevariants2/multiDimensions.xml | 2 +- .../config/test/queryprofilevariants2/querybest.xml | 2 +- .../config/test/queryprofilevariants2/querylove.xml | 2 +- .../test/queryprofilevariants2/referingQuerybest.xml | 2 +- .../test/queryprofilevariants2/root.unoverridableIndex.xml | 2 +- .../profile/config/test/queryprofilevariants2/root.xml | 2 +- .../config/test/queryprofilevariants2/rootChild.xml | 2 +- .../config/test/queryprofilevariants2/rootStrict.xml | 2 +- .../config/test/queryprofilevariants2/rootWithFilter.xml | 2 +- .../profile/config/test/queryprofilevariants2/test.xml | 2 +- .../config/test/queryprofilevariants2/types/forbidding.xml | 2 +- .../config/test/queryprofilevariants2/types/mandatory.xml | 2 +- .../config/test/queryprofilevariants2/types/root.xml | 2 +- .../config/test/queryprofilevariants2/types/rootStrict.xml | 2 +- .../query/profile/config/test/refoverride/MyProfile1.xml | 2 +- .../query/profile/config/test/refoverride/MyProfile2.xml | 2 +- .../query/profile/config/test/refoverride/default.xml | 2 +- .../profile/config/test/refoverridetyped/MyProfile1.xml | 2 +- .../profile/config/test/refoverridetyped/MyProfile2.xml | 2 +- .../query/profile/config/test/refoverridetyped/default.xml | 2 +- .../profile/config/test/refoverridetyped/types/default.xml | 2 +- .../query/profile/config/test/sourceprovider/common.xml | 2 +- .../query/profile/config/test/sourceprovider/myprofile.xml | 2 +- .../query/profile/config/test/sourceprovider/provider.xml | 2 +- .../query/profile/config/test/sourceprovider/source.xml | 2 +- .../query/profile/config/test/systemtest/default.xml | 2 +- .../search/query/profile/config/test/validxml/default.xml | 2 +- .../query/profile/config/test/validxml/modelSettings.xml | 2 +- .../config/test/validxml/referencingModelSettings.xml | 2 +- .../search/query/profile/config/test/validxml/root.xml | 2 +- .../search/query/profile/config/test/validxml/someUser.xml | 2 +- .../query/profile/config/test/validxml/types/rootType.xml | 2 +- .../query/profile/config/test/validxml/types/user.xml | 2 +- .../profile/config/test/versionrefs/MyProfile-1.0.0.xml | 2 +- .../profile/config/test/versionrefs/MyProfile-1.0.2.a.xml | 2 +- .../profile/config/test/versionrefs/MyProfile-1.0.2.xml | 2 +- .../query/profile/config/test/versionrefs/default.xml | 2 +- .../profile/config/test/versions/testprofile-1.20.100.xml | 2 +- .../query/profile/config/test/versions/testprofile.xml | 2 +- .../yahoo/search/query/profile/test/CloningTestCase.java | 2 +- .../query/profile/test/DimensionBindingTestCase.java | 2 +- .../yahoo/search/query/profile/test/DumpToolTestCase.java | 2 +- .../query/profile/test/QueryFromProfileTestCase.java | 2 +- .../profile/test/QueryProfileCloneMicroBenchmark.java | 2 +- .../QueryProfileGetInComplexStructureMicroBenchmark.java | 2 +- .../query/profile/test/QueryProfileGetMicroBenchmark.java | 2 +- .../test/QueryProfileListPropertiesMicroBenchmark.java | 2 +- .../profile/test/QueryProfileSubstitutionTestCase.java | 2 +- .../search/query/profile/test/QueryProfileTestCase.java | 2 +- .../profile/test/QueryProfileVariantsCloneTestCase.java | 2 +- .../query/profile/test/QueryProfileVariantsTestCase.java | 2 +- .../search/query/profile/types/test/FieldTypeTestCase.java | 2 +- .../search/query/profile/types/test/MandatoryTestCase.java | 2 +- .../search/query/profile/types/test/NameTestCase.java | 2 +- .../query/profile/types/test/NativePropertiesTestCase.java | 2 +- .../search/query/profile/types/test/OverrideTestCase.java | 2 +- .../query/profile/types/test/PatchMatchingTestCase.java | 2 +- .../types/test/QueryProfileTypeInheritanceTestCase.java | 2 +- .../query/profile/types/test/QueryProfileTypeTestCase.java | 2 +- .../search/query/properties/test/PropertyMapTestCase.java | 2 +- .../properties/test/RequestContextPropertiesTestCase.java | 2 +- .../query/properties/test/SubPropertiesTestCase.java | 2 +- .../search/query/rewrite/RewriterFeaturesTestCase.java | 2 +- .../rewrite/test/GenericExpansionRewriterTestCase.java | 2 +- .../query/rewrite/test/MisspellRewriterTestCase.java | 2 +- .../search/query/rewrite/test/NameRewriterTestCase.java | 2 +- .../query/rewrite/test/QueryRewriteSearcherTestCase.java | 2 +- .../query/rewrite/test/QueryRewriteSearcherTestUtils.java | 2 +- .../test/SearchChainDispatcherSearcherTestCase.java | 2 +- .../java/com/yahoo/search/query/test/ModelTestCase.java | 2 +- .../com/yahoo/search/query/test/ParametersTestCase.java | 2 +- .../com/yahoo/search/query/test/PresentationTestCase.java | 2 +- .../yahoo/search/query/test/QueryCloneMicroBenchmark.java | 2 +- .../java/com/yahoo/search/query/test/RankingTestCase.java | 2 +- .../query/textserialize/item/test/ParseItemTestCase.java | 2 +- .../serializer/test/SerializeItemTestCase.java | 2 +- .../search/querytransform/BooleanAttributeParserTest.java | 2 +- .../search/querytransform/BooleanSearcherTestCase.java | 2 +- .../search/querytransform/LegacyCombinatorTestCase.java | 2 +- .../yahoo/search/querytransform/LowercasingTestCase.java | 2 +- .../java/com/yahoo/search/querytransform/TestUtils.java | 2 +- .../yahoo/search/querytransform/WandSearcherTestCase.java | 2 +- .../search/querytransform/test/NGramSearcherTestCase.java | 2 +- .../querytransform/test/QueryCombinatorTestCase.java | 2 +- .../querytransform/test/RangeQueryOptimizerTestCase.java | 2 +- .../querytransform/test/SortingDegraderTestCase.java | 2 +- .../search/rendering/AsyncGroupPopulationTestCase.java | 2 +- .../com/yahoo/search/rendering/JsonRendererTestCase.java | 2 +- .../search/rendering/SyncDefaultRendererTestCase.java | 2 +- .../com/yahoo/search/rendering/XMLRendererTestCase.java | 2 +- .../com/yahoo/search/result/DefaultErrorHitTestCase.java | 2 +- .../java/com/yahoo/search/result/NanNumberTestCase.java | 2 +- .../java/com/yahoo/search/result/TemplatingTestCase.java | 2 +- .../com/yahoo/search/result/test/ArrayOutputTestCase.java | 2 +- .../com/yahoo/search/result/test/CoverageTestCase.java | 2 +- .../yahoo/search/result/test/DeepHitIteratorTestCase.java | 2 +- .../yahoo/search/result/test/DefaultErrorHitTestCase.java | 2 +- .../java/com/yahoo/search/result/test/FillingTestCase.java | 2 +- .../com/yahoo/search/result/test/HitGroupTestCase.java | 2 +- .../searchchain/config/test/DependencyConfigTestCase.java | 2 +- .../config/test/SearchChainConfigurerTestCase.java | 2 +- .../searchchain/config/test/searcher1/Searcher1.java | 2 +- .../searchchain/config/test/searcher2/Searcher2.java | 2 +- .../config/test/twosearchers/MultiSearcher1.java | 2 +- .../config/test/twosearchers/MultiSearcher2.java | 2 +- .../config/test/updatesearcher/UpdateSearcher.java | 2 +- .../searchchain/test/AsyncExecutionOfOneChainTestCase.java | 2 +- .../search/searchchain/test/AsyncExecutionTestCase.java | 2 +- .../yahoo/search/searchchain/test/ExecutionTestCase.java | 2 +- .../yahoo/search/searchchain/test/FutureDataTestCase.java | 2 +- .../yahoo/search/searchchain/test/SearchChainTestCase.java | 2 +- .../yahoo/search/searchchain/test/SimpleSearchChain.java | 2 +- .../com/yahoo/search/searchchain/test/TraceTestCase.java | 2 +- .../search/searchchain/test/VespaAsyncSearcherTest.java | 2 +- .../searchers/test/CacheControlSearcherTestCase.java | 2 +- .../searchers/test/ConnectionControlSearcherTestCase.java | 2 +- .../searchers/test/InputCheckingSearcherTestCase.java | 2 +- .../java/com/yahoo/search/searchers/test/MockMetric.java | 2 +- .../yahoo/search/searchers/test/RateLimitingBenchmark.java | 2 +- .../searchers/test/RateLimitingSearcherTestCase.java | 2 +- .../searchers/test/ValidateMatchPhaseSearcherTestCase.java | 2 +- .../com/yahoo/search/statistics/ElapsedTimeTestCase.java | 2 +- .../java/com/yahoo/search/statistics/PeakQpsTestCase.java | 2 +- .../yahoo/search/statistics/TimingSearcherTestCase.java | 2 +- .../test/java/com/yahoo/search/test/QueryBenchmark.java | 2 +- .../src/test/java/com/yahoo/search/test/QueryTestCase.java | 2 +- .../search/test/RequestParameterPreservationTestCase.java | 2 +- .../test/java/com/yahoo/search/test/ResultBenchmark.java | 2 +- .../java/com/yahoo/search/yql/FieldFilterTestCase.java | 2 +- .../com/yahoo/search/yql/MinimalQueryInserterTestCase.java | 2 +- .../java/com/yahoo/search/yql/ResegmentingTestCase.java | 2 +- .../test/java/com/yahoo/search/yql/UserInputTestCase.java | 2 +- .../java/com/yahoo/search/yql/VespaSerializerTestCase.java | 2 +- .../com/yahoo/search/yql/YqlFieldAndSourceTestCase.java | 2 +- .../test/java/com/yahoo/search/yql/YqlParserTestCase.java | 2 +- .../yahoo/text/interpretation/test/AnnotationTestCase.java | 2 +- .../yahoo/vespa/streamingvisitors/ListMergerTestCase.java | 2 +- .../vespa/streamingvisitors/MetricsSearcherTestCase.java | 2 +- .../streamingvisitors/VdsStreamingSearcherTestCase.java | 2 +- .../yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java | 2 +- container-search/src/test/vespa-configdef/int.def | 2 +- container-search/src/test/vespa-configdef/string.def | 2 +- 1283 files changed, 1291 insertions(+), 1279 deletions(-) delete mode 100644 container-search/src/test/java/com/yahoo/prelude/templates/test/templates/templaterc (limited to 'container-search') diff --git a/container-search/build-osgi-bundles.xml b/container-search/build-osgi-bundles.xml index 72a1795354d..4594492546e 100644 --- a/container-search/build-osgi-bundles.xml +++ b/container-search/build-osgi-bundles.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/pom.xml b/container-search/pom.xml index 78245852e5d..84d4ba85548 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -1,5 +1,5 @@ - + tonyv */ diff --git a/container-search/src/main/resources/configdefinitions/cluster.def b/container-search/src/main/resources/configdefinitions/cluster.def index cadb9adce22..52eca7ef753 100644 --- a/container-search/src/main/resources/configdefinitions/cluster.def +++ b/container-search/src/main/resources/configdefinitions/cluster.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=search.config #The id of the cluster (as specified in qr-searchers) diff --git a/container-search/src/main/resources/configdefinitions/documentdb-info.def b/container-search/src/main/resources/configdefinitions/documentdb-info.def index f392a014a61..af010f1c161 100644 --- a/container-search/src/main/resources/configdefinitions/documentdb-info.def +++ b/container-search/src/main/resources/configdefinitions/documentdb-info.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=2 namespace=prelude.fastsearch diff --git a/container-search/src/main/resources/configdefinitions/emulation.def b/container-search/src/main/resources/configdefinitions/emulation.def index 75b2bccdba2..26dedb77b69 100644 --- a/container-search/src/main/resources/configdefinitions/emulation.def +++ b/container-search/src/main/resources/configdefinitions/emulation.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=2 namespace=prelude diff --git a/container-search/src/main/resources/configdefinitions/federation.def b/container-search/src/main/resources/configdefinitions/federation.def index 08113176228..da9846d5246 100644 --- a/container-search/src/main/resources/configdefinitions/federation.def +++ b/container-search/src/main/resources/configdefinitions/federation.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=7 namespace=search.federation diff --git a/container-search/src/main/resources/configdefinitions/fs4.def b/container-search/src/main/resources/configdefinitions/fs4.def index b74a9653be8..a4af65bef02 100644 --- a/container-search/src/main/resources/configdefinitions/fs4.def +++ b/container-search/src/main/resources/configdefinitions/fs4.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=container.search diff --git a/container-search/src/main/resources/configdefinitions/index-info.def b/container-search/src/main/resources/configdefinitions/index-info.def index 1f729c64807..c329b0de1cc 100644 --- a/container-search/src/main/resources/configdefinitions/index-info.def +++ b/container-search/src/main/resources/configdefinitions/index-info.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ## Commands per search definition to be applied to query terms per index before searching version=2 namespace=search.config diff --git a/container-search/src/main/resources/configdefinitions/keyvalue.def b/container-search/src/main/resources/configdefinitions/keyvalue.def index 840433e074f..95153708aa2 100644 --- a/container-search/src/main/resources/configdefinitions/keyvalue.def +++ b/container-search/src/main/resources/configdefinitions/keyvalue.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=prelude.searcher # The doc id scheme to use. diff --git a/container-search/src/main/resources/configdefinitions/legacy-emulation.def b/container-search/src/main/resources/configdefinitions/legacy-emulation.def index e938a93b505..95469338bb7 100644 --- a/container-search/src/main/resources/configdefinitions/legacy-emulation.def +++ b/container-search/src/main/resources/configdefinitions/legacy-emulation.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.search ## Keep emulating old (4.2, 5.0, early 5.1) string type fields for structured data diff --git a/container-search/src/main/resources/configdefinitions/lowercasing.def b/container-search/src/main/resources/configdefinitions/lowercasing.def index 0b8f670f202..521b7624660 100644 --- a/container-search/src/main/resources/configdefinitions/lowercasing.def +++ b/container-search/src/main/resources/configdefinitions/lowercasing.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=search.querytransform diff --git a/container-search/src/main/resources/configdefinitions/measure-qps.def b/container-search/src/main/resources/configdefinitions/measure-qps.def index b5f5ea46bb2..b146002cab5 100644 --- a/container-search/src/main/resources/configdefinitions/measure-qps.def +++ b/container-search/src/main/resources/configdefinitions/measure-qps.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=2 namespace=search.statistics diff --git a/container-search/src/main/resources/configdefinitions/page-templates.def b/container-search/src/main/resources/configdefinitions/page-templates.def index c9577cb66eb..e69bc9c223c 100644 --- a/container-search/src/main/resources/configdefinitions/page-templates.def +++ b/container-search/src/main/resources/configdefinitions/page-templates.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=search.pagetemplates diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def index 8b8990d68d4..dca31cb3923 100644 --- a/container-search/src/main/resources/configdefinitions/provider.def +++ b/container-search/src/main/resources/configdefinitions/provider.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=16 namespace=search.federation diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def index 64bd3105c24..eb7183bff40 100644 --- a/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def +++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # TODO: Not in use - remove on Vespa 7 version=4 diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def index 5664503087d..0df80d7e520 100644 --- a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def +++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # TODO: Not in use - remove on Vespa 7 version=3 diff --git a/container-search/src/main/resources/configdefinitions/qr-monitor.def b/container-search/src/main/resources/configdefinitions/qr-monitor.def index 892c96bf976..931e62049d2 100644 --- a/container-search/src/main/resources/configdefinitions/qr-monitor.def +++ b/container-search/src/main/resources/configdefinitions/qr-monitor.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=4 namespace=prelude.cluster diff --git a/container-search/src/main/resources/configdefinitions/qr-quotetable.def b/container-search/src/main/resources/configdefinitions/qr-quotetable.def index af222598dba..e387d9dc732 100644 --- a/container-search/src/main/resources/configdefinitions/qr-quotetable.def +++ b/container-search/src/main/resources/configdefinitions/qr-quotetable.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=prelude.searcher diff --git a/container-search/src/main/resources/configdefinitions/qr-start.def b/container-search/src/main/resources/configdefinitions/qr-start.def index cd89676067d..948f360ea63 100644 --- a/container-search/src/main/resources/configdefinitions/qr-start.def +++ b/container-search/src/main/resources/configdefinitions/qr-start.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Do update the start script with the new name if you change it: namespace=search.config diff --git a/container-search/src/main/resources/configdefinitions/query-profiles.def b/container-search/src/main/resources/configdefinitions/query-profiles.def index 098dea38604..75b3f122b0a 100644 --- a/container-search/src/main/resources/configdefinitions/query-profiles.def +++ b/container-search/src/main/resources/configdefinitions/query-profiles.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Query profiles and their types - a query profile is a nested composite of query parameters with an id # A set of query parameters can be fetched from a query profile rather than being # submitted explicitly. diff --git a/container-search/src/main/resources/configdefinitions/rate-limiting.def b/container-search/src/main/resources/configdefinitions/rate-limiting.def index 25a2fc8e2aa..23235617f8c 100644 --- a/container-search/src/main/resources/configdefinitions/rate-limiting.def +++ b/container-search/src/main/resources/configdefinitions/rate-limiting.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Configuration of the rate limiting algorithm namespace=search.config diff --git a/container-search/src/main/resources/configdefinitions/resolvers.def b/container-search/src/main/resources/configdefinitions/resolvers.def index 06b440da26e..87b7a8b84df 100644 --- a/container-search/src/main/resources/configdefinitions/resolvers.def +++ b/container-search/src/main/resources/configdefinitions/resolvers.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=2 namespace=search.pagetemplates diff --git a/container-search/src/main/resources/configdefinitions/rewrites.def b/container-search/src/main/resources/configdefinitions/rewrites.def index 1f6f2b18539..0179057029f 100644 --- a/container-search/src/main/resources/configdefinitions/rewrites.def +++ b/container-search/src/main/resources/configdefinitions/rewrites.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=2 namespace=search.query.rewrite diff --git a/container-search/src/main/resources/configdefinitions/search-nodes.def b/container-search/src/main/resources/configdefinitions/search-nodes.def index 076dc6ae616..84e0aa719d8 100644 --- a/container-search/src/main/resources/configdefinitions/search-nodes.def +++ b/container-search/src/main/resources/configdefinitions/search-nodes.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=search.config.dispatchprototype search_node[].host string diff --git a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def index ce94ebd7219..1c489f39ed9 100644 --- a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def +++ b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=search.handler diff --git a/container-search/src/main/resources/configdefinitions/searchchain-forward.def b/container-search/src/main/resources/configdefinitions/searchchain-forward.def index 87cee277cf1..dd66acb2e57 100644 --- a/container-search/src/main/resources/configdefinitions/searchchain-forward.def +++ b/container-search/src/main/resources/configdefinitions/searchchain-forward.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=2 namespace=search.federation diff --git a/container-search/src/main/resources/configdefinitions/semantic-rules.def b/container-search/src/main/resources/configdefinitions/semantic-rules.def index e84982abb3c..4212e20fcc1 100644 --- a/container-search/src/main/resources/configdefinitions/semantic-rules.def +++ b/container-search/src/main/resources/configdefinitions/semantic-rules.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Semantic production rules version=2 namespace=prelude.semantics diff --git a/container-search/src/main/resources/configdefinitions/strict-contracts.def b/container-search/src/main/resources/configdefinitions/strict-contracts.def index cfef1633784..f7af59792ae 100644 --- a/container-search/src/main/resources/configdefinitions/strict-contracts.def +++ b/container-search/src/main/resources/configdefinitions/strict-contracts.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=2 namespace=search.federation diff --git a/container-search/src/main/resources/configdefinitions/timing-searcher.def b/container-search/src/main/resources/configdefinitions/timing-searcher.def index d2eb1b62767..254d7c5b5bb 100644 --- a/container-search/src/main/resources/configdefinitions/timing-searcher.def +++ b/container-search/src/main/resources/configdefinitions/timing-searcher.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=search.statistics diff --git a/container-search/src/main/sh/invoke b/container-search/src/main/sh/invoke index 54cc0460db9..5da11fa3974 100755 --- a/container-search/src/main/sh/invoke +++ b/container-search/src/main/sh/invoke @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # BEGIN environment bootstrap section # Do not edit between here and END as this section should stay identical in all scripts diff --git a/container-search/src/test/java/com/yahoo/container/test/ConstantFile.java b/container-search/src/test/java/com/yahoo/container/test/ConstantFile.java index b6e3fbbac5d..6e780037f9a 100644 --- a/container-search/src/test/java/com/yahoo/container/test/ConstantFile.java +++ b/container-search/src/test/java/com/yahoo/container/test/ConstantFile.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.test; public class ConstantFile { diff --git a/container-search/src/test/java/com/yahoo/fs4/PacketQueryTracerTestCase.java b/container-search/src/test/java/com/yahoo/fs4/PacketQueryTracerTestCase.java index d89e37b2e23..27d5e677871 100644 --- a/container-search/src/test/java/com/yahoo/fs4/PacketQueryTracerTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/PacketQueryTracerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java b/container-search/src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java index c950327152c..858f0afc8e9 100644 --- a/container-search/src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.mplex; import com.yahoo.container.search.Fs4Config; diff --git a/container-search/src/test/java/com/yahoo/fs4/test/FastHitTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/FastHitTestCase.java index 60e024b00af..c0223aab568 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/FastHitTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/FastHitTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.test; import com.yahoo.prelude.fastsearch.FastHit; diff --git a/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java index 76323b7139d..d572a835102 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.test; import com.yahoo.fs4.BufferTooSmallException; diff --git a/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java index 7675acc88fc..90e7d78acaf 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.test; import java.nio.ByteBuffer; diff --git a/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java index 34bfefbe98b..dc052be727f 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.test; import com.yahoo.fs4.BasicPacket; diff --git a/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java index 151d192c25b..05e5997c8fb 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.test; import java.nio.ByteBuffer; diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java index 1bd19a54355..cdd2dc7e921 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.test; import com.yahoo.document.GlobalId; diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java index e32a78f9675..f47c8e9e0b8 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.test; import com.yahoo.fs4.BufferTooSmallException; diff --git a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java index 64153363ca5..4671ada6545 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.fs4.test; import com.yahoo.io.GrowableByteBuffer; diff --git a/container-search/src/test/java/com/yahoo/osgi/test/Calculator.java b/container-search/src/test/java/com/yahoo/osgi/test/Calculator.java index e53b423d2b7..8869705ac3b 100644 --- a/container-search/src/test/java/com/yahoo/osgi/test/Calculator.java +++ b/container-search/src/test/java/com/yahoo/osgi/test/Calculator.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.osgi.test; /** diff --git a/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/CalculatorService.java b/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/CalculatorService.java index d33b74030ab..ace11739aed 100644 --- a/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/CalculatorService.java +++ b/container-search/src/test/java/com/yahoo/osgi/test/calculatorservice/CalculatorService.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.osgi.test.calculatorservice; import org.osgi.framework.BundleActivator; diff --git a/container-search/src/test/java/com/yahoo/osgi/test/client/Client.java b/container-search/src/test/java/com/yahoo/osgi/test/client/Client.java index 47d5ca1f16a..1e907e9d92d 100644 --- a/container-search/src/test/java/com/yahoo/osgi/test/client/Client.java +++ b/container-search/src/test/java/com/yahoo/osgi/test/client/Client.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.osgi.test.client; import org.osgi.framework.BundleActivator; diff --git a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterService.java b/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterService.java index ddb6445a91c..a25ea6221d0 100644 --- a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterService.java +++ b/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterService.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.osgi.test.counterservice; /** diff --git a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterServiceImpl.java b/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterServiceImpl.java index 595afdb2525..5faf508aaf5 100644 --- a/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterServiceImpl.java +++ b/container-search/src/test/java/com/yahoo/osgi/test/counterservice/CounterServiceImpl.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.osgi.test.counterservice; import org.osgi.framework.BundleActivator; diff --git a/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java b/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java index 7684e55eabc..fe2a264e03a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java +++ b/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude; import com.yahoo.config.subscription.ConfigGetter; diff --git a/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java index bd1777bd75e..67f3586ac38 100644 --- a/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.cache.test; import junit.framework.TestCase; diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java index 47d2d123816..98d94473908 100644 --- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.cluster; import com.yahoo.cloud.config.ClusterInfoConfig; diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/test/HasherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/test/HasherTestCase.java index 527425eff4d..d74bfc9a21a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/cluster/test/HasherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/cluster/test/HasherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.cluster.test; import com.yahoo.container.handler.VipStatus; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/DocsumFieldTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/DocsumFieldTestCase.java index a28f47fa3ca..1c677fd4bdc 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/DocsumFieldTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/DocsumFieldTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch; import java.nio.ByteBuffer; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/FieldsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/FieldsTestCase.java index 266025edde2..632ea96ad30 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/FieldsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/FieldsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/JsonFieldTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/JsonFieldTestCase.java index 8f63beb747b..497da70f5ca 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/JsonFieldTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/JsonFieldTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java index f45d1e0fd2e..15a0fd60511 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/CacheKeyTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/CacheKeyTestCase.java index 20f8c33cb7d..d87d32fa5cf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/CacheKeyTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/CacheKeyTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java index 1f92738b632..89d3bc7d3b0 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DirectSearchTestCase.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java index 9ecadc5a479..9536a664b88 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java index 85f93a57f68..ca8ed15f67b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; import com.google.common.collect.ImmutableList; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java index c9e36865689..7c1f05e3e60 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java index a820b0b8743..2b25b2a3796 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; import com.yahoo.container.handler.VipStatus; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java index fc99bc05bb4..257dfcc456d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketWrapperTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketWrapperTestCase.java index e9dd9a89a1b..ea13d2e3be5 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketWrapperTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketWrapperTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java index 9b75c3224cd..7fda1d82fcc 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/DispatchThread.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/DispatchThread.java index e5c0256a632..d09e8856ee7 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/DispatchThread.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/DispatchThread.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // -*- mode: java; folded-file: t; c-basic-offset: 4 -*- // // diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockBackend.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockBackend.java index 81655aaaac3..c01df2604c7 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockBackend.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockBackend.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test.fs4mock; import com.yahoo.fs4.mplex.Backend; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFDispatch.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFDispatch.java index 22995c37847..b5db5a47926 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFDispatch.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFDispatch.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test.fs4mock; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFS4ResourcePool.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFS4ResourcePool.java index 71a8556fb00..997fbb198ea 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFS4ResourcePool.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFS4ResourcePool.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test.fs4mock; import com.yahoo.fs4.mplex.Backend; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFSChannel.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFSChannel.java index fbdd6d526a5..a78172d96cd 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFSChannel.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFSChannel.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test.fs4mock; import com.yahoo.document.GlobalId; diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/NonWorkingMockFSChannel.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/NonWorkingMockFSChannel.java index f069d25dae8..ea58cccd96c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/NonWorkingMockFSChannel.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/NonWorkingMockFSChannel.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.fastsearch.test.fs4mock; import com.yahoo.fs4.BasicPacket; diff --git a/container-search/src/test/java/com/yahoo/prelude/hitfield/XmlRendererTestCase.java b/container-search/src/test/java/com/yahoo/prelude/hitfield/XmlRendererTestCase.java index 6b3b48cd098..1dddf8f9378 100644 --- a/container-search/src/test/java/com/yahoo/prelude/hitfield/XmlRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/hitfield/XmlRendererTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.hitfield; import com.yahoo.data.access.simple.Value; diff --git a/container-search/src/test/java/com/yahoo/prelude/hitfield/test/HitFieldTestCase.java b/container-search/src/test/java/com/yahoo/prelude/hitfield/test/HitFieldTestCase.java index 3fc0a52382e..98bab83f28a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/hitfield/test/HitFieldTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/hitfield/test/HitFieldTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.hitfield.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java b/container-search/src/test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java index a3e1a183d1a..3b75172c470 100644 --- a/container-search/src/test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/hitfield/test/JSONStringTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.hitfield.test; import com.yahoo.prelude.hitfield.JSONString; diff --git a/container-search/src/test/java/com/yahoo/prelude/hitfield/test/TokenFieldIteratorTestCase.java b/container-search/src/test/java/com/yahoo/prelude/hitfield/test/TokenFieldIteratorTestCase.java index d61d0edcf2e..f975dd1aba0 100644 --- a/container-search/src/test/java/com/yahoo/prelude/hitfield/test/TokenFieldIteratorTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/hitfield/test/TokenFieldIteratorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.hitfield.test; import java.util.ListIterator; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/ItemHelperTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/ItemHelperTestCase.java index 35adc50a556..91700274027 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/ItemHelperTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/ItemHelperTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/ItemLabelTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/ItemLabelTestCase.java index 62ef9c28ce6..74b2218a00d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/ItemLabelTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/ItemLabelTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query; import java.lang.reflect.Modifier; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java index fc8e9daae35..5806a08bb24 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/TaggableItemsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/TaggableItemsTestCase.java index aabcc0e54aa..55607b0d58e 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/TaggableItemsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/TaggableItemsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/WordAlternativesItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/WordAlternativesItemTestCase.java index 63f8af96bd0..f93f0758057 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/WordAlternativesItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/WordAlternativesItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/TestLinguistics.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/TestLinguistics.java index 139a8cb1a2e..f281b3fcf53 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/TestLinguistics.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/TestLinguistics.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser; import com.yahoo.collections.Tuple2; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/TestSegmenter.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/TestSegmenter.java index 6906c48f2ae..03ffb29ba82 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/TestSegmenter.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/TestSegmenter.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser; import com.yahoo.language.Language; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/UnicodePropertyDumpTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/UnicodePropertyDumpTestCase.java index e1b705616ad..4c07a0ca59a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/UnicodePropertyDumpTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/UnicodePropertyDumpTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java index 9b216331551..5e4fd9f8921 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java index 819684ad9a5..86c62715c8f 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser.test; import com.yahoo.language.Language; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParsingTester.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParsingTester.java index e05f5c9db59..9c61b10e15f 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParsingTester.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParsingTester.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser.test; import com.yahoo.config.subscription.ConfigGetter; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/SubstringTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/SubstringTestCase.java index d2c5c84475d..73181e5b53b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/SubstringTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/SubstringTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser.test; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java index 22d64f5eabd..d92792230d3 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/TokenizerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser.test; import com.yahoo.language.Linguistics; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/WashPhrasesTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/WashPhrasesTestCase.java index 244b173dadc..fb9fbe0d2df 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/WashPhrasesTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/WashPhrasesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.parser.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/DotProductItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/DotProductItemTestCase.java index 1d2261081d1..845bb7b5739 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/DotProductItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/DotProductItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java index 5b6184d884d..2a87e3b7076 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.prelude.query.AndItem; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/ItemEncodingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/ItemEncodingTestCase.java index d51ad9bc6d5..ee052d39e40 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/ItemEncodingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/ItemEncodingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/PhraseItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/PhraseItemTestCase.java index e1a6375c02d..5bd978417d8 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/PhraseItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/PhraseItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.prelude.query.PhraseItem; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/PredicateQueryItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/PredicateQueryItemTestCase.java index a5ae6b78d4b..5f9d9db5dfa 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/PredicateQueryItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/PredicateQueryItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.prelude.query.Item; @@ -133,4 +133,4 @@ public class PredicateQueryItemTestCase { assertArrayEquals(expectedPrefix, Arrays.copyOfRange(actual, 0, expectedPrefix.length)); } -} \ No newline at end of file +} diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerMicroBenchmark.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerMicroBenchmark.java index 8938ef9cf87..0011399f386 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerMicroBenchmark.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerMicroBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.prelude.query.AndItem; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java index 314e346eb0f..d3b64100c1e 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.prelude.query.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryLanguageTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryLanguageTestCase.java index cd3f127e8cc..b88ed25a397 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryLanguageTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryLanguageTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.language.Language; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryTestCase.java index a7d50e9e6c1..14900048e04 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/RangeItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/RangeItemTestCase.java index 6e7a47f681e..fdfebeb74a8 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/RangeItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/RangeItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.prelude.query.IntItem; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/SegmentItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/SegmentItemTestCase.java index ce4d0bff2ab..b41c0c328d6 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/SegmentItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/SegmentItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/WandItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/WandItemTestCase.java index 294166de665..68121dc2391 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/WandItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/WandItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.io.HexDump; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java index 90293e7bfe6..dbafaf3cd1b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.test; import com.yahoo.prelude.query.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/query/textualrepresentation/test/TextualQueryRepresentationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/textualrepresentation/test/TextualQueryRepresentationTestCase.java index 377cb5a05b4..e0a7e0a0f6e 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/textualrepresentation/test/TextualQueryRepresentationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/textualrepresentation/test/TextualQueryRepresentationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query.textualrepresentation.test; import java.io.BufferedReader; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java index 497e1ca36ba..91cf5015cba 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CollapsePhraseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CollapsePhraseSearcherTestCase.java index b1c9bebba73..4196e23222c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CollapsePhraseSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CollapsePhraseSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/IndexCombinatorTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/IndexCombinatorTestCase.java index 3e0597483eb..cba2e7da647 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/IndexCombinatorTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/IndexCombinatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.config.subscription.ConfigGetter; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/LiteralBoostSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/LiteralBoostSearcherTestCase.java index 666e89cd324..9850c80754f 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/LiteralBoostSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/LiteralBoostSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.prelude.Index; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NoRankingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NoRankingSearcherTestCase.java index c1c0371ab81..0c26325e96b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NoRankingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NoRankingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import junit.framework.TestCase; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NonPhrasingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NonPhrasingSearcherTestCase.java index 27345d0b6f6..54b54dfb178 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NonPhrasingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NonPhrasingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java index caf99bb369e..77f7f057eea 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java index ff45d3f2b28..2cb511defce 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhraseMatcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.prelude.query.AndItem; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhrasingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhrasingSearcherTestCase.java index e94784eb39c..33213cccc34 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhrasingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/PhrasingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java index 309b606880c..d11fc15fe90 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.prelude.query.AndItem; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java index 55ce63a9789..4deea7da8cf 100755 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/RecallSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java index 213a87bd6b9..b4b1142b6d4 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.querytransform.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java index db7009cd2c4..fed97199f1d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/BlendingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import java.util.Arrays; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/CachingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/CachingSearcherTestCase.java index 34e810448da..570402fdaae 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/CachingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/CachingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ErrorHitRenderTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ErrorHitRenderTestCase.java index 4bf173489f9..c5bb223cbe4 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ErrorHitRenderTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ErrorHitRenderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.yahoo.prelude.templates.SearchRendererAdaptor; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java index 8171ff43a52..2b03825b934 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/JSONDebugSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/JSONDebugSearcherTestCase.java index d868a0f0329..88d207f35cb 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/JSONDebugSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/JSONDebugSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/JuniperSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/JuniperSearcherTestCase.java index a2a149a694a..f71c0803ce8 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/JuniperSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/JuniperSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/MultipleResultsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/MultipleResultsTestCase.java index 4898be0afec..8d427dfffa8 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/MultipleResultsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/MultipleResultsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java index c6e30b9a4b8..1b2838e4183 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuerySnapshotSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuerySnapshotSearcherTestCase.java index 3b292dc3966..b1763471c82 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuerySnapshotSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuerySnapshotSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QueryValidatingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QueryValidatingSearcherTestCase.java index 2720f6c3562..d41db1ca227 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QueryValidatingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QueryValidatingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java index 76c48368cf3..4386fcd1cd1 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java index 7dec7aed8a2..197f1d65172 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidatePredicateSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java index 10e0342ef93..602f1ec26ab 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.searcher.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/testhit.xml b/container-search/src/test/java/com/yahoo/prelude/searcher/test/testhit.xml index 5f23f575a13..013af19f3cf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/testhit.xml +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/testhit.xml @@ -1,5 +1,5 @@ - + Unspecified error diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/config/test/RuleConfigDeriverTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/config/test/RuleConfigDeriverTestCase.java index 9fc0863f5a7..49cb8017074 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/config/test/RuleConfigDeriverTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/config/test/RuleConfigDeriverTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.config.test; import java.io.BufferedReader; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/parser/test/SemanticsParserTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/parser/test/SemanticsParserTestCase.java index eba1dd87c95..ee93f5b5b2b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/parser/test/SemanticsParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/parser/test/SemanticsParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.parser.test; import java.util.Iterator; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/parser/test/rules.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/parser/test/rules.sr index 56433f732a5..bd3a5008ac8 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/parser/test/rules.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/parser/test/rules.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @default @automata(src/test/java/com/yahoo/prelude/semantics/parser/test/semantics.fsa) diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java index 6d8dd8535e2..c1827ad035c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AlibabaTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java index b3e65ad5192..459c09642ee 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AnchorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java index 3f1d2cd594b..f2f8c3f7cf9 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataNotTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java index 049a28c67bc..f0bf194f7a3 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java index 5b64d240042..245556a1487 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import java.io.IOException; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java index 6390ea72391..acf45309c83 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BlendingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java index 09ef73dbbcf..7ad3842c7a5 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/CJKTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java index 6b12e1d7de7..44774c63219 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java index bc867d240bf..d42b344281d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ComparisonsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java index 8a9cc0d856a..d17de425e88 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConditionTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java index 2a0bfe81222..1617b9b4e83 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java index a7de4d86995..74cb15e64ee 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/DuplicateRuleTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.prelude.semantics.RuleBaseException; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java index f6d89073124..d4ae78cc2b9 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Ellipsis2TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java index c0d6a094657..7234f3cfd60 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/EllipsisTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java index 73bf01e64ae..5521a478968 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTrickTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTrickTestCase.java index 27ec6dc4133..7d9f7b401ba 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTrickTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ExactMatchTrickTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java index 9f865c21ca6..6553c64e00d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java index d51f4d3c926..635ca8cd6f9 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/LabelMatchingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import java.io.IOException; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java index 74a40ef5beb..d2ff3b4b348 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchAllTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java index 17dad7de425..5aad038d2e0 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/MatchOnlyIfNotOnlyTermTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java index c56d5aba219..970a3246328 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NoStemmingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java index a29c041ba32..06d880f65e2 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NotTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java index 238c28e717c..428f84974f2 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumbersTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java index 727a5b04e75..e0bfc596d67 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/NumericTermsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java index 15b8606fa90..3a2a7e0af51 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/OrPhraseTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java index 7d65106ec5d..212f650fb82 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java index 58b5d781b90..00ef143e8f9 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java index 0c04b647f5b..36214e13eab 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/PhraseMatchTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java index 01956eba561..69f06cd912a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java index 7cc440e815e..1be6792ac8c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/RuleBaseAbstractTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SegmentSubstitutionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SegmentSubstitutionTestCase.java index 6929d9e37c7..439bc1314f6 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SegmentSubstitutionTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SegmentSubstitutionTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.language.Language; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java index 0cb3f5dcba1..a3779351a6d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/SemanticSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java index 006b0b5a6a6..d68af2ab4a1 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StemmingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java index 390f0ee11ad..57decbdbcd4 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java index 2b94763e06b..7f01dbf5750 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/UrlTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java index 364fdfed627..361ef0e9637 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/WeightingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.semantics.test; /** diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/alibaba.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/alibaba.sr index dcf9512ecc9..ab481ce85af 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/alibaba.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/alibaba.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. 3100 -> nokia 3100; legend -> lenovo; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/anchor.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/anchor.sr index fbdbddb003c..6a89f5061bc 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/anchor.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/anchor.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. . first -> anchor; last . -> anchor; . word. -> anchor; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/automatanot.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/automatanot.sr index 7faddc0ad77..81efe290ca9 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/automatanot.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/automatanot.sr @@ -1,3 +1,3 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ![B] +> $busname:[B]; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/automatarules.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/automatarules.sr index 30fc47eace0..19b79bf0f6d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/automatarules.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/automatarules.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # For testing referenced inverted matches parameter.donomatch ![C] -> nomatch:[C]; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/backtrackingrules.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/backtrackingrules.sr index 68e1459d6a7..86744a6370e 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/backtrackingrules.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/backtrackingrules.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Literals [case1pos1],[case1pos2] -> replaced; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/blending.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/blending.sr index 9e624182155..c5c404b8c02 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/blending.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/blending.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [...] cd +> parameter.search='music'; [car] +> parameter.search='cars'; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/cjk.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/cjk.sr index bcecbc31861..96a0d693566 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/cjk.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/cjk.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Use unicode equivalents in java source: # # ä½³:\u4f73 diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/comparison.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/comparison.sr index 23623d7e282..0075893316b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/comparison.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/comparison.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [island] +> island:[island]; [coffee] +> coffee:[coffee]; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/comparisons.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/comparisons.sr index 7ac73035972..1e7cc883b85 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/comparisons.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/comparisons.sr @@ -1,3 +1,3 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [...] parameter.ranking='category' +> $foo:[...]; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/duplicaterules.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/duplicaterules.sr index ddd16aaa8f0..081e33d8825 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/duplicaterules.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/duplicaterules.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Duplicate rule definition [something] -> hello there diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/ellipsis.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/ellipsis.sr index 7ae563841a3..8a98b9fd9bf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/ellipsis.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/ellipsis.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # tests rules containing ellipses (wildcards) # From tutorial, referenced ellipsis diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/ellipsis2.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/ellipsis2.sr index 47bc121b085..3fcecb9a675 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/ellipsis2.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/ellipsis2.sr @@ -1,2 +1,2 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [...] +> someindex:[...] ; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/exactmatch.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/exactmatch.sr index 942bf7fe2f7..b2cfaa16dc6 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/exactmatch.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/exactmatch.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. . primetime notime . -> primetime in no time; . primetime . -> primetime in no time; . prime time in no time . -> primetime in no time; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/exactmatchtrick.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/exactmatchtrick.sr index 041d759de4f..d4d3436f345 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/exactmatchtrick.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/exactmatchtrick.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. primetime notime -> default:primetime default:in default:no default:time; primetime -> default:primetime default:in default:no default:time; prime time in no time -> default:primetime default:in default:no default:time; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/child1.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/child1.sr index e76f5ac2dd9..c874e336bc5 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/child1.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/child1.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vw -> audi; @include(parent.sr) diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/child2.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/child2.sr index 2ae11bcd058..8c68ab23457 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/child2.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/child2.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @include(parent) vehiclebrand:vw -> vehiclebrand:audi; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/cjk.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/cjk.sr index b2a54fbc5eb..1ee3f695145 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/cjk.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/cjk.sr @@ -1,3 +1,3 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ?? -> ???; @default diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandchild.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandchild.sr index c3e1b74f235..666839499b3 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandchild.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandchild.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @include(child1.sr) @include(child2.sr) diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandfather.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandfather.sr index dbd3b3587a6..47d5f017c5d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandfather.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandfather.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [vehicle] :- car, motorcycle, bus; cars -> car; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandmother.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandmother.sr index 430227ca23c..67a9287c0ca 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandmother.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/grandmother.sr @@ -1,2 +1,2 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vehiclebrand:bmw +> expensivetv; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/parent.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/parent.sr index 9791561e8c7..7d032563707 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/parent.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/inheritingrules/parent.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @include(grandfather.sr) [brand] [vehicle] -> vehiclebrand:[brand]; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/labelmatching.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/labelmatching.sr index b70d7f89791..bbfbdb5f397 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/labelmatching.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/labelmatching.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @default term -> matched:term; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/match-only-if-not-only-term.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/match-only-if-not-only-term.sr index 452fe2658aa..f368bd126c1 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/match-only-if-not-only-term.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/match-only-if-not-only-term.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. snl -> saturday night live; [snlterm] -> $showname:[snlterm]!1000; [snlterm] :- saturday night live; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/matchall.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/matchall.sr index 2e6e3426d1b..bc4cbcdfae6 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/matchall.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/matchall.sr @@ -1,2 +1,2 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [...] +> $normtitle:[...]; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/nostemming.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/nostemming.sr index ff731b7bc08..9318c29bebb 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/nostemming.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/nostemming.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @stemming(false) i:as -> i:arts i:sciences; i:asc -> i:arts i:sciences i:crafts; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/not.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/not.sr index e4dadf3ed01..0102ea05759 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/not.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/not.sr @@ -1,2 +1,2 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [...] !parameter.ranking='category' +> $foo:[...]; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/numbers.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/numbers.sr index a22c49b14ec..aed72364d2b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/numbers.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/numbers.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. 1337 -> leet; leet -> elite; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/numericterms.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/numericterms.sr index f2270eadfdd..5061e681a73 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/numericterms.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/numericterms.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [REST] +> -ycat2gc:96929265; [REST] :- restaurant, restaurants; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/orphrase.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/orphrase.sr index 8e168dde591..2ebbeddf093 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/orphrase.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/orphrase.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @default [title] -> ?title:"software engineer"; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/parameter.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/parameter.sr index d9c0019a3da..3531bab3566 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/parameter.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/parameter.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [...] parameter.ranking='category' +> $foo:[...]; parameter.hits>='11' +> largepage; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/parameter2.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/parameter2.sr index d648b314d7e..0ce6eb5a575 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/parameter2.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/parameter2.sr @@ -1,2 +1,2 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. parameter.ranking='usrank' -> parameter.ranking='date'; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/phrasematch.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/phrasematch.sr index 1b1103899be..f985c693284 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/phrasematch.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/phrasematch.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [ret] -> retailer:[ret]; [ret] :- keyword:[B]; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/rules.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/rules.sr index 96f3207edcd..07803b4e126 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/rules.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/rules.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Local use case [listing] [preposition] [place] -> listing:[listing] diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/semantic-rules.cfg b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/semantic-rules.cfg index 3b713977cd7..0fe06d848c9 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/semantic-rules.cfg +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/semantic-rules.cfg @@ -1,15 +1,15 @@ rulebase[7] rulebase[0].name "child1" -rulebase[0].rules "# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\nvw -> audi;\n\n@include(parent.sr)\n\nvehiclebrand:audi -> vehiclebrand:skoda;\n\n" +rulebase[0].rules "# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\nvw -> audi;\n\n@include(parent.sr)\n\nvehiclebrand:audi -> vehiclebrand:skoda;\n\n" rulebase[1].name "child2" -rulebase[1].rules "# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n@include(parent)\n\nvehiclebrand:vw -> vehiclebrand:audi;\n\n[brand] :- @super, skoda;\n\n\n" +rulebase[1].rules "# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n@include(parent)\n\nvehiclebrand:vw -> vehiclebrand:audi;\n\n[brand] :- @super, skoda;\n\n\n" rulebase[2].name "cjk" -rulebase[2].rules "# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n?? -> ???;\n@default\n" +rulebase[2].rules "# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n?? -> ???;\n@default\n" rulebase[3].name "grandchild" -rulebase[3].rules "# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n@include(child1.sr)\n@include(child2.sr)\n\ncausesphrase -> "a produced phrase";\n" +rulebase[3].rules "# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n@include(child1.sr)\n@include(child2.sr)\n\ncausesphrase -> "a produced phrase";\n" rulebase[4].name "grandfather" -rulebase[4].rules "# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n[vehicle] :- car, motorcycle, bus;\n\ncars -> car;\n" +rulebase[4].rules "# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n[vehicle] :- car, motorcycle, bus;\n\ncars -> car;\n" rulebase[5].name "grandmother" -rulebase[5].rules "# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\nvehiclebrand:bmw +> expensivetv;\n" +rulebase[5].rules "# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\nvehiclebrand:bmw +> expensivetv;\n" rulebase[6].name "parent" -rulebase[6].rules "# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n@include(grandfather.sr)\n\n[brand] [vehicle] -> vehiclebrand:[brand];\n\n@include(grandmother.sr)\n\n[brand] :- alfa, audi, bmw;\n" +rulebase[6].rules "# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n@include(grandfather.sr)\n\n[brand] [vehicle] -> vehiclebrand:[brand];\n\n@include(grandmother.sr)\n\n[brand] :- alfa, audi, bmw;\n" diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/stemming.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/stemming.sr index 2dcb4d8775a..d08c804553f 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/stemming.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/stemming.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @stemming(true) i:as -> i:arts i:sciences; i:car -> i:vehicle; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/stopwords.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/stopwords.sr index 71b4329379d..948d1d6562e 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/stopwords.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/stopwords.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @default [stopword] :- the, to, a,i,and,is,of,in,you,it,for,what,that,do,can,have,on,are,or,if,with,how,my,be,but,not,s,this,your,t,get,like,they,me,there,so,know,from,just,as,will,at,all,one,about,when,out,an,would,was,any,has,who,some,good,want,up,by,think,does,no,why,don,more,go,them,then,he,where,need,time,people,other,am,should,we,find,make,help,also,really,because,only,best,which,m,way,their,now,than,see,been,much,could,had,com,very,most ,its,anyone,him,many,use,first,take,his,well,even,say,her,she,work,try,u,too,please,something,were,did,someone,after,question,here,back,give,right,over,going,still,new,http,www,it's,doesn't,what's,that's,can't,how's,there's,when's; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/substitution.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/substitution.sr index 79a7781b914..d3272a12a48 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/substitution.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/substitution.sr @@ -1,2 +1,2 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. second -> third; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/url.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/url.sr index e01031709c7..4c45053fc8c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/url.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/url.sr @@ -1,3 +1,3 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. [youtube] -> fromurl:"youtube com"; [youtube] :- http www youtube com,youtube com,youtube,www utube com,utube com,utube,you tube,u tube; diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/weighting.sr b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/weighting.sr index 735b1af6090..9bd7a5e2598 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/weighting.sr +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/rulebases/weighting.sr @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. foo -> foo!150; [bars] foo -> [bars]!57 foo; kanoo +> boat!237; diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/BoomTemplate.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/BoomTemplate.java index 7def3faaf9a..0bbc5151b40 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/BoomTemplate.java +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/BoomTemplate.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.templates.test; import java.io.IOException; diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/GroupedResultTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/GroupedResultTestCase.java index 7a8779ef70a..a29ffdb49b9 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/GroupedResultTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/GroupedResultTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.templates.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/HitContextTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/HitContextTestCase.java index 55c4a2ab074..6ff8c2f9d6c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/HitContextTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/HitContextTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.templates.test; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/TemplateTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/TemplateTestCase.java index 0e0829051ad..49b1846fba5 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/TemplateTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/TemplateTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.templates.test; diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/TestTemplate.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/TestTemplate.java index ca82d8695bb..0f5e126dae8 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/TestTemplate.java +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/TestTemplate.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.templates.test; import java.io.IOException; diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java index 35beb5cb96c..6ec17565668 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/TilingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.templates.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/templaterc b/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/templaterc deleted file mode 100644 index 7654dd9fd2b..00000000000 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/templates/templaterc +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id: templaterc,v 1.1 2004-02-12 12:44:54 bratseth Exp $ -# -/xsearch xsearch text/xml utf-8 -/cgi-bin/asearch asearch text/html utf-8 diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample.xml b/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample.xml index 7cbd86c7627..ea5d56d2b31 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample.xml +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample.xml @@ -1,5 +1,5 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample2.xml b/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample2.xml index 387118ec9a4..2e936b0015a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample2.xml +++ b/container-search/src/test/java/com/yahoo/prelude/templates/test/tilingexample2.xml @@ -1,5 +1,5 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/prelude/test/DummySearcher.java b/container-search/src/test/java/com/yahoo/prelude/test/DummySearcher.java index e5fa79c4f62..18a10a16e78 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/DummySearcher.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/DummySearcher.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java index 3f423830780..477bfd5b9b6 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import com.yahoo.prelude.query.AndItem; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java index 9f68acd4a0f..fa27d4d47f5 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/IntegrationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/IntegrationTestCase.java index b3715c3a944..8fb9a8047a1 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/IntegrationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/IntegrationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import com.yahoo.search.result.Hit; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/LocationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/LocationTestCase.java index d7398b70528..cbb62b5d555 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/LocationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/LocationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import com.yahoo.prelude.Location; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/NullSetMemberTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/NullSetMemberTestCase.java index 23eded6b561..2b0cd026987 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/NullSetMemberTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/NullSetMemberTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import java.util.HashSet; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java index e8c3f405fca..2528514bc98 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import com.yahoo.language.Language; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/RankFeatureDumpTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/RankFeatureDumpTestCase.java index 42acf0f7a1b..37ee41d4864 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/RankFeatureDumpTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/RankFeatureDumpTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import java.io.IOException; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/ResultTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/ResultTestCase.java index 01842a15ab2..ccf54aa7f24 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/ResultTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/ResultTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; import java.util.Iterator; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/integration/FirstSearcher.java b/container-search/src/test/java/com/yahoo/prelude/test/integration/FirstSearcher.java index bd40bf29f40..10bb6e94cdf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/integration/FirstSearcher.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/integration/FirstSearcher.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test.integration; import com.yahoo.search.result.Hit; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/integration/SecondSearcher.java b/container-search/src/test/java/com/yahoo/prelude/test/integration/SecondSearcher.java index d9f9d5be76e..e6f74fc7263 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/integration/SecondSearcher.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/integration/SecondSearcher.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test.integration; import com.yahoo.search.result.Hit; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/integration/ThirdSearcher.java b/container-search/src/test/java/com/yahoo/prelude/test/integration/ThirdSearcher.java index 2599619bb27..d84c2e391da 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/integration/ThirdSearcher.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/integration/ThirdSearcher.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test.integration; import com.yahoo.search.result.Hit; diff --git a/container-search/src/test/java/com/yahoo/search/StupidSingleThreadedHttpServer.java b/container-search/src/test/java/com/yahoo/search/StupidSingleThreadedHttpServer.java index 6c3f1eba4c0..6e67386bfde 100644 --- a/container-search/src/test/java/com/yahoo/search/StupidSingleThreadedHttpServer.java +++ b/container-search/src/test/java/com/yahoo/search/StupidSingleThreadedHttpServer.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search; import com.yahoo.text.Utf8; diff --git a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java index 58107513ee2..00202e433e3 100644 --- a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusterSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.cluster.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java index 01fea6f0842..4c3ed56cd44 100644 --- a/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/cluster/test/ClusteredConnectionTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.cluster.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/debug/test/SearchChainTextRepresentationTestCase.java b/container-search/src/test/java/com/yahoo/search/debug/test/SearchChainTextRepresentationTestCase.java index e952300e0ed..faa9fba033b 100644 --- a/container-search/src/test/java/com/yahoo/search/debug/test/SearchChainTextRepresentationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/debug/test/SearchChainTextRepresentationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.debug.test; import junit.framework.TestCase; diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/FillTestCase.java b/container-search/src/test/java/com/yahoo/search/dispatch/FillTestCase.java index a88ef7e5e37..2ea5cad7ccd 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/FillTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/FillTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.dispatch; import com.yahoo.compress.CompressionType; diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/MockClient.java b/container-search/src/test/java/com/yahoo/search/dispatch/MockClient.java index 2a7301652b9..4cac6293ae3 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/MockClient.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/MockClient.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.dispatch; import com.yahoo.compress.CompressionType; diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java b/container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java index 1b9b701e508..b0087a173f8 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java +++ b/container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java @@ -1,3 +1,4 @@ +// 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; import com.google.common.collect.ImmutableSet; diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/GzipDecompressingEntityTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/GzipDecompressingEntityTestCase.java index c707702a3d3..6babba5a36a 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/http/GzipDecompressingEntityTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/http/GzipDecompressingEntityTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.http; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/HttpParametersTest.java b/container-search/src/test/java/com/yahoo/search/federation/http/HttpParametersTest.java index c3bd2ada260..1edb41dad05 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/http/HttpParametersTest.java +++ b/container-search/src/test/java/com/yahoo/search/federation/http/HttpParametersTest.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.http; import com.yahoo.search.federation.ProviderConfig; diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/HttpPostTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/HttpPostTestCase.java index 8edc1ca8dd8..e0b2afe4e1f 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/http/HttpPostTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/http/HttpPostTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.http; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java index d9d4755ac96..6b9b36800e5 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/http/HttpTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.http; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/PingTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/PingTestCase.java index 34791168db4..75110ce1161 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/http/PingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/http/PingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.http; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java index 59a68700405..6efa6692574 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/http/QueryParametersTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.http; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java index e874c89b918..3df5151de0b 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java index f8559745358..de468a2be2d 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/federation/test/AddHitsWithRelevanceSearcher.java b/container-search/src/test/java/com/yahoo/search/federation/test/AddHitsWithRelevanceSearcher.java index 40786ee89a9..d50057438d8 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/test/AddHitsWithRelevanceSearcher.java +++ b/container-search/src/test/java/com/yahoo/search/federation/test/AddHitsWithRelevanceSearcher.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/federation/test/BlockingSearcher.java b/container-search/src/test/java/com/yahoo/search/federation/test/BlockingSearcher.java index dcecf36f2ae..7c24ba74a46 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/test/BlockingSearcher.java +++ b/container-search/src/test/java/com/yahoo/search/federation/test/BlockingSearcher.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/federation/test/DuplicateSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/test/DuplicateSourceTestCase.java index c092a795c12..bb73e1f4217 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/test/DuplicateSourceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/test/DuplicateSourceTestCase.java @@ -1,3 +1,4 @@ +// 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.test; import com.google.common.collect.ImmutableList; diff --git a/container-search/src/test/java/com/yahoo/search/federation/test/FederationSearcherTest.java b/container-search/src/test/java/com/yahoo/search/federation/test/FederationSearcherTest.java index 534d378d3d1..74eb83cea90 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/test/FederationSearcherTest.java +++ b/container-search/src/test/java/com/yahoo/search/federation/test/FederationSearcherTest.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import java.util.Optional; diff --git a/container-search/src/test/java/com/yahoo/search/federation/test/FederationSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/test/FederationSearcherTestCase.java index 11fae387739..da0892f0429 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/test/FederationSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/test/FederationSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/federation/test/FederationTester.java b/container-search/src/test/java/com/yahoo/search/federation/test/FederationTester.java index 7aa73c64d3a..c3d78757b41 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/test/FederationTester.java +++ b/container-search/src/test/java/com/yahoo/search/federation/test/FederationTester.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/federation/test/HitCountTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/test/HitCountTestCase.java index dcbbb217c7d..9278d8999d7 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/test/HitCountTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/test/HitCountTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/federation/test/SetHitCountsSearcher.java b/container-search/src/test/java/com/yahoo/search/federation/test/SetHitCountsSearcher.java index 81a3007735c..24d6801f2bd 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/test/SetHitCountsSearcher.java +++ b/container-search/src/test/java/com/yahoo/search/federation/test/SetHitCountsSearcher.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryMarshallerTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryMarshallerTestCase.java index 2868d69457b..022177bc42b 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryMarshallerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryMarshallerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.vespa.test; import com.yahoo.language.Linguistics; diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java index 984caecd46c..2f7ea531f13 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/QueryParametersTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.vespa.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/ResultBuilderTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/ResultBuilderTestCase.java index 8cec6c64554..8edab711a93 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/ResultBuilderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/ResultBuilderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.vespa.test; import java.util.Iterator; diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/VespaIntegrationTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/VespaIntegrationTestCase.java index a1c3529e2e4..4ca41f9aa8b 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/VespaIntegrationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/VespaIntegrationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.vespa.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/VespaSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/VespaSearcherTestCase.java index b6aec9262ca..8156232f4a4 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/VespaSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/VespaSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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.vespa.test; import com.yahoo.prelude.query.*; diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/idhits.xml b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/idhits.xml index b4b5c072eca..c17bbf8474d 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/idhits.xml +++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/idhits.xml @@ -1,5 +1,5 @@ - + nalle diff --git a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/nestedhits.xml b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/nestedhits.xml index c935f16528f..8b5ab710378 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/vespa/test/nestedhits.xml +++ b/container-search/src/test/java/com/yahoo/search/federation/vespa/test/nestedhits.xml @@ -1,5 +1,5 @@ - + ABCDEFGHIJKLMNOPQRSTUVWXYZ diff --git a/container-search/src/test/java/com/yahoo/search/grouping/ContinuationTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/ContinuationTestCase.java index bc0d69f4bf7..3f84c324429 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/ContinuationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/ContinuationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java index 19723dcd51a..08d36f8748d 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingQueryParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java index 38e94092644..b69061d20c0 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping; import com.yahoo.processing.request.CompoundName; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingValidatorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingValidatorTestCase.java index 38248bad6cf..fd0162acc5c 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingValidatorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingValidatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping; import com.yahoo.vespa.config.search.AttributesConfig; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/UniqueGroupingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/UniqueGroupingSearcherTestCase.java index 135e038f800..b570adc51c6 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/UniqueGroupingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/UniqueGroupingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java index 0ee23a3f37f..d76d704f37b 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/ExpressionVisitorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/ExpressionVisitorTestCase.java index f5d30497671..b245404ca30 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/ExpressionVisitorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/ExpressionVisitorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java index 614a126b54d..ee1f07970d1 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; import com.yahoo.search.grouping.request.parser.ParseException; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java index 14274e98182..8a59c7b0749 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java index af007a6f85c..5dee372e7d7 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java index eba5a458cfd..39ea3045987 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java index f2f8316f2db..ce73fde9504 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java index 2abd4a01dd7..37932e6f05e 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request.parser; import com.yahoo.search.grouping.request.GroupingOperation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java index fe4883fd29e..227530ae52d 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request.parser; import com.yahoo.search.grouping.request.AllOperation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java index e3bccde2767..3dc6c185d8d 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.result; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java index c9aa0848a8b..f24c1371daf 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.result; import com.yahoo.search.grouping.Continuation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupTestCase.java index 9acab986ac2..1d0e6528521 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.result; import com.yahoo.search.result.Hit; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java index f9f7047abc0..106b227599f 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.result; import com.yahoo.search.grouping.Continuation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java index 97a2e81d9ba..0643e8d77f1 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.result; import com.yahoo.search.grouping.Continuation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/CompositeContinuationTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/CompositeContinuationTestCase.java index 5d2d584af9b..ea81f607eaf 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/CompositeContinuationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/CompositeContinuationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import com.yahoo.search.grouping.Continuation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java index 8d524ae011e..b741159ab9d 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java index 898a73a3320..010a54160e9 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingTransformTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import com.yahoo.search.grouping.Continuation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java index ebd663d80b0..abdcc93965e 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import com.yahoo.document.DocumentId; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerDecoderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerDecoderTestCase.java index 9389482010e..735befffb20 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerDecoderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerDecoderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEncoderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEncoderTestCase.java index 4780f23ca9d..a3957fc1be6 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEncoderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEncoderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/OffsetContinuationTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/OffsetContinuationTestCase.java index 8184a52c0ee..84830e97874 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/OffsetContinuationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/OffsetContinuationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import com.yahoo.search.grouping.Continuation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/RequestBuilderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/RequestBuilderTestCase.java index 9d527686c54..cf58dd3929b 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/RequestBuilderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/RequestBuilderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import com.yahoo.search.grouping.Continuation; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java index d8438ddc042..2417e2516e3 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import com.yahoo.document.GlobalId; diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultIdTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultIdTestCase.java index 8124b748f1f..8a031775381 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultIdTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultIdTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.vespa; import org.junit.Test; diff --git a/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java index f7fbf6813bc..ce40bd1f06b 100644 --- a/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/handler/test/SearchHandlerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.handler.test; import com.yahoo.container.Container; diff --git a/container-search/src/test/java/com/yahoo/search/match/test/DocumentDbTest.java b/container-search/src/test/java/com/yahoo/search/match/test/DocumentDbTest.java index feddcbde505..b660d5fca5f 100644 --- a/container-search/src/test/java/com/yahoo/search/match/test/DocumentDbTest.java +++ b/container-search/src/test/java/com/yahoo/search/match/test/DocumentDbTest.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.match.test; import com.yahoo.document.*; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java index 32bf80bc512..8d31814f82a 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.config.test; import com.yahoo.search.pagetemplates.PageTemplate; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java index 6c061cdce47..109e7e75885 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.config.test; import com.yahoo.search.pagetemplates.PageTemplate; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/choiceFooter.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/choiceFooter.xml index 9ebdaeb9302..3de46d65df1 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/choiceFooter.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/choiceFooter.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/choiceHeader.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/choiceHeader.xml index 36b0ae6430c..33f596f03ca 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/choiceHeader.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/choiceHeader.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/footer.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/footer.xml index 0866aaaa583..1efc987f73e 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/footer.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/footer.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/generic.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/generic.xml index 319f3058d24..5ae6901e28b 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/generic.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/generic.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/header.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/header.xml index a894e8b9a3e..c7abc9129f7 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/header.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/header.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/includer.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/includer.xml index 6d4f6121991..2c446590a66 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/includer.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/includer.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/invalidfilename/invalid.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/invalidfilename/invalid.xml index 0e799a472de..2bf90d9815a 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/invalidfilename/invalid.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/invalidfilename/invalid.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/mapexamples/map1.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/mapexamples/map1.xml index c13fdcdbbca..e6698beffaf 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/mapexamples/map1.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/mapexamples/map1.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/richSerp.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/richSerp.xml index 32ab6086b82..6bf6c539ac1 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/richSerp.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/richSerp.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/richerSerp.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/richerSerp.xml index d3e11288ef1..d114167fcdd 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/richerSerp.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/richerSerp.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/serp.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/serp.xml index 194c551f84c..4d172b40de1 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/serp.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/serp.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/slottingSerp.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/slottingSerp.xml index 301f7e77edb..7dbea6a4399 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/slottingSerp.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/examples/slottingSerp.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySource.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySource.xml index 4a5b6b3a1dd..b2489d3b959 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySource.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySource.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceResult.xml index 40cc6b6935e..a1713a987cd 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceResult.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceTestCase.java index dc20e5483ca..503258b7ced 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderers.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderers.xml index e0306872149..b9d1e6ba917 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderers.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderers.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersResult.xml index 47ed1bd2f12..e1ae0b928e6 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersResult.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java index 0decab2e13a..10d334de3d2 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsections.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsections.xml index f7323ba094d..5c628cbf353 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsections.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsections.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsResult.xml index b1d29995312..a2cf4b8a773 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsResult.xml @@ -1,5 +1,5 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java index c03322d63cf..513d861c86c 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSources.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSources.xml index c6a0af9ddd2..786cb5a62e5 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSources.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSources.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesResult.xml index 35d913fd9fa..149aa297bd3 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesResult.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java index 71a32b75434..6d50a554609 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/Choices.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/Choices.xml index e8d1736f46c..2639cf4ceea 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/Choices.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/Choices.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesResult.xml index ab995365f22..60f5c9a9cb1 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesResult.xml @@ -1,5 +1,5 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java index e26846c57b9..eb55508a507 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java index 544366758f3..e873d93d8cd 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.io.IOUtils; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSections.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSections.xml index 2bc75fba5f4..2b30c8cb9d1 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSections.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSections.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml index 3a163e5f804..cb63af526a0 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsResult.xml @@ -1,5 +1,5 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java index e1eaa11dde9..5ceb358bfc0 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSections.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSections.xml index 7b5c0770096..4659221b8e4 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSections.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSections.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml index 034330c071c..1b8b5a71e35 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsResult.xml @@ -1,5 +1,5 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java index d0cd65741fc..a7bde53ad41 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/Page.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/Page.xml index 967da527b6e..e26543c5391 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/Page.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/Page.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageResult.xml index 95b86ef1f4d..1ac4368d3ec 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageResult.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java index 33930f3d0e0..a09088c3410 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.prelude.templates.PageTemplateSet; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlending.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlending.xml index dca31eb42e1..ebc99764873 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlending.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlending.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingResult.xml index 7ac78f3e820..01f74ad67a2 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingResult.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingTestCase.java index 445105cfd2f..0e8088d8b2a 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.prelude.templates.PageTemplateSet; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRenderer.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRenderer.xml index 5d3e38c2beb..f01a96315c8 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRenderer.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRenderer.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererResult.xml index 00656399331..95f01a6d7c8 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererResult.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererTestCase.java index e7dbae21d47..4a9ad9745cf 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.prelude.templates.PageTemplateSet; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoice.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoice.xml index ff39ef1d3d1..c50af35a582 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoice.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoice.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceResult.xml index c9e0909a476..dfdbac4b7ce 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceResult.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java index eb7c3e698dc..5c6cbbb4e27 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.prelude.templates.PageTemplateSet; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSources.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSources.xml index 36cace66ff7..5d0dc0a8f7d 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSources.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSources.xml @@ -1,4 +1,4 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml index 0ca5bfc7ea0..eb2e458ac6d 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesResult.xml @@ -1,5 +1,5 @@ - +
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java index 5019fc0d0ca..fb6b7ba1fc0 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.engine.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java index 22c269e761f..74b483bfaba 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParameters.xml b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParameters.xml index 2a98ef6918f..2ac389477c0 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParameters.xml +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParameters.xml @@ -1,4 +1,4 @@ - + source1p1Value diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java index 1f79637119a..74891137dab 100644 --- a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.pagetemplates.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/query/MatchingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/MatchingTestCase.java index 49e632b00bd..462e5284972 100644 --- a/container-search/src/test/java/com/yahoo/search/query/MatchingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/MatchingTestCase.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query; import com.yahoo.prelude.query.QueryException; diff --git a/container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java b/container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java index 3b230aa9416..01501674ae8 100644 --- a/container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/SoftTimeoutTestCase.java @@ -1,3 +1,4 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query; import com.yahoo.prelude.query.QueryException; diff --git a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java index b87d4d02b9b..36c45753e0d 100644 --- a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query; import com.ibm.icu.lang.UScript; diff --git a/container-search/src/test/java/com/yahoo/search/query/context/test/ConcurrentTraceTestCase.java b/container-search/src/test/java/com/yahoo/search/query/context/test/ConcurrentTraceTestCase.java index 98ed684af17..a6e431033cf 100644 --- a/container-search/src/test/java/com/yahoo/search/query/context/test/ConcurrentTraceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/context/test/ConcurrentTraceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.context.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java index 6f47c326e0c..b1b9b05eb54 100644 --- a/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/context/test/LoggingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.context.test; import java.util.HashSet; diff --git a/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java index 2e0dff115ed..57e4c8701d0 100644 --- a/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/context/test/PropertiesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.context.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/query/context/test/TraceTestCase.java b/container-search/src/test/java/com/yahoo/search/query/context/test/TraceTestCase.java index 7cc3d939b01..e64b1054f41 100644 --- a/container-search/src/test/java/com/yahoo/search/query/context/test/TraceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/context/test/TraceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.context.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/MultiProfileTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/MultiProfileTestCase.java index f406552cd30..db874ab3a81 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/MultiProfileTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/MultiProfileTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.config.test; import java.util.HashMap; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileConfigurationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileConfigurationTestCase.java index 36fc16b94eb..d77dc3e9939 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileConfigurationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileConfigurationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.config.test; import com.yahoo.config.subscription.ConfigInstanceUtil; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java index 2dd46b54661..5650a7d3e22 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.config.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/TypedProfilesConfigurationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/TypedProfilesConfigurationTestCase.java index b6a94396385..7907c747a31 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/TypedProfilesConfigurationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/TypedProfilesConfigurationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.config.test; import com.yahoo.search.query.profile.QueryProfileRegistry; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/XmlReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/XmlReadingTestCase.java index 3f2b437f755..b510f6c59bd 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/XmlReadingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/XmlReadingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.config.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/invalidxml1/illegalSetting.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/invalidxml1/illegalSetting.xml index cb1592e405b..f430b6a4436 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/invalidxml1/illegalSetting.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/invalidxml1/illegalSetting.xml @@ -1,4 +1,4 @@ - + value diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/invalidxml2/unparseable.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/invalidxml2/unparseable.xml index 4bc6cb4e464..3af446f8349 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/invalidxml2/unparseable.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/invalidxml2/unparseable.xml @@ -1,2 +1,2 @@ - + + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/production.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/production.xml index 5d55d9626b9..d873cacc255 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/production.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/production.xml @@ -1,4 +1,4 @@ - + production diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd-us-0.2.4.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd-us-0.2.4.xml index 2946f581533..e7741462a88 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd-us-0.2.4.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd-us-0.2.4.xml @@ -1,4 +1,4 @@ - + 3 true diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd-us.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd-us.xml index c96918f97f8..7e4ff3c1921 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd-us.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd-us.xml @@ -1,4 +1,4 @@ - + +yst_tweet_language:en +yst_tweet_adult_score:0 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd.xml index 588229d21c6..50c108ba0b1 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/klee/twitter_dd.xml @@ -1,4 +1,4 @@ - + 3 true diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/multiprofile/multiprofile1.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/multiprofile/multiprofile1.xml index 37354db337a..778f5b29599 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/multiprofile/multiprofile1.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/multiprofile/multiprofile1.xml @@ -1,4 +1,4 @@ - + + + parent1-value diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/multiprofile/parent2.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/multiprofile/parent2.xml index 59f08b3ef4c..7d5371fa2ee 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/multiprofile/parent2.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/multiprofile/parent2.xml @@ -1,4 +1,4 @@ - + parent2-value diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/default.xml index a1bd6a57727..2c3cd7f9afb 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/default.xml @@ -1,4 +1,4 @@ - + dim1,dim2,dim3 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/yahoo_uk.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/yahoo_uk.xml index 2e4dbce956d..faadb68388f 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/yahoo_uk.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/yahoo_uk.xml @@ -1,4 +1,4 @@ - + b diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/yahoo_uk_test.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/yahoo_uk_test.xml index fe4ed037532..aec20df4965 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/yahoo_uk_test.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/news/yahoo_uk_test.xml @@ -1,4 +1,4 @@ - + c diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase1/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase1/default.xml index 2dc8aebd6ce..9f024ab1b20 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase1/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase1/default.xml @@ -1,5 +1,5 @@ - + custid_1,custid_2 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase1/parent.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase1/parent.xml index 157b5ae9702..deb38b5d2f7 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase1/parent.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase1/parent.xml @@ -1,5 +1,5 @@ - + 0.0 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase2/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase2/default.xml index 5c2ed77211f..f9acf559eac 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase2/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase2/default.xml @@ -1,5 +1,5 @@ - + custid_1,custid_2,custid_3,custid_4,custid_5,custid_6 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase2/parent.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase2/parent.xml index 25bff4ada59..139781bb29c 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase2/parent.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase2/parent.xml @@ -1,5 +1,5 @@ - + 0.0 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase3/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase3/default.xml index 736ab0020d6..6500a25dc07 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase3/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase3/default.xml @@ -1,5 +1,5 @@ - + custid_1,custid_2,custid_3,custid_4,custid_5,custid_6 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase3/parent.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase3/parent.xml index 473fbd9610e..80f7465e69d 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase3/parent.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase3/parent.xml @@ -1,5 +1,5 @@ - + 0.0 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase4/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase4/default.xml index 1efcd6e4d87..07e0f9dda31 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase4/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase4/default.xml @@ -1,5 +1,5 @@ - + custid_1,custid_2,custid_3,custid_4,custid_5,custid_6 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase4/parent.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase4/parent.xml index 23c2b657182..d35642b9ddd 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase4/parent.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newscase4/parent.xml @@ -1,5 +1,5 @@ - + 0.0 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe/backend_news.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe/backend_news.xml index 3585ccd5eda..36688c682b9 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe/backend_news.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe/backend_news.xml @@ -1,4 +1,4 @@ - + vertical,sort,offset,resulttypes,rss,age,intl,testid diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe/default.xml index d8dbe6e929a..be2a5bd5ffa 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe/default.xml @@ -1,4 +1,4 @@ - + backend/news diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe2/backend.news.provider.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe2/backend.news.provider.xml index b0168f583b4..0390aeb0ffd 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe2/backend.news.provider.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe2/backend.news.provider.xml @@ -1,4 +1,4 @@ - + mode news_basic diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe2/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe2/default.xml index d43538bd106..53a71b235b1 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe2/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/newsfe2/default.xml @@ -1,4 +1,4 @@ - + intl diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/default.xml index ce40b67e3de..62733fc5caa 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/default.xml @@ -1,4 +1,4 @@ - + 5 %{subst}%{subst.end} diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/mandatory.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/mandatory.xml index 5b67e6682c8..d1ecaf6160d 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/mandatory.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/mandatory.xml @@ -1,3 +1,3 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/mandatorySpecified.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/mandatorySpecified.xml index 39b835cb536..c93a1dcbd59 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/mandatorySpecified.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/mandatorySpecified.xml @@ -1,4 +1,4 @@ - + 1377 37 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/multi.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/multi.xml index a4feef724b4..363852eb25c 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/multi.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/multi.xml @@ -1,4 +1,4 @@ - + querybest diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/multiDimensions.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/multiDimensions.xml index e4abc4a2202..10a83e67fc4 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/multiDimensions.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/multiDimensions.xml @@ -1,4 +1,4 @@ - + myquery, myindex diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/querybest.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/querybest.xml index b6e5031705b..d75a47521c7 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/querybest.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/querybest.xml @@ -1,4 +1,4 @@ - + title best diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/querylove.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/querylove.xml index e7864977804..58df89d86e4 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/querylove.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/querylove.xml @@ -1,4 +1,4 @@ - + title love diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/referingQuerybest.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/referingQuerybest.xml index ceb1d0302c6..b01fe698a0d 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/referingQuerybest.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/referingQuerybest.xml @@ -1,4 +1,4 @@ - + querybest diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/root.unoverridableIndex.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/root.unoverridableIndex.xml index e8412121d67..0276fb615e6 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/root.unoverridableIndex.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/root.unoverridableIndex.xml @@ -1,4 +1,4 @@ - + default 1 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/root.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/root.xml index 60e5026bc5f..c34797885a3 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/root.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/root.xml @@ -1,4 +1,4 @@ - + %{indexname} test1 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootChild.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootChild.xml index b7060093d74..ad5056e1bfb 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootChild.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootChild.xml @@ -1,3 +1,3 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootStrict.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootStrict.xml index f942e5c3cb5..8bec8ca5009 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootStrict.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootStrict.xml @@ -1,3 +1,3 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootWithFilter.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootWithFilter.xml index 1cb98d12ba8..31e93cede04 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootWithFilter.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/rootWithFilter.xml @@ -1,4 +1,4 @@ - + +best diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/test.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/test.xml index 6146a6ef7d0..6aec43e7f41 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/test.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/test.xml @@ -1,4 +1,4 @@ - + 3 true diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/forbidding.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/forbidding.xml index 6b1f666929f..1798aa5d579 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/forbidding.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/forbidding.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/mandatory.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/mandatory.xml index ea6180f7379..967ee4a5ef6 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/mandatory.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/mandatory.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/root.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/root.xml index 74077baafff..7ddd3a1e8ed 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/root.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/root.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/rootStrict.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/rootStrict.xml index 9b257e1c8a6..86e531a30e3 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/rootStrict.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/queryprofilevariants2/types/rootStrict.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/MyProfile1.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/MyProfile1.xml index 4b81164309d..7d0bf501d83 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/MyProfile1.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/MyProfile1.xml @@ -1,4 +1,4 @@ - + MyProfile1 myProfile1Only diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/MyProfile2.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/MyProfile2.xml index 14bb544b744..9a09d2f850a 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/MyProfile2.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/MyProfile2.xml @@ -1,4 +1,4 @@ - + MyProfile2 myProfile2Only diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/default.xml index 252b84600ed..4ef9bb0e253 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverride/default.xml @@ -1,4 +1,4 @@ - + default MyProfile1 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/MyProfile1.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/MyProfile1.xml index 4b81164309d..7d0bf501d83 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/MyProfile1.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/MyProfile1.xml @@ -1,4 +1,4 @@ - + MyProfile1 myProfile1Only diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/MyProfile2.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/MyProfile2.xml index 14bb544b744..9a09d2f850a 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/MyProfile2.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/MyProfile2.xml @@ -1,4 +1,4 @@ - + MyProfile2 myProfile2Only diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/default.xml index cf425a819e0..4c70a317b57 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/default.xml @@ -1,4 +1,4 @@ - + default MyProfile1 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/types/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/types/default.xml index 78a1db68661..965cfeb601f 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/types/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/refoverridetyped/types/default.xml @@ -1,4 +1,4 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/common.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/common.xml index eb6cc805bc4..9d04c053e6a 100755 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/common.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/common.xml @@ -1,4 +1,4 @@ - + source.common.intl diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/myprofile.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/myprofile.xml index 6260c08e9fa..b44160f3720 100755 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/myprofile.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/myprofile.xml @@ -1,4 +1,4 @@ - + common source diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/provider.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/provider.xml index 71ed8000a9d..3c36a473e9e 100755 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/provider.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/provider.xml @@ -1,4 +1,4 @@ - + source.common.mode yst diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/source.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/source.xml index a33a3cb455a..89e862319b0 100755 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/source.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/sourceprovider/source.xml @@ -1,4 +1,4 @@ - + common diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/systemtest/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/systemtest/default.xml index 873233042e4..187e967072d 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/systemtest/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/systemtest/default.xml @@ -1,4 +1,4 @@ - + bar 5 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/default.xml index a93771e68cb..8a461854897 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/default.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/modelSettings.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/modelSettings.xml index a045635966e..0d0e3b0a11a 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/modelSettings.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/modelSettings.xml @@ -1,4 +1,4 @@ - + some query diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/referencingModelSettings.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/referencingModelSettings.xml index fe07ae55a1f..4dfe36b328b 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/referencingModelSettings.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/referencingModelSettings.xml @@ -1,4 +1,4 @@ - + modelSettings diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/root.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/root.xml index 05606e2be8d..c233726bfc9 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/root.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/root.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/someUser.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/someUser.xml index 42175fd6368..bd8fb68703c 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/someUser.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/someUser.xml @@ -1,5 +1,5 @@ - + x diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/types/rootType.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/types/rootType.xml index bf49c03e57f..450f1fb5ee3 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/types/rootType.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/types/rootType.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/types/user.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/types/user.xml index 96f702a43eb..1e3a0aa74eb 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/types/user.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/types/user.xml @@ -1,5 +1,5 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.0.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.0.xml index 7aad3ee2df7..a415494357f 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.0.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.0.xml @@ -1,4 +1,4 @@ - + MyProfile:1.0.0 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.2.a.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.2.a.xml index 0314223b732..47212d240f7 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.2.a.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.2.a.xml @@ -1,4 +1,4 @@ - + MyProfile:1.0.2.a diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.2.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.2.xml index debd93850ae..0666923309f 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.2.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/MyProfile-1.0.2.xml @@ -1,4 +1,4 @@ - + MyProfile:1.0.2 diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/default.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/default.xml index 67dc76c851f..b886de4c5bd 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/default.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versionrefs/default.xml @@ -1,4 +1,4 @@ - + default MyProfile diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versions/testprofile-1.20.100.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versions/testprofile-1.20.100.xml index 08ae7dd9ee0..c1b0216f969 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versions/testprofile-1.20.100.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versions/testprofile-1.20.100.xml @@ -1,3 +1,3 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versions/testprofile.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versions/testprofile.xml index 12309a78075..96ef4bc5406 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versions/testprofile.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/versions/testprofile.xml @@ -1,3 +1,3 @@ - + diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java index 7877e48ea50..0a62581eca0 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/CloningTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.container.jdisc.HttpRequest; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/DimensionBindingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/DimensionBindingTestCase.java index 28cd0f4daf9..7049b98288a 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/DimensionBindingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/DimensionBindingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.search.query.profile.DimensionBinding; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/DumpToolTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/DumpToolTestCase.java index 576605b8fa4..3d422767a66 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/DumpToolTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/DumpToolTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.search.query.profile.DumpTool; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java index e67d7723932..f75444108ff 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.container.jdisc.HttpRequest; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileCloneMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileCloneMicroBenchmark.java index 684e6072c5d..2396f1290f7 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileCloneMicroBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileCloneMicroBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileGetInComplexStructureMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileGetInComplexStructureMicroBenchmark.java index 180c21c54c6..40af6e7393f 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileGetInComplexStructureMicroBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileGetInComplexStructureMicroBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.processing.request.CompoundName; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileGetMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileGetMicroBenchmark.java index 46230793d4d..7b960e0a1db 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileGetMicroBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileGetMicroBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java index cca4a2833d0..481125e5a7f 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileListPropertiesMicroBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java index 27f48e3ff6d..27960aac56c 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.processing.request.Properties; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java index ba066367fb0..4604678198d 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileVariantsCloneTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileVariantsCloneTestCase.java index de8f9dab985..9e41f7a84e7 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileVariantsCloneTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileVariantsCloneTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileVariantsTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileVariantsTestCase.java index 95f121adab9..9e920799bbc 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileVariantsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileVariantsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/FieldTypeTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/FieldTypeTestCase.java index ae1e39e52d0..ed4568c5b94 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/FieldTypeTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/FieldTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.types.test; import com.yahoo.search.query.profile.types.FieldType; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/MandatoryTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/MandatoryTestCase.java index 8e2c465911b..b91bcbfba69 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/MandatoryTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/MandatoryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.types.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NameTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NameTestCase.java index 562418647c8..f6374705e5e 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NameTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NameTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.types.test; import com.yahoo.search.query.profile.QueryProfileRegistry; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NativePropertiesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NativePropertiesTestCase.java index 77e733a740a..d073efd682b 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NativePropertiesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NativePropertiesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.types.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/OverrideTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/OverrideTestCase.java index 77c3d26f9be..8e4415ffb61 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/OverrideTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/OverrideTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.types.test; import com.yahoo.jdisc.http.HttpRequest.Method; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/PatchMatchingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/PatchMatchingTestCase.java index 65a552931ac..a02dbb334d5 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/PatchMatchingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/PatchMatchingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.types.test; import com.yahoo.search.query.profile.QueryProfile; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeInheritanceTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeInheritanceTestCase.java index 85333e1e95a..52bfe04a05f 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeInheritanceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeInheritanceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.types.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java index 6e2ee721752..984707534ec 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.profile.types.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/query/properties/test/PropertyMapTestCase.java b/container-search/src/test/java/com/yahoo/search/query/properties/test/PropertyMapTestCase.java index d68745b0d57..419e650a01e 100644 --- a/container-search/src/test/java/com/yahoo/search/query/properties/test/PropertyMapTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/properties/test/PropertyMapTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.properties.test; import com.yahoo.processing.request.properties.PropertyMap; diff --git a/container-search/src/test/java/com/yahoo/search/query/properties/test/RequestContextPropertiesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/properties/test/RequestContextPropertiesTestCase.java index ff924bb59ea..e9789a4523a 100644 --- a/container-search/src/test/java/com/yahoo/search/query/properties/test/RequestContextPropertiesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/properties/test/RequestContextPropertiesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.properties.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/query/properties/test/SubPropertiesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/properties/test/SubPropertiesTestCase.java index 35185b8d8f6..f4220f58bc4 100644 --- a/container-search/src/test/java/com/yahoo/search/query/properties/test/SubPropertiesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/properties/test/SubPropertiesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.properties.test; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java index 8f3ac661d0f..5508c2a73a7 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.rewrite; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java index 663d092e13e..6399c24277e 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.rewrite.test; import java.util.*; diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java index b5b4acff459..82f548727f6 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.rewrite.test; import com.yahoo.search.*; diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java index ecd798caacd..c44613f4f49 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.rewrite.test; import java.util.*; diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java index f3eaf6ae582..9e21df844f2 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.rewrite.test; import java.io.File; diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java index 74322a4d980..0ae9715c377 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.rewrite.test; import com.yahoo.search.test.QueryTestCase; diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java index 608706605f3..af16d892aa2 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.rewrite.test; import java.util.*; diff --git a/container-search/src/test/java/com/yahoo/search/query/test/ModelTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/ModelTestCase.java index 301438a5e41..9049b863c3e 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/ModelTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/ModelTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.test; import com.yahoo.prelude.query.Item; diff --git a/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java index 2f668602680..13d25274db1 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/ParametersTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.test; import com.yahoo.container.jdisc.HttpRequest; diff --git a/container-search/src/test/java/com/yahoo/search/query/test/PresentationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/PresentationTestCase.java index 3222bd99cd9..1f5ecf778ac 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/PresentationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/PresentationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.test; import com.yahoo.prelude.query.Highlight; diff --git a/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java b/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java index 365a8e87c40..1a6f0bd9e49 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/QueryCloneMicroBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.test; import com.yahoo.prelude.query.WeightedSetItem; diff --git a/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java index 4ee4932bb65..6c65fd79b90 100644 --- a/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/query/textserialize/item/test/ParseItemTestCase.java b/container-search/src/test/java/com/yahoo/search/query/textserialize/item/test/ParseItemTestCase.java index afc0234540a..8d4d4baccbb 100644 --- a/container-search/src/test/java/com/yahoo/search/query/textserialize/item/test/ParseItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/textserialize/item/test/ParseItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.textserialize.item.test; import com.yahoo.prelude.query.*; diff --git a/container-search/src/test/java/com/yahoo/search/query/textserialize/serializer/test/SerializeItemTestCase.java b/container-search/src/test/java/com/yahoo/search/query/textserialize/serializer/test/SerializeItemTestCase.java index 47bf4072f60..61fc59bccbe 100644 --- a/container-search/src/test/java/com/yahoo/search/query/textserialize/serializer/test/SerializeItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/textserialize/serializer/test/SerializeItemTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query.textserialize.serializer.test; import com.yahoo.prelude.query.AndItem; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/BooleanAttributeParserTest.java b/container-search/src/test/java/com/yahoo/search/querytransform/BooleanAttributeParserTest.java index 764a44a1bd6..7900ec471e8 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/BooleanAttributeParserTest.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/BooleanAttributeParserTest.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform; import com.yahoo.prelude.query.PredicateQueryItem; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/BooleanSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/BooleanSearcherTestCase.java index 5c3d9b4824f..952f002a1d1 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/BooleanSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/BooleanSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/LegacyCombinatorTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/LegacyCombinatorTestCase.java index 77c9d1ddb97..502f7f21d8f 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/LegacyCombinatorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/LegacyCombinatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform; import java.util.HashSet; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/LowercasingTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/LowercasingTestCase.java index 6b8f8861af5..7430b075140 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/LowercasingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/LowercasingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/TestUtils.java b/container-search/src/test/java/com/yahoo/search/querytransform/TestUtils.java index 512c28b28b1..c7a44e8aceb 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/TestUtils.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/TestUtils.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform; import com.yahoo.prelude.query.Item; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java index cbd168225d4..8f89290a794 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java index 15c6f707c4f..80a52b55928 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/NGramSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform.test; import java.util.Arrays; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/QueryCombinatorTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/QueryCombinatorTestCase.java index 975eec9ce5c..e2cbe500191 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/test/QueryCombinatorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/QueryCombinatorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform.test; import java.util.HashSet; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/RangeQueryOptimizerTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/RangeQueryOptimizerTestCase.java index 9362f729766..00bd87b4bf9 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/test/RangeQueryOptimizerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/RangeQueryOptimizerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java index 3c6804e6209..5b0c2c7e5a3 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/test/SortingDegraderTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/rendering/AsyncGroupPopulationTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/AsyncGroupPopulationTestCase.java index fa690138e88..a49c1541fd6 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/AsyncGroupPopulationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/AsyncGroupPopulationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.rendering; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java index b555e038f1c..791e95403ab 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.rendering; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java index dc0bc42d410..09d36bb3857 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.rendering; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java index a51dfc1b12f..a52d9bcdb6c 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.rendering; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/result/DefaultErrorHitTestCase.java b/container-search/src/test/java/com/yahoo/search/result/DefaultErrorHitTestCase.java index 582b8be1170..840f5cbdf04 100644 --- a/container-search/src/test/java/com/yahoo/search/result/DefaultErrorHitTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/DefaultErrorHitTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/result/NanNumberTestCase.java b/container-search/src/test/java/com/yahoo/search/result/NanNumberTestCase.java index f6b2472cfb5..b314ad7a0b5 100644 --- a/container-search/src/test/java/com/yahoo/search/result/NanNumberTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/NanNumberTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/result/TemplatingTestCase.java b/container-search/src/test/java/com/yahoo/search/result/TemplatingTestCase.java index 0e382e454b1..13d0c64a0c2 100644 --- a/container-search/src/test/java/com/yahoo/search/result/TemplatingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/TemplatingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/result/test/ArrayOutputTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/ArrayOutputTestCase.java index 35841a72428..6dec91382b6 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/ArrayOutputTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/ArrayOutputTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result.test; import java.io.IOException; diff --git a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java index efa01cc7c53..8ac18c119d8 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java index 386e04ba943..7d18c64a531 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result.test; import java.util.Iterator; diff --git a/container-search/src/test/java/com/yahoo/search/result/test/DefaultErrorHitTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/DefaultErrorHitTestCase.java index 2935c826539..29199cf3ef9 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/DefaultErrorHitTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/DefaultErrorHitTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result.test; import com.yahoo.prelude.templates.SearchRendererAdaptor; diff --git a/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java index 9e16b7312eb..4a0e8a0a88c 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result.test; import com.yahoo.search.result.Hit; diff --git a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java index b60ec24f747..9ded5f7b768 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result.test; import com.yahoo.search.result.Hit; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/DependencyConfigTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/DependencyConfigTestCase.java index 9066df45309..847d7c2daf9 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/DependencyConfigTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/DependencyConfigTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.config.test; import java.io.File; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java index 17475d20292..e9eb90378f4 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/SearchChainConfigurerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.config.test; import com.yahoo.config.search.IntConfig; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Searcher1.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Searcher1.java index 5c42629524b..2bc3e3e317c 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Searcher1.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher1/Searcher1.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.config.test.searcher1; import com.yahoo.search.result.ErrorMessage; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Searcher2.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Searcher2.java index 942bb2fe97a..3a517d0fd2e 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Searcher2.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/searcher2/Searcher2.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.config.test.searcher2; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher1.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher1.java index 0e7e5fb54b7..5d107e36065 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher1.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher1.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.config.test.twosearchers; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher2.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher2.java index 091380a524e..ba5f4ee4afc 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher2.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/twosearchers/MultiSearcher2.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.config.test.twosearchers; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java index 92bc09c0162..04b39fdc4ac 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/config/test/updatesearcher/UpdateSearcher.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.config.test.updatesearcher; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java index ac0f3fe63a5..44d5dc29a2d 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionOfOneChainTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionTestCase.java index a54367628a3..c5d756e81e1 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/AsyncExecutionTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java index 5b1d99363a3..fb9af72a715 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/ExecutionTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java index 51a050b1e76..f802914d291 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.test; import com.google.common.util.concurrent.AbstractFuture; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/SearchChainTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/SearchChainTestCase.java index 0d87d4448f4..204a4c6d8df 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/SearchChainTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/SearchChainTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.test; import static com.yahoo.search.searchchain.test.SimpleSearchChain.searchChain; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/SimpleSearchChain.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/SimpleSearchChain.java index 8aeef025271..2913cc36f41 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/SimpleSearchChain.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/SimpleSearchChain.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java index 0833fef47bf..fce6b1e97d5 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.test; import com.yahoo.component.ComponentId; diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/VespaAsyncSearcherTest.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/VespaAsyncSearcherTest.java index 954290de6a2..9c7be743460 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/VespaAsyncSearcherTest.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/VespaAsyncSearcherTest.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java index 23316a58877..14fc0da7d02 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ConnectionControlSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ConnectionControlSearcherTestCase.java index 5e8596ef16d..67dc72c5d7f 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/ConnectionControlSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ConnectionControlSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java index ff521da1aad..dbeced57c52 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/MockMetric.java b/container-search/src/test/java/com/yahoo/search/searchers/test/MockMetric.java index aaad8ba80ae..c672fefde6b 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/MockMetric.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/MockMetric.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; import com.yahoo.jdisc.Metric; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingBenchmark.java b/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingBenchmark.java index b58abce7f5f..1605e8c9bac 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; import com.yahoo.cloud.config.ClusterInfoConfig; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingSearcherTestCase.java index e210213c515..65cbfa829f2 100755 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; import com.yahoo.cloud.config.ClusterInfoConfig; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java index 31457c51011..747471a875b 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; import com.google.common.util.concurrent.MoreExecutors; diff --git a/container-search/src/test/java/com/yahoo/search/statistics/ElapsedTimeTestCase.java b/container-search/src/test/java/com/yahoo/search/statistics/ElapsedTimeTestCase.java index 43563e29218..42a6a7e00d0 100644 --- a/container-search/src/test/java/com/yahoo/search/statistics/ElapsedTimeTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/statistics/ElapsedTimeTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.statistics; import junit.framework.TestCase; diff --git a/container-search/src/test/java/com/yahoo/search/statistics/PeakQpsTestCase.java b/container-search/src/test/java/com/yahoo/search/statistics/PeakQpsTestCase.java index fba46e1dfbe..fd03b37ac3a 100644 --- a/container-search/src/test/java/com/yahoo/search/statistics/PeakQpsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/statistics/PeakQpsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.statistics; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/statistics/TimingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/statistics/TimingSearcherTestCase.java index 2f086dbe5a8..fabd8ed9fa3 100644 --- a/container-search/src/test/java/com/yahoo/search/statistics/TimingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/statistics/TimingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.statistics; import junit.framework.TestCase; diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java b/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java index 4908efb823f..5ad28ea4160 100644 --- a/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java index ac1da3ada1c..ce9e3357c77 100644 --- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.test; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java b/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java index c8bb28b4367..3f2d67083a9 100644 --- a/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java b/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java index 33b221cdf36..60b6e9534c9 100644 --- a/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java +++ b/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.test; import com.yahoo.search.Query; diff --git a/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java index ac6ceeb5467..f5097aec6e1 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java index 86ec570d6bb..e5dbe10a0e4 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/yql/ResegmentingTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/ResegmentingTestCase.java index 8c4d8e0fe84..1bed8ff2233 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/ResegmentingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/ResegmentingTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java index 0d81970bdce..3fa7f1ee47e 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java index d9d8eb1b14b..d6bcdf3195f 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; import static org.junit.Assert.*; diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java index 507b006d634..e1740c55fb0 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; import static org.junit.Assert.assertEquals; diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java index 42f285cf096..75b39f26625 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; import com.yahoo.component.Version; diff --git a/container-search/src/test/java/com/yahoo/text/interpretation/test/AnnotationTestCase.java b/container-search/src/test/java/com/yahoo/text/interpretation/test/AnnotationTestCase.java index 6fd5c238d6f..a947e46a40e 100644 --- a/container-search/src/test/java/com/yahoo/text/interpretation/test/AnnotationTestCase.java +++ b/container-search/src/test/java/com/yahoo/text/interpretation/test/AnnotationTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.text.interpretation.test; import java.util.ArrayList; diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/ListMergerTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/ListMergerTestCase.java index 55af3dd43e5..5fb4232eca3 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/ListMergerTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/ListMergerTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors; import com.yahoo.vespa.streamingvisitors.ListMerger; diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java index 0932b202dac..469ce203c0b 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors; import com.yahoo.component.chain.Chain; diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java index e3797b1f63e..83e46f5f5d1 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors; import com.yahoo.config.subscription.ConfigGetter; diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java index f6c269452cc..6964fd3b5e8 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors; import com.yahoo.document.select.OrderingSpecification; diff --git a/container-search/src/test/vespa-configdef/int.def b/container-search/src/test/vespa-configdef/int.def index 993167f9ca8..895a5e0de68 100644 --- a/container-search/src/test/vespa-configdef/int.def +++ b/container-search/src/test/vespa-configdef/int.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=config.search diff --git a/container-search/src/test/vespa-configdef/string.def b/container-search/src/test/vespa-configdef/string.def index 9d3d224c19b..c3ee208f633 100644 --- a/container-search/src/test/vespa-configdef/string.def +++ b/container-search/src/test/vespa-configdef/string.def @@ -1,4 +1,4 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=1 namespace=config.search -- cgit v1.2.3