From a84e7e88923c211d6bcdc56929ade99d86813bb6 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 14 Jun 2017 17:57:50 +0200 Subject: Revert "Update copyright headers" --- predicate-search-core/pom.xml | 2 +- .../src/main/antlr3/com/yahoo/document/predicate/parser/Predicate.g | 1 - .../src/main/java/com/yahoo/document/predicate/BinaryFormat.java | 2 +- .../src/main/java/com/yahoo/document/predicate/BooleanPredicate.java | 2 +- .../src/main/java/com/yahoo/document/predicate/Conjunction.java | 2 +- .../src/main/java/com/yahoo/document/predicate/Disjunction.java | 2 +- .../src/main/java/com/yahoo/document/predicate/FeatureConjunction.java | 2 +- .../src/main/java/com/yahoo/document/predicate/FeatureRange.java | 2 +- .../src/main/java/com/yahoo/document/predicate/FeatureSet.java | 2 +- .../src/main/java/com/yahoo/document/predicate/Negation.java | 2 +- .../src/main/java/com/yahoo/document/predicate/Predicate.java | 2 +- .../src/main/java/com/yahoo/document/predicate/PredicateHash.java | 2 +- .../src/main/java/com/yahoo/document/predicate/PredicateOperator.java | 2 +- .../src/main/java/com/yahoo/document/predicate/PredicateValue.java | 2 +- .../src/main/java/com/yahoo/document/predicate/Predicates.java | 2 +- .../src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java | 2 +- .../src/main/java/com/yahoo/document/predicate/RangePartition.java | 2 +- .../src/main/java/com/yahoo/document/predicate/SimplePredicates.java | 2 +- .../src/main/java/com/yahoo/document/predicate/package-info.java | 2 +- .../src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java | 2 +- .../src/main/java/com/yahoo/search/predicate/SubqueryBitmap.java | 2 +- .../java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java | 2 +- .../java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java | 2 +- .../com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java | 2 +- .../java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java | 2 +- .../main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java | 2 +- .../java/com/yahoo/search/predicate/optimization/PredicateOptions.java | 2 +- .../com/yahoo/search/predicate/optimization/PredicateProcessor.java | 2 +- .../main/java/com/yahoo/search/predicate/optimization/package-info.java | 2 +- .../src/main/java/com/yahoo/search/predicate/package-info.java | 2 +- .../src/test/java/com/yahoo/document/predicate/BinaryFormatTest.java | 2 +- .../test/java/com/yahoo/document/predicate/BooleanPredicateTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/ConjunctionTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/DisjunctionTest.java | 2 +- .../test/java/com/yahoo/document/predicate/FeatureConjunctionTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/FeatureSetTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/NegationTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/PredicateHashTest.java | 2 +- .../test/java/com/yahoo/document/predicate/PredicateOperatorTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/PredicateParserTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/PredicateTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/PredicateValueTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/PredicatesTest.java | 2 +- .../test/java/com/yahoo/document/predicate/RangeEdgePartitionTest.java | 2 +- .../src/test/java/com/yahoo/document/predicate/RangePartitionTest.java | 2 +- .../test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java | 2 +- .../com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java | 2 +- .../com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java | 2 +- .../yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java | 2 +- .../com/yahoo/search/predicate/optimization/NotNodeReordererTest.java | 2 +- .../java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java | 2 +- 52 files changed, 51 insertions(+), 52 deletions(-) (limited to 'predicate-search-core') diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index ea2995c4770..546d1f5b514 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 diff --git a/predicate-search-core/src/main/antlr3/com/yahoo/document/predicate/parser/Predicate.g b/predicate-search-core/src/main/antlr3/com/yahoo/document/predicate/parser/Predicate.g index 1123d3904a8..963d87c3218 100644 --- a/predicate-search-core/src/main/antlr3/com/yahoo/document/predicate/parser/Predicate.g +++ b/predicate-search-core/src/main/antlr3/com/yahoo/document/predicate/parser/Predicate.g @@ -1,4 +1,3 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. grammar Predicate; @header { diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/BinaryFormat.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/BinaryFormat.java index aedfd415e1a..89dcbc59d99 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/BinaryFormat.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/BinaryFormat.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import com.yahoo.slime.Cursor; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/BooleanPredicate.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/BooleanPredicate.java index 9545d729b5e..507d48bf241 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/BooleanPredicate.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/BooleanPredicate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; /** diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java index ec7eebec020..d917e374b69 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Conjunction.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import java.util.ArrayList; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java index fa7b97065de..c5fa6ba1f70 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Disjunction.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import java.util.ArrayList; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java index 8a7059c9226..ba6bb32e05f 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import java.util.ArrayList; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java index f3062f24e45..2ca09ee98f0 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import java.util.ArrayList; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java index bd004ae7c30..be560514995 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import java.util.Arrays; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java index 48481e255e4..c5a4cb802ee 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Negation.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import java.util.List; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicate.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicate.java index 5845366b325..2446d3e3524 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicate.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicate.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import com.yahoo.document.predicate.parser.PredicateLexer; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java index b17abf6365e..8c0c9ee590e 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java index c2df6f79b4c..0c0af37a791 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import java.util.List; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateValue.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateValue.java index ac4269c4529..f34a8f4b268 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateValue.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateValue.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; /** diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java index 3ed31118c9b..7362eb5ba6d 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; /** diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java index 0ee3c256bf0..0771f0ec08e 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; /** diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java index f5388fd1271..33cdd23c45c 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; /** diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java index 2c3216b18c9..1b339767109 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import java.util.ArrayList; diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/package-info.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/package-info.java index 2216f96eb7f..ef3b6954992 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/package-info.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @com.yahoo.osgi.annotation.ExportPackage @com.yahoo.api.annotations.PublicApi /* diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java index 3dcaee1dec7..6f5fac54354 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate; import com.fasterxml.jackson.core.JsonFactory; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/SubqueryBitmap.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/SubqueryBitmap.java index 6582e5f08ca..84b342f930a 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/SubqueryBitmap.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/SubqueryBitmap.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate; /** diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java index 0d06ac2c073..b281f98a94a 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.Conjunction; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java index 4167dd0fa4a..fd1fed8ae15 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.BooleanPredicate; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java index f67bd9ab5dd..4ff5d37f842 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.FeatureRange; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java index c0f147c339e..bd7339581f4 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.Conjunction; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java index 84af44b37af..768534b0068 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.Conjunction; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java index 5f657dcfe99..134d52dd3ab 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import java.util.OptionalLong; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateProcessor.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateProcessor.java index b327ae820e6..f6559bb4044 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateProcessor.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateProcessor.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.Predicate; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/package-info.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/package-info.java index d025fe8d81b..77d8143d137 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/package-info.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @com.yahoo.osgi.annotation.ExportPackage package com.yahoo.search.predicate.optimization; diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/package-info.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/package-info.java index f671e1f5cbc..8f2d929efcd 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/package-info.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/package-info.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @com.yahoo.osgi.annotation.ExportPackage package com.yahoo.search.predicate; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/BinaryFormatTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/BinaryFormatTest.java index 38a213bd9af..44477423fdb 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/BinaryFormatTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/BinaryFormatTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import com.yahoo.slime.Inspector; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/BooleanPredicateTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/BooleanPredicateTest.java index 9d6b791d9e9..7268b358889 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/BooleanPredicateTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/BooleanPredicateTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java index a254c5f32cb..6e12a00ba4d 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java index 3946538b93e..99dc46c4f5f 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/DisjunctionTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureConjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureConjunctionTest.java index 378a9c07a8b..e98400e86fa 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureConjunctionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureConjunctionTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java index c7ffce040d1..efcc0e5b64a 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureRangeTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java index 3c2d19cede1..7bc9d5f2c04 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/FeatureSetTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/NegationTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/NegationTest.java index 6fb58d9382b..95666342152 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/NegationTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/NegationTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateHashTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateHashTest.java index e6155899837..759bfe9f48f 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateHashTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateHashTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateOperatorTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateOperatorTest.java index 833676f68dd..b6de0bf3514 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateOperatorTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateOperatorTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateParserTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateParserTest.java index bdfb7d4c027..ee161c20feb 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateParserTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateParserTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateTest.java index 26a37d55d69..621378f394b 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateValueTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateValueTest.java index b6a2016b2ab..810e9a8717c 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateValueTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateValueTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicatesTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicatesTest.java index fe2a21f36d6..22832eedeff 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicatesTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicatesTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/RangeEdgePartitionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/RangeEdgePartitionTest.java index ba1729da37d..d9f6714d8c8 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/RangeEdgePartitionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/RangeEdgePartitionTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/RangePartitionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/RangePartitionTest.java index 235379ef971..b9d2c865e9b 100644 --- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/RangePartitionTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/RangePartitionTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java index 806cae89333..dcee3a0c55d 100644 --- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/PredicateQueryParserTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate; import org.junit.Test; diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java index 2dd12c10b8e..4ec6c496e73 100644 --- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/AndOrSimplifierTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.Predicate; diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java index a5450e7bbac..37d2352df57 100644 --- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/BooleanSimplifierTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.Predicate; diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java index 2e3e57508cf..45cdabfb4f2 100644 --- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformerTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.FeatureRange; diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java index 2b25c22b6ec..de61c3e04c6 100644 --- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/NotNodeReordererTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.Predicate; diff --git a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java index 05fd5a02f8f..6db02c5be57 100644 --- a/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java +++ b/predicate-search-core/src/test/java/com/yahoo/search/predicate/optimization/OrSimplifierTest.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.optimization; import com.yahoo.document.predicate.Predicate; -- cgit v1.2.3