diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-05-19 12:03:06 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2022-05-19 12:03:06 +0200 |
| commit | 5c24dc5c9642a8d9ed70aee4c950fd0678a1ebec (patch) | |
| tree | bd9b74bf00c832456f0b83c1b2cd7010be387d68 /config-model/src/test/java/com/yahoo | |
| parent | f17c4fe7de4c55f5c4ee61897eab8c2f588d8405 (diff) | |
Rename the 'searchdefinition' package to 'schema'
Diffstat (limited to 'config-model/src/test/java/com/yahoo')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/document/test/SDFieldTestCase.java | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/AbstractSchemaTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/AbstractSchemaTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/AnnotationReferenceTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/AnnotationReferenceTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/ArraysTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/ArraysWeightedSetsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/ArraysWeightedSetsTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java) | 12 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/AttributeUtils.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/AttributeUtils.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/CommentTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/DiversityTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/DocumentGraphValidatorTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/DocumentReferenceResolverTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/FeatureNamesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/FeatureNamesTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/FieldOfTypeDocumentTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/ImportedFieldsEnumeratorTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java) | 9 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/IncorrectRankingExpressionFileRefTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/IncorrectSummaryTypesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/IndexSettingsTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/IndexingParsingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/IndexingParsingTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/MultipleSummariesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/NameFieldCheckTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/OutsideTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/PredicateDataTypeTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankProfileRegistryTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankProfileTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java) | 14 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankingConstantTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankingExpressionConstantsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankingExpressionInliningTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankingExpressionLoopDetectionTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionLoopDetectionTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankingExpressionShadowingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankingExpressionValidationTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/ReservedWordsAsFieldNamesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java) | 4 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/schema/SDDocumentTypeOrdererTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/SDDocumentTypeOrdererTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/SchemaImporterTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/SchemaImporterTestCase.java) | 16 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/SchemaParsingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/SchemaParsingTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/SchemaTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/StemmingSettingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java) | 8 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/schema/StructTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/UrlFieldValidationTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/UrlFieldValidationTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/AbstractExportingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java) | 12 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/schema/derived/AnnotationsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/ArraysTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/ArraysTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/AttributeListTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java) | 12 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/AttributesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributesTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/CasingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/CasingTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/CombinedAttributeAndIndexSchemaTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/CombinedAttributeAndIndexSchemaTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/DeriverTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/DuplicateStructTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/EmptyRankProfileTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java) | 14 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/ExactMatchTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/ExpressionsAsArgsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/ExpressionsAsArgsTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/FieldsetTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/FieldsetTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/GeminiTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/GeminiTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/IdTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java) | 12 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/ImportedFieldsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/ImportedFieldsTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/IndexSchemaTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/IndexSchemaTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/InheritanceTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java) | 14 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/IntegerAttributeToStringIndexTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/IntegerAttributeToStringIndexTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/LiteralBoostTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java) | 18 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/LowercaseTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/LowercaseTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/MailTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/MailTestCase.java) | 6 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/schema/derived/MatchSettingsResolvingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/MatchSettingsResolvingTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/MultiStructTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java) | 5 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/MultipleSummariesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/NameCollisionTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java) | 3 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/NativeRankTypeDefinitionsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionsTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/NearestNeighborTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/NearestNeighborTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/NeuralNetTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/NeuralNetTestCase.java) | 5 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/NuwaTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/NuwaTestCase.java) | 4 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/schema/derived/OrderIlscriptsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/OrderIlscriptsTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/PrefixExactAttributeTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/RankProfilesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/RankPropertiesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/RankPropertiesTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/ReferenceFieldsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFieldsTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/ReferenceFromSeveralTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java) | 5 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/SchemaInheritanceTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/SchemaInheritanceTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/SchemaOrdererTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/SchemaOrdererTestCase.java) | 16 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/SimpleInheritTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/SimpleInheritTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/SliceTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/SliceTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/SortingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java) | 4 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/schema/derived/StreamingStructTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java) | 4 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/schema/derived/StructAnyOrderTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/StructAnyOrderTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/StructInheritanceTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/StructInheritanceTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/SummaryMapTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java) | 12 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/TestableDeployLogger.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/TestableDeployLogger.java) | 2 | ||||
| -rwxr-xr-x | config-model/src/test/java/com/yahoo/schema/derived/TokenizationTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/TokenizationTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/TwoStreamingStructsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/TwoStreamingStructsTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/TypeConversionTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java) | 14 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/TypesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/derived/VsmFieldsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java) | 11 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/document/ComplexAttributeFieldUtilsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtilsTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/document/HnswIndexParamsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/document/HnswIndexParamsTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/parser/ConvertIntermediateTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/parser/ConvertIntermediateTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/parser/IntermediateCollectionTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateCollectionTestCase.java) | 3 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/parser/ParsedDocumentTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/parser/ParsedDocumentTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/parser/SchemaParserTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java) | 19 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/AdjustPositionSummaryFieldsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/AssertIndexingScript.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertIndexingScript.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/AssertSearchBuilder.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertSearchBuilder.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/AttributesExactMatchTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java) | 13 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/BoldingTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/BoldingTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/BoolAttributeValidatorTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/BoolAttributeValidatorTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java) | 16 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/FastAccessValidatorTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ImplicitSchemaFieldsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java) | 16 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ImplicitStructTypesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java) | 14 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ImplicitSummariesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummariesTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ImplicitSummaryFieldsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFieldsTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ImportedFieldsResolverTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java) | 16 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ImportedFieldsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java) | 16 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/IndexingInputsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingInputsTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingOutputsTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java) | 20 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/IndexingValidationTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java) | 12 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/IndexingValuesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValuesTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/IntegerIndex2AttributeTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java) | 14 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/MatchPhaseSettingsValidatorTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidatorTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/MatchedElementsOnlyResolverTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/NGramTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java) | 17 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/PagedAttributeValidatorTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/PagedAttributeValidatorTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ParentChildSearchModel.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java) | 19 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/PositionTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankModifierTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankModifierTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankProfileSearchFixture.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java) | 12 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankPropertyVariablesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankPropertyVariablesTestCase.java) | 14 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithLightGBMTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithLightGBMTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxModelTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java) | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithTensorTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithTransformerTokensTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java) | 16 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithXGBoostTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithXGBoostTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionsTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java) | 24 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ReferenceFieldTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ReservedDocumentNamesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedDocumentNamesTestCase.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ReservedRankingExpressionFunctionNamesTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/SchemaMustHaveDocumentTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/SchemaMustHaveDocumentTest.java) | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/SummaryConsistencyTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryConsistencyTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSourceTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSourceTestCase.java) | 12 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/TensorFieldTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorFieldTestCase.java) | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/TensorTransformTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java) | 20 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/ValidateFieldTypesTest.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java) | 19 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/VespaMlModelTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java) | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/processing/WeightedSetSummaryToTestCase.java (renamed from config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java) | 10 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/documentmodel/AbstractReferenceFieldTestCase.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderImportedFieldsTestCase.java | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java | 4 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java | 6 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java | 3 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java | 10 |
160 files changed, 575 insertions, 596 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java index 3acc44113d0..57a61e40d89 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java @@ -13,8 +13,8 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.document.DataType; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; -import com.yahoo.searchdefinition.DocumentOnlySchema; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.DocumentOnlySchema; +import com.yahoo.schema.Schema; import com.yahoo.vespa.config.ConfigDefinition; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.model.VespaModel; diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java index 96186150108..273102a00c5 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java @@ -5,7 +5,7 @@ import com.yahoo.component.Version; import com.yahoo.config.model.application.provider.ApplicationPackageXmlFilesValidator; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Schema; import java.io.File; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java b/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java index d4ebbe62507..4a3d85c6a76 100644 --- a/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java +++ b/config-model/src/test/java/com/yahoo/document/test/SDDocumentTypeTestCase.java @@ -4,11 +4,11 @@ package com.yahoo.document.test; import com.yahoo.document.DataType; import com.yahoo.document.DataTypeName; import com.yahoo.documentmodel.VespaDocumentType; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.model.test.utils.DeployLoggerStub; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/document/test/SDFieldTestCase.java b/config-model/src/test/java/com/yahoo/document/test/SDFieldTestCase.java index 36a4c7bdafc..4b0d4ee7a9a 100644 --- a/config-model/src/test/java/com/yahoo/document/test/SDFieldTestCase.java +++ b/config-model/src/test/java/com/yahoo/document/test/SDFieldTestCase.java @@ -2,8 +2,8 @@ package com.yahoo.document.test; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.SDDocumentType; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.SDDocumentType; import org.junit.Test; import static org.junit.Assert.fail; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AbstractSchemaTestCase.java b/config-model/src/test/java/com/yahoo/schema/AbstractSchemaTestCase.java index 8ece5cd0fe4..e816456249f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AbstractSchemaTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/AbstractSchemaTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.io.IOUtils; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AnnotationReferenceTestCase.java b/config-model/src/test/java/com/yahoo/schema/AnnotationReferenceTestCase.java index 25de24a4315..dbe827ed67f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AnnotationReferenceTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/AnnotationReferenceTestCase.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.document.DataType; import com.yahoo.document.StructDataType; import com.yahoo.document.Field; import com.yahoo.document.annotation.AnnotationReferenceDataType; -import com.yahoo.searchdefinition.document.SDDocumentType; +import com.yahoo.schema.document.SDDocumentType; import com.yahoo.config.model.deploy.TestProperties; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java b/config-model/src/test/java/com/yahoo/schema/ArraysTestCase.java index 2ed1ab6892a..aab79617556 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/ArraysTestCase.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.document.ArrayDataType; import com.yahoo.document.CollectionDataType; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysWeightedSetsTestCase.java b/config-model/src/test/java/com/yahoo/schema/ArraysWeightedSetsTestCase.java index 9c70fcf79f7..57331bea6bd 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ArraysWeightedSetsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/ArraysWeightedSetsTestCase.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.document.ArrayDataType; import com.yahoo.document.CollectionDataType; import com.yahoo.document.DataType; import com.yahoo.document.WeightedSetDataType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -18,7 +18,7 @@ import static org.junit.Assert.assertTrue; */ public class ArraysWeightedSetsTestCase extends AbstractSchemaTestCase { @Test - public void testArrayWeightedSetsImporting() throws java.io.IOException, com.yahoo.searchdefinition.parser.ParseException { + public void testArrayWeightedSetsImporting() throws java.io.IOException, com.yahoo.schema.parser.ParseException { Schema schema = ApplicationBuilder.buildFromFile("src/test/examples/arraysweightedsets.sd"); SDField tags = (SDField) schema.getDocument().getField("tags"); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java index 92d72677086..bbe63f95787 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.document.StructDataType; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.IndexingScript; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.IndexingScript; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; import com.yahoo.tensor.TensorType; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeUtils.java b/config-model/src/test/java/com/yahoo/schema/AttributeUtils.java index 5d91d7df3ca..fb7d68faf2d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeUtils.java +++ b/config-model/src/test/java/com/yahoo/schema/AttributeUtils.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; /** * Convenience class for tests that need to set attribute properties on fields. diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java b/config-model/src/test/java/com/yahoo/schema/CommentTestCase.java index 3e92c1df9e7..4df4ead171b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/CommentTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/CommentTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java b/config-model/src/test/java/com/yahoo/schema/DiversityTestCase.java index ca7313a5c3f..482bc877081 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DiversityTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/DiversityTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.search.query.ranking.Diversity; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import static org.junit.Assert.fail; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java b/config-model/src/test/java/com/yahoo/schema/DocumentGraphValidatorTest.java index 5bbb751585b..ef4d8e05540 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/schema/DocumentGraphValidatorTest.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporarySDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporarySDField; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java b/config-model/src/test/java/com/yahoo/schema/DocumentReferenceResolverTest.java index fe1b19be64b..1592060f466 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java +++ b/config-model/src/test/java/com/yahoo/schema/DocumentReferenceResolverTest.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/FeatureNamesTestCase.java b/config-model/src/test/java/com/yahoo/schema/FeatureNamesTestCase.java index 3494ab780b2..bff4b434408 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/FeatureNamesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/FeatureNamesTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import org.junit.Ignore; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java b/config-model/src/test/java/com/yahoo/schema/FieldOfTypeDocumentTestCase.java index fdd7fe95c45..4a590288d53 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/FieldOfTypeDocumentTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.document.DataType; import com.yahoo.document.DocumentType; @@ -7,7 +7,7 @@ import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentTypeManagerConfigurer; import com.yahoo.document.Field; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.derived.Deriver; +import com.yahoo.schema.derived.Deriver; import org.junit.Test; import java.io.IOException; import java.util.ArrayList; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java b/config-model/src/test/java/com/yahoo/schema/ImportedFieldsEnumeratorTest.java index f486126ba4f..92d11b3a18a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ImportedFieldsEnumeratorTest.java +++ b/config-model/src/test/java/com/yahoo/schema/ImportedFieldsEnumeratorTest.java @@ -1,12 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; -import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporaryImportedField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporaryImportedField; import org.junit.Test; import java.util.HashSet; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java b/config-model/src/test/java/com/yahoo/schema/IncorrectRankingExpressionFileRefTestCase.java index 23be59e38f5..87e168adb66 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/IncorrectRankingExpressionFileRefTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.DerivedConfiguration; +import com.yahoo.schema.parser.ParseException; import com.yahoo.yolean.Exceptions; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java b/config-model/src/test/java/com/yahoo/schema/IncorrectSummaryTypesTestCase.java index d81d07bf6e2..e58cce6472a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/IncorrectSummaryTypesTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IndexSettingsTestCase.java b/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java index 198f8b6c79e..6082372b428 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IndexSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/IndexSettingsTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IndexingParsingTestCase.java b/config-model/src/test/java/com/yahoo/schema/IndexingParsingTestCase.java index 8ba7dfdb14f..6a51000fffe 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/IndexingParsingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/IndexingParsingTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import static org.junit.Assert.assertNotNull; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java b/config-model/src/test/java/com/yahoo/schema/MultipleSummariesTestCase.java index 317b860d7d2..6d6249dc372 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/MultipleSummariesTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java b/config-model/src/test/java/com/yahoo/schema/NameFieldCheckTestCase.java index 1e766b7793d..9b4b6864309 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/NameFieldCheckTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java b/config-model/src/test/java/com/yahoo/schema/OutsideTestCase.java index 6563fb8d3f1..0c0684e23e3 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/OutsideTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java b/config-model/src/test/java/com/yahoo/schema/PredicateDataTypeTestCase.java index 2b49f3d67a6..dbea8fb8aeb 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/PredicateDataTypeTestCase.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.document.ImmutableSDField; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java b/config-model/src/test/java/com/yahoo/schema/RankProfileRegistryTest.java index cbbb53d8ec8..de061defb87 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java +++ b/config-model/src/test/java/com/yahoo/schema/RankProfileRegistryTest.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.model.test.MockApplicationPackage; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java b/config-model/src/test/java/com/yahoo/schema/RankProfileTestCase.java index 50f930dde86..c66d44556ca 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankProfileTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.collections.Pair; import com.yahoo.component.ComponentId; @@ -14,12 +14,12 @@ import com.yahoo.search.query.profile.types.FieldDescription; import com.yahoo.search.query.profile.types.FieldType; import com.yahoo.search.query.profile.types.QueryProfileType; import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.RawRankProfile; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.RawRankProfile; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import static com.yahoo.config.model.test.TestUtil.joinLines; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java b/config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java index 6de890549c1..c3595717220 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.RawRankProfile; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.RawRankProfile; +import com.yahoo.schema.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java b/config-model/src/test/java/com/yahoo/schema/RankingConstantTest.java index 3aab1a7bbe6..883e6b50abb 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java +++ b/config-model/src/test/java/com/yahoo/schema/RankingConstantTest.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java b/config-model/src/test/java/com/yahoo/schema/RankingExpressionConstantsTestCase.java index e2f06bd8bc6..bd0bd65295c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankingExpressionConstantsTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.collections.Pair; import com.yahoo.config.model.application.provider.MockFileRegistry; @@ -7,9 +7,9 @@ import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.search.query.profile.QueryProfileRegistry; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import com.yahoo.yolean.Exceptions; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.RawRankProfile; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.RawRankProfile; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.util.List; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java b/config-model/src/test/java/com/yahoo/schema/RankingExpressionInliningTestCase.java index fd35c19906d..0695e20d780 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankingExpressionInliningTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.collections.Pair; import com.yahoo.config.application.api.DeployLogger; @@ -7,9 +7,9 @@ import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.RawRankProfile; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.RawRankProfile; +import com.yahoo.schema.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionLoopDetectionTestCase.java b/config-model/src/test/java/com/yahoo/schema/RankingExpressionLoopDetectionTestCase.java index ff8a9df4076..dd69fb6c591 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionLoopDetectionTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankingExpressionLoopDetectionTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import com.yahoo.yolean.Exceptions; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java b/config-model/src/test/java/com/yahoo/schema/RankingExpressionShadowingTestCase.java index 8354eb59416..250879b1570 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankingExpressionShadowingTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.collections.Pair; import com.yahoo.config.model.application.provider.MockFileRegistry; @@ -8,9 +8,9 @@ import com.yahoo.search.query.profile.QueryProfile; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.search.query.profile.types.FieldDescription; import com.yahoo.search.query.profile.types.QueryProfileType; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.RawRankProfile; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.RawRankProfile; +import com.yahoo.schema.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java b/config-model/src/test/java/com/yahoo/schema/RankingExpressionValidationTestCase.java index ee3b4ab25e0..e42acee9bed 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankingExpressionValidationTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.DerivedConfiguration; +import com.yahoo.schema.parser.ParseException; import com.yahoo.yolean.Exceptions; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java b/config-model/src/test/java/com/yahoo/schema/ReservedWordsAsFieldNamesTestCase.java index a8aaee83938..df9d4a63650 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/ReservedWordsAsFieldNamesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/ReservedWordsAsFieldNamesTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SDDocumentTypeOrdererTestCase.java b/config-model/src/test/java/com/yahoo/schema/SDDocumentTypeOrdererTestCase.java index 652a06a6025..45780d39021 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SDDocumentTypeOrdererTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/SDDocumentTypeOrdererTestCase.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.document.DataType; import com.yahoo.document.DataTypeName; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporarySDDocumentType; -import com.yahoo.searchdefinition.document.TemporarySDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporarySDDocumentType; +import com.yahoo.schema.document.TemporarySDField; import org.junit.Test; import java.util.ArrayList; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaImporterTestCase.java b/config-model/src/test/java/com/yahoo/schema/SchemaImporterTestCase.java index 9c895b452d5..e93dd0e0a8f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaImporterTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/SchemaImporterTestCase.java @@ -1,16 +1,16 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.document.DataType; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.parser.ParseException; -import com.yahoo.searchdefinition.processing.MakeAliases; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; +import com.yahoo.schema.parser.ParseException; +import com.yahoo.schema.processing.MakeAliases; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaParsingTestCase.java b/config-model/src/test/java/com/yahoo/schema/SchemaParsingTestCase.java index 6d619b76c18..8fe691db802 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaParsingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/SchemaParsingTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import java.io.IOException; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java b/config-model/src/test/java/com/yahoo/schema/SchemaTestCase.java index cb57746d82f..67d8ce4ff78 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/SchemaTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.parser.ParseException; -import com.yahoo.searchdefinition.processing.ImportedFieldsResolver; -import com.yahoo.searchdefinition.processing.OnnxModelTypeResolver; +import com.yahoo.schema.document.Stemming; +import com.yahoo.schema.parser.ParseException; +import com.yahoo.schema.processing.ImportedFieldsResolver; +import com.yahoo.schema.processing.OnnxModelTypeResolver; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.model.test.utils.DeployLoggerStub; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java b/config-model/src/test/java/com/yahoo/schema/StemmingSettingTestCase.java index aec258f2df0..5dd75166783 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/StemmingSettingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/StemmingSettingTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java b/config-model/src/test/java/com/yahoo/schema/StructTestCase.java index 078eccc166f..b140892ed5e 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/StructTestCase.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; import com.yahoo.document.config.DocumenttypesConfig; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.derived.Deriver; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.Deriver; +import com.yahoo.schema.parser.ParseException; import org.junit.Ignore; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java index 086e3485962..0fab9b381fc 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.model.test.utils.DeployLoggerStub; import com.yahoo.vespa.objects.FieldBase; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/UrlFieldValidationTestCase.java b/config-model/src/test/java/com/yahoo/schema/UrlFieldValidationTestCase.java index f2d78796553..83bb0d4548c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/UrlFieldValidationTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/UrlFieldValidationTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition; +package com.yahoo.schema; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import com.yahoo.yolean.Exceptions; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/AbstractExportingTestCase.java index 615f6be5b4f..ad2c2d6078d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/AbstractExportingTestCase.java @@ -1,18 +1,16 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.concurrent.InThreadExecutorService; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.document.config.DocumenttypesConfig; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; -import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.configmodel.producers.DocumentManager; import com.yahoo.vespa.configmodel.producers.DocumentTypes; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/AnnotationsTestCase.java index bfbf539074c..60867261f93 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/AnnotationsTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ArraysTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ArraysTestCase.java index c2bd86ba5f7..5b138413a7a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ArraysTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/ArraysTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/AttributeListTestCase.java index a272ab14dad..1c51d3ec365 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/AttributeListTestCase.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributesTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/AttributesTestCase.java index 2b345bdb158..3d08805acdf 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/AttributesTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/CasingTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/CasingTestCase.java index ee9a9eac02c..80ebcb825f4 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/CasingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/CasingTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/CombinedAttributeAndIndexSchemaTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/CombinedAttributeAndIndexSchemaTestCase.java index bb339688fcb..542320d9670 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/CombinedAttributeAndIndexSchemaTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/CombinedAttributeAndIndexSchemaTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/DeriverTestCase.java index b1fb1962fc8..422f4522b26 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/DeriverTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.document.DataType; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; +import com.yahoo.schema.AbstractSchemaTestCase; import org.junit.Test; import java.util.List; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/DuplicateStructTestCase.java index ff68e47a1e9..7915a1d7763 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/DuplicateStructTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/EmptyRankProfileTestCase.java index a3123550efa..c3195d1a626 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/EmptyRankProfileTestCase.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import org.junit.Test; /** diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ExactMatchTestCase.java index 45e65bb90f9..13a0a8201fb 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExactMatchTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/ExactMatchTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java index ac97863b7a7..16a9a459dcb 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExpressionsAsArgsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ExpressionsAsArgsTestCase.java index 733786e2c71..d2020305bc1 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExpressionsAsArgsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/ExpressionsAsArgsTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/FieldsetTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/FieldsetTestCase.java index 3877b351ac8..fdab49c9fff 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/FieldsetTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/FieldsetTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/GeminiTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/GeminiTestCase.java index 207792ffe06..5531fb65942 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/GeminiTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/GeminiTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.collections.Pair; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/IdTestCase.java index ba485b7b96b..1e57d52e3b0 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IdTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/IdTestCase.java @@ -1,14 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.processing.Processing; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.processing.Processing; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ImportedFieldsTestCase.java index 5eeae347c88..5578a1a602b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ImportedFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/ImportedFieldsTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IndexSchemaTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/IndexSchemaTestCase.java index 17f85840af8..1f40c6bcb50 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IndexSchemaTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/IndexSchemaTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.document.DataType; import com.yahoo.document.Field; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/InheritanceTestCase.java index 9f691be2956..1c433237fd8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/InheritanceTestCase.java @@ -1,16 +1,16 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.configmodel.producers.DocumentManager; import org.junit.Rule; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IntegerAttributeToStringIndexTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/IntegerAttributeToStringIndexTestCase.java index 0980f766579..b5f222673ab 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/IntegerAttributeToStringIndexTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/IntegerAttributeToStringIndexTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/LiteralBoostTestCase.java index 70545c15ca0..c5090c88a1b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LiteralBoostTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/LiteralBoostTestCase.java @@ -1,24 +1,24 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.processing.Processing; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.processing.Processing; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; import java.util.Arrays; import java.util.Set; -import static com.yahoo.searchdefinition.processing.AssertIndexingScript.assertIndexing; +import static com.yahoo.schema.processing.AssertIndexingScript.assertIndexing; import static org.junit.Assert.assertTrue; /** diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LowercaseTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/LowercaseTestCase.java index 5427c6a19e7..f234a9cc324 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/LowercaseTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/LowercaseTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MailTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/MailTestCase.java index 53bf55fc73f..c48c44554ed 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MailTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/MailTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MatchSettingsResolvingTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/MatchSettingsResolvingTestCase.java index 259a7ab8804..a7df862134a 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MatchSettingsResolvingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/MatchSettingsResolvingTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/MultiStructTestCase.java index 4afbb4c5436..66b3698b38c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/MultiStructTestCase.java @@ -1,10 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.application.provider.MockFileRegistry; -import com.yahoo.searchdefinition.derived.TestableDeployLogger; -import com.yahoo.searchdefinition.ApplicationBuilder; +import com.yahoo.schema.ApplicationBuilder; import org.junit.Test; /** diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/MultipleSummariesTestCase.java index 245049fd4bc..d434673e43a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/MultipleSummariesTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/NameCollisionTestCase.java index c8df63e1028..689ff9814cc 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/NameCollisionTestCase.java @@ -1,10 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.document.DocumentTypeManager; -import com.yahoo.searchdefinition.ApplicationBuilder; import org.junit.Test; import static org.junit.Assert.assertThrows; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/NativeRankTypeDefinitionsTestCase.java index 8c6bc40ece0..f628420556a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/NativeRankTypeDefinitionsTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.RankType; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.RankType; import org.junit.Test; import java.util.Iterator; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NearestNeighborTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/NearestNeighborTestCase.java index 16ec896ca66..baee7bec2a2 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NearestNeighborTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/NearestNeighborTestCase.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.component.ComponentId; import com.yahoo.search.Query; import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry; import com.yahoo.search.query.profile.config.QueryProfileConfigurer; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NeuralNetTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/NeuralNetTestCase.java index c7b0d131eb6..6e584099331 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NeuralNetTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/NeuralNetTestCase.java @@ -1,12 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.search.Query; -import com.yahoo.search.query.profile.QueryProfile; import com.yahoo.search.query.profile.compiled.CompiledQueryProfile; import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry; import com.yahoo.search.query.profile.config.QueryProfileConfigurer; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NuwaTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/NuwaTestCase.java index 75b8d3bf584..210c8a9bdd4 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NuwaTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/NuwaTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Ignore; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/OrderIlscriptsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/OrderIlscriptsTestCase.java index 1bb8083e7b2..8af0d0a21d3 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/OrderIlscriptsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/OrderIlscriptsTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/PrefixExactAttributeTestCase.java index 0b571d11917..fdcb71432e4 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/PrefixExactAttributeTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/PrefixExactAttributeTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/RankProfilesTestCase.java index 3a900e0840a..a83db0caf5a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankProfilesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/RankProfilesTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankPropertiesTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/RankPropertiesTestCase.java index 0f29d2dda40..8db880e56fe 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/RankPropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/RankPropertiesTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFieldsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ReferenceFieldsTestCase.java index 086a69a8b20..99d0cf8bf6d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/ReferenceFieldsTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ReferenceFromSeveralTestCase.java index dbbe1497ffe..ff4506a7f57 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/ReferenceFromSeveralTestCase.java @@ -1,10 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.application.provider.MockFileRegistry; -import com.yahoo.searchdefinition.derived.TestableDeployLogger; -import com.yahoo.searchdefinition.ApplicationBuilder; +import com.yahoo.schema.ApplicationBuilder; import org.junit.Test; /** diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SchemaInheritanceTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SchemaInheritanceTestCase.java index a458036a03f..1b5d55158b5 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SchemaInheritanceTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SchemaInheritanceTestCase.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.io.IOUtils; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.File; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SchemaOrdererTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SchemaOrdererTestCase.java index 11e21c7915d..e672763f13c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SchemaOrdererTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SchemaOrdererTestCase.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.DocumentReference; -import com.yahoo.searchdefinition.DocumentReferences; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporarySDField; +import com.yahoo.schema.DocumentReference; +import com.yahoo.schema.DocumentReferences; +import com.yahoo.schema.Schema; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporarySDField; import org.junit.Test; import java.util.Arrays; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SimpleInheritTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SimpleInheritTestCase.java index d89e5f2c957..d8b39bfd978 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SimpleInheritTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SimpleInheritTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.File; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SliceTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SliceTestCase.java index e6c7efd7052..2aad47dae6c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SliceTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SliceTestCase.java @@ -1,12 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.component.ComponentId; -import com.yahoo.search.Query; -import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry; -import com.yahoo.search.query.profile.config.QueryProfileConfigurer; -import com.yahoo.searchdefinition.parser.ParseException; -import com.yahoo.vespa.model.container.search.QueryProfiles; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SortingTestCase.java index 2516b1b0d9a..0c091a7a367 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SortingTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/StreamingStructTestCase.java index f9bd3033e14..6f27930e239 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/StreamingStructTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StructAnyOrderTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/StructAnyOrderTestCase.java index 3338f6cf87d..865b5da87cf 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StructAnyOrderTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/StructAnyOrderTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StructInheritanceTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/StructInheritanceTestCase.java index 1f6c70c9383..092e64420e8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StructInheritanceTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/StructInheritanceTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.ApplicationBuilder; +import com.yahoo.schema.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SummaryMapTestCase.java index 6abe0e763cb..f0fc58b97e5 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SummaryMapTestCase.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.test.MockApplicationPackage; -import com.yahoo.searchdefinition.*; +import com.yahoo.schema.*; import com.yahoo.vespa.config.search.SummarymapConfig; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; -import com.yahoo.searchdefinition.processing.Processing; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; +import com.yahoo.schema.processing.Processing; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java index fd5caeb6b6d..341d3ef7d43 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.application.provider.BaseDeployLogger; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.config.search.SummaryConfig; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TestableDeployLogger.java b/config-model/src/test/java/com/yahoo/schema/derived/TestableDeployLogger.java index 52d57bd0468..bcde0f6b544 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TestableDeployLogger.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/TestableDeployLogger.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.application.api.DeployLogger; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TokenizationTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/TokenizationTestCase.java index 4b9d5386314..ac6acf172e9 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TokenizationTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/TokenizationTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TwoStreamingStructsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/TwoStreamingStructsTestCase.java index 4e629fcb4d8..72411fa1770 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TwoStreamingStructsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/TwoStreamingStructsTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/TypeConversionTestCase.java index 62a79e49146..84a561924ca 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypeConversionTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/TypeConversionTestCase.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.processing.Processing; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.processing.Processing; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/TypesTestCase.java index cee6d4f95c8..7443ef01c95 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/TypesTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/VsmFieldsTestCase.java index 9855ca30ebc..c59f82a2c12 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/VsmFieldsTestCase.java @@ -1,15 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.Application; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporarySDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporarySDField; import com.yahoo.vespa.config.search.vsm.VsmfieldsConfig; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtilsTestCase.java b/config-model/src/test/java/com/yahoo/schema/document/ComplexAttributeFieldUtilsTestCase.java index 99692e70041..ea3f207df91 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtilsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/document/ComplexAttributeFieldUtilsTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.document; +package com.yahoo.schema.document; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import static com.yahoo.config.model.test.TestUtil.joinLines; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/document/HnswIndexParamsTestCase.java b/config-model/src/test/java/com/yahoo/schema/document/HnswIndexParamsTestCase.java index d6ff8fa1067..8ef51369ecb 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/document/HnswIndexParamsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/document/HnswIndexParamsTestCase.java @@ -1,6 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.document; +package com.yahoo.schema.document; import java.util.Optional; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/parser/ConvertIntermediateTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/ConvertIntermediateTestCase.java index 127f5184c4c..516c259013f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/parser/ConvertIntermediateTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/parser/ConvertIntermediateTestCase.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; -import com.yahoo.document.DataType; -import com.yahoo.document.DocumentType; import com.yahoo.document.DocumentTypeManager; import static com.yahoo.config.model.test.TestUtil.joinLines; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateCollectionTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/IntermediateCollectionTestCase.java index 743795e51ce..c4ee1d27c8c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateCollectionTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/parser/IntermediateCollectionTestCase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; -import com.yahoo.io.IOUtils; import com.yahoo.io.reader.NamedReader; import static com.yahoo.config.model.test.TestUtil.joinLines; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/parser/ParsedDocumentTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/ParsedDocumentTestCase.java index 9ae7b3aa4b8..9245b64b09e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/parser/ParsedDocumentTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/parser/ParsedDocumentTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/parser/SchemaParserTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java index 2284acc705c..d4e4f1dbb88 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/parser/SchemaParserTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.deploy.TestProperties; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java b/config-model/src/test/java/com/yahoo/schema/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java index 0adaba4cf68..0d64dd5c953 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/AddAttributeTransformToSummaryOfImportedFieldsTest.java @@ -1,20 +1,19 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Application; -import com.yahoo.searchdefinition.DocumentReference; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.TestableDeployLogger; -import com.yahoo.searchdefinition.document.ImportedField; -import com.yahoo.searchdefinition.document.ImportedFields; -import com.yahoo.searchdefinition.document.ImportedSimpleField; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.DocumentReference; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.TestableDeployLogger; +import com.yahoo.schema.document.ImportedField; +import com.yahoo.schema.document.ImportedFields; +import com.yahoo.schema.document.ImportedSimpleField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/AdjustPositionSummaryFieldsTestCase.java index 926e26451d7..103d08b39a8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/AdjustPositionSummaryFieldsTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.document.DataType; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Schema; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertIndexingScript.java b/config-model/src/test/java/com/yahoo/schema/processing/AssertIndexingScript.java index 8a0c1e2fe71..82650598f29 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertIndexingScript.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/AssertIndexingScript.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.IndexingScript; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.IndexingScript; import com.yahoo.vespa.indexinglanguage.expressions.Expression; import com.yahoo.vespa.indexinglanguage.parser.ParseException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertSearchBuilder.java b/config-model/src/test/java/com/yahoo/schema/processing/AssertSearchBuilder.java index 534c82157e4..0b4d7c3a2b6 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AssertSearchBuilder.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/AssertSearchBuilder.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/AttributesExactMatchTestCase.java index e30ac8f8e00..40ebe458c74 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AttributesExactMatchTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/AttributesExactMatchTestCase.java @@ -1,12 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/BoldingTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/BoldingTestCase.java index efec9206ed9..c37bc8085c7 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/BoldingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/BoldingTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/BoolAttributeValidatorTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/BoolAttributeValidatorTestCase.java index db27bbbb84d..287cc6559d1 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/BoolAttributeValidatorTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/BoolAttributeValidatorTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; -import static com.yahoo.searchdefinition.ApplicationBuilder.createFromString; +import static com.yahoo.schema.ApplicationBuilder.createFromString; import static com.yahoo.config.model.test.TestUtil.joinLines; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java index c0124ca0386..1956b87a689 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.test.TestUtil; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.Dictionary; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.Dictionary; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.config.search.AttributesConfig; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java index b03aff455c5..64b0a437b1d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/DisallowComplexMapAndWsetKeyTypesTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; /** diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java b/config-model/src/test/java/com/yahoo/schema/processing/FastAccessValidatorTest.java index 0c25cef49a1..b249b407c7b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/FastAccessValidatorTest.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.test.TestUtil; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ImplicitSchemaFieldsTestCase.java index 833a6effe4a..594124c9500 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSchemaFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ImplicitSchemaFieldsTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; - -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.parser.ParseException; +package com.yahoo.schema.processing; + +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.derived.DerivedConfiguration; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ImplicitStructTypesTestCase.java index 443eff07f41..111ed266d74 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitStructTypesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ImplicitStructTypesTestCase.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.document.*; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummariesTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ImplicitSummariesTestCase.java index cc2bc7d7bf6..50deb5d5b42 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ImplicitSummariesTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.documentmodel.SummaryTransform; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFieldsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ImplicitSummaryFieldsTestCase.java index 175b8d6fe1e..f32c9079d36 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ImplicitSummaryFieldsTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.documentmodel.DocumentSummary; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ImportedFieldsResolverTestCase.java index d1d3f4489ce..5baa64d06d4 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ImportedFieldsResolverTestCase.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.document.DataType; import com.yahoo.document.TensorDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableImportedSDField; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.ImportedField; -import com.yahoo.searchdefinition.document.ImportedFields; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporarySDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableImportedSDField; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.ImportedField; +import com.yahoo.schema.document.ImportedFields; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporarySDField; import com.yahoo.tensor.TensorType; import org.junit.Rule; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ImportedFieldsTestCase.java index b15b81b717d..ab702154527 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ImportedFieldsTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; - -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.document.ImportedComplexField; -import com.yahoo.searchdefinition.document.ImportedField; -import com.yahoo.searchdefinition.parser.ParseException; +package com.yahoo.schema.processing; + +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.document.ImportedComplexField; +import com.yahoo.schema.document.ImportedField; +import com.yahoo.schema.parser.ParseException; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingInputsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingInputsTestCase.java index 725b1b17ff0..71c79feedc1 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingInputsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingInputsTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; -import static com.yahoo.searchdefinition.processing.AssertSearchBuilder.assertBuildFails; +import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuildFails; /** * @author Simon Thoresen Hult diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingOutputsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java index 5ea4b37991a..687549f920e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingOutputsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; -import static com.yahoo.searchdefinition.processing.AssertSearchBuilder.assertBuildFails; +import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuildFails; /** diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java index 9e4ba1c6728..76cb6a5505c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingScriptRewriterTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java @@ -1,17 +1,17 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.BooleanIndexDefinition; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Index; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.BooleanIndexDefinition; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression; @@ -24,7 +24,7 @@ import java.util.OptionalInt; import java.util.OptionalLong; import java.util.Set; -import static com.yahoo.searchdefinition.processing.AssertIndexingScript.assertIndexing; +import static com.yahoo.schema.processing.AssertIndexingScript.assertIndexing; import static org.junit.Assert.assertEquals; /** diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingValidationTestCase.java index 74a8cdfdb6a..4da6880aa26 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingValidationTestCase.java @@ -1,16 +1,16 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.derived.AbstractExportingTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.derived.AbstractExportingTestCase; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; import java.util.Arrays; -import static com.yahoo.searchdefinition.processing.AssertIndexingScript.assertIndexing; -import static com.yahoo.searchdefinition.processing.AssertSearchBuilder.assertBuildFails; +import static com.yahoo.schema.processing.AssertIndexingScript.assertIndexing; +import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuildFails; /** * @author Simon Thoresen Hult diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValuesTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingValuesTestCase.java index 25d966b1324..2784fe69b28 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValuesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingValuesTestCase.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; -import static com.yahoo.searchdefinition.processing.AssertSearchBuilder.assertBuildFails; -import static com.yahoo.searchdefinition.processing.AssertSearchBuilder.assertBuilds; +import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuildFails; +import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuilds; /** * @author Simon Thoresen Hult diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IntegerIndex2AttributeTestCase.java index 2465839b72b..f36effab146 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IntegerIndex2AttributeTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/IntegerIndex2AttributeTestCase.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.application.provider.BaseDeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidatorTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/MatchPhaseSettingsValidatorTestCase.java index 05d816ed716..530b6a95ce8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidatorTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/MatchPhaseSettingsValidatorTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import org.junit.Test; -import static com.yahoo.searchdefinition.processing.AssertSearchBuilder.assertBuildFails; +import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuildFails; public class MatchPhaseSettingsValidatorTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/MatchedElementsOnlyResolverTestCase.java index b48927d58a3..c401376ac3a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/MatchedElementsOnlyResolverTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import org.junit.Rule; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/NGramTestCase.java index ab78297bcf9..912e6fcf030 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/NGramTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/NGramTestCase.java @@ -1,14 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PagedAttributeValidatorTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/PagedAttributeValidatorTestCase.java index 4eeab15fdd2..a291dda24b9 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PagedAttributeValidatorTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/PagedAttributeValidatorTestCase.java @@ -1,15 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.application.provider.BaseDeployLogger; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.util.Optional; import static com.yahoo.config.model.test.TestUtil.joinLines; -import static com.yahoo.searchdefinition.ApplicationBuilder.createFromString; -import static com.yahoo.searchdefinition.ApplicationBuilder.createFromStrings; +import static com.yahoo.schema.ApplicationBuilder.createFromString; +import static com.yahoo.schema.ApplicationBuilder.createFromStrings; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java b/config-model/src/test/java/com/yahoo/schema/processing/ParentChildSearchModel.java index 6ddacd066b1..e5636da57a0 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ParentChildSearchModel.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ParentChildSearchModel.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.google.common.collect.ImmutableMap; import com.yahoo.config.model.application.provider.MockFileRegistry; @@ -7,15 +7,14 @@ import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.Application; -import com.yahoo.searchdefinition.DocumentReference; -import com.yahoo.searchdefinition.DocumentReferences; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.TestableDeployLogger; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporaryImportedField; -import com.yahoo.searchdefinition.document.TemporarySDField; +import com.yahoo.schema.DocumentReference; +import com.yahoo.schema.DocumentReferences; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.TestableDeployLogger; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporaryImportedField; +import com.yahoo.schema.document.TemporarySDField; /* * Fixture class used for ImportedFieldsResolverTestCase and AdjustPositionSummaryFieldsTestCase. diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/PositionTestCase.java index a3af7706fb9..6f0facf9541 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/PositionTestCase.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.document.DataType; import com.yahoo.document.DocumentType; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.FieldSet; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.FieldSet; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankModifierTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankModifierTestCase.java index 3a0ceebcb0a..69bf62be84b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankModifierTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankModifierTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java b/config-model/src/test/java/com/yahoo/schema/processing/RankProfileSearchFixture.java index 2d0bdb58122..e380b1ab9af 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankProfileSearchFixture.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankProfileSearchFixture.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.google.common.collect.ImmutableList; import com.yahoo.config.application.api.ApplicationPackage; @@ -10,11 +10,11 @@ import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.path.Path; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import ai.vespa.rankingexpression.importer.onnx.OnnxImporter; import ai.vespa.rankingexpression.importer.tensorflow.TensorFlowImporter; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankPropertyVariablesTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankPropertyVariablesTestCase.java index 0ab7406b5b1..dab1d9e6e95 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankPropertyVariablesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankPropertyVariablesTestCase.java @@ -1,14 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.RankProfile.RankProperty; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfile.RankProperty; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java index 9b32d97ef75..4b6a22fc81a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolverTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionTypeResolverTestCase.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.search.query.profile.types.FieldDescription; import com.yahoo.search.query.profile.types.QueryProfileType; import com.yahoo.search.query.profile.types.TensorFieldType; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.ApplicationBuilder; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.ApplicationBuilder; import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode; import com.yahoo.tensor.TensorType; import com.yahoo.yolean.Exceptions; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithLightGBMTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithLightGBMTestCase.java index adaf1ef78f9..4df0a09ec2e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithLightGBMTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithLightGBMTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.After; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxModelTestCase.java index 6820a8d9678..713e11fd608 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxModelTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.application.provider.FilesApplicationPackage; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxTestCase.java index bd6310ffd48..94a51d25717 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithOnnxTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.config.application.api.ApplicationPackage; @@ -8,8 +8,8 @@ import com.yahoo.io.IOUtils; import com.yahoo.io.reader.NamedReader; import com.yahoo.path.Path; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.FeatureNames; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.FeatureNames; +import com.yahoo.schema.parser.ParseException; import com.yahoo.tensor.TensorType; import com.yahoo.yolean.Exceptions; import org.junit.After; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithTensorTestCase.java index 5bf2115c3f7..1f065bc7a20 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithTensorTestCase.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithTransformerTokensTestCase.java index ffc073ed434..f8086fb3bc6 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTransformerTokensTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithTransformerTokensTestCase.java @@ -1,18 +1,18 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.expressiontransforms.RankProfileTransformContext; -import com.yahoo.searchdefinition.expressiontransforms.TokenTransformer; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.expressiontransforms.RankProfileTransformContext; +import com.yahoo.schema.expressiontransforms.TokenTransformer; +import com.yahoo.schema.parser.ParseException; import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.searchlib.rankingexpression.evaluation.MapContext; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithXGBoostTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithXGBoostTestCase.java index 0c163954038..e1b1473a59a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithXGBoostTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionWithXGBoostTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.parser.ParseException; import org.junit.After; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionsTestCase.java index b42f932ef98..ace3788e49a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/RankingExpressionsTestCase.java @@ -1,22 +1,22 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.collections.Pair; import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.LargeRankExpressions; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.RawRankProfile; -import com.yahoo.searchdefinition.derived.TestableDeployLogger; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.LargeRankExpressions; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.derived.DerivedConfiguration; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.RawRankProfile; +import com.yahoo.schema.derived.TestableDeployLogger; +import com.yahoo.schema.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ReferenceFieldTestCase.java index 780e87b01f0..57b4d928a52 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ReferenceFieldTestCase.java @@ -1,14 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.document.DataType; import com.yahoo.document.Field; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.parser.ParseException; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedDocumentNamesTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ReservedDocumentNamesTestCase.java index 6d722138871..974d8c261ca 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedDocumentNamesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ReservedDocumentNamesTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.derived.AbstractExportingTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.derived.AbstractExportingTestCase; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/ReservedRankingExpressionFunctionNamesTestCase.java index d3d79fd7798..e405a105f3c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ReservedRankingExpressionFunctionNamesTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.util.logging.Level; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SchemaMustHaveDocumentTest.java b/config-model/src/test/java/com/yahoo/schema/processing/SchemaMustHaveDocumentTest.java index 4cfe4c09052..03f9d7c5960 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SchemaMustHaveDocumentTest.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/SchemaMustHaveDocumentTest.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryConsistencyTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/SummaryConsistencyTestCase.java index f224dc0688e..76132a4d09f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryConsistencyTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/SummaryConsistencyTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.documentmodel.SummaryTransform; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSourceTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSourceTestCase.java index 1eb5e66df93..d94815015d7 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSourceTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSourceTestCase.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.application.provider.BaseDeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.model.container.search.QueryProfiles; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorFieldTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/TensorFieldTestCase.java index b9e6bfe7dc9..67c77508e3b 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorFieldTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/TensorFieldTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; -import static com.yahoo.searchdefinition.ApplicationBuilder.createFromString; +import static com.yahoo.schema.ApplicationBuilder.createFromString; import static com.yahoo.config.model.test.TestUtil.joinLines; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/TensorTransformTestCase.java index 26b108e2b45..aaf5f381c62 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/TensorTransformTestCase.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.collections.Pair; import com.yahoo.component.ComponentId; @@ -10,15 +10,15 @@ import com.yahoo.search.query.profile.types.FieldDescription; import com.yahoo.search.query.profile.types.FieldType; import com.yahoo.search.query.profile.types.QueryProfileType; import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry; -import com.yahoo.searchdefinition.LargeRankExpressions; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.RawRankProfile; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.LargeRankExpressions; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.RawRankProfile; +import com.yahoo.schema.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java b/config-model/src/test/java/com/yahoo/schema/processing/ValidateFieldTypesTest.java index 8c801d9deaf..87bb2e96042 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/ValidateFieldTypesTest.java @@ -1,20 +1,19 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Application; -import com.yahoo.searchdefinition.DocumentReference; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.TestableDeployLogger; -import com.yahoo.searchdefinition.document.ImportedField; -import com.yahoo.searchdefinition.document.ImportedFields; -import com.yahoo.searchdefinition.document.ImportedSimpleField; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.DocumentReference; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.TestableDeployLogger; +import com.yahoo.schema.document.ImportedField; +import com.yahoo.schema.document.ImportedFields; +import com.yahoo.schema.document.ImportedSimpleField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import org.junit.Rule; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/VespaMlModelTestCase.java index 4446f01aa95..016e30e80af 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/VespaMlModelTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; -import com.yahoo.searchdefinition.derived.RawRankProfile; +import com.yahoo.schema.derived.RawRankProfile; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.ml.ImportedModelTester; import org.junit.After; diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/WeightedSetSummaryToTestCase.java index e56d6ccf343..2f62228cc3f 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/processing/WeightedSetSummaryToTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/vespa/documentmodel/AbstractReferenceFieldTestCase.java b/config-model/src/test/java/com/yahoo/vespa/documentmodel/AbstractReferenceFieldTestCase.java index c0d74cd02d3..768bf408250 100644 --- a/config-model/src/test/java/com/yahoo/vespa/documentmodel/AbstractReferenceFieldTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/documentmodel/AbstractReferenceFieldTestCase.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.documentmodel; import com.yahoo.document.config.DocumenttypesConfig; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; +import com.yahoo.schema.AbstractSchemaTestCase; import com.yahoo.vespa.configmodel.producers.DocumentManager; import com.yahoo.vespa.configmodel.producers.DocumentTypes; diff --git a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderImportedFieldsTestCase.java index 33d84cf4313..faf4b67430c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderImportedFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderImportedFieldsTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.documentmodel; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java index ebb4156f3c0..3c2193ca4df 100644 --- a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java @@ -3,8 +3,8 @@ package com.yahoo.vespa.documentmodel; import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.documentmodel.NewDocumentType; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import org.junit.Test; import java.io.IOException; diff --git a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java index dc88590a198..d345c776db3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java @@ -3,9 +3,9 @@ package com.yahoo.vespa.documentmodel; import com.yahoo.document.config.DocumenttypesConfig; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.AbstractSchemaTestCase; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.AbstractSchemaTestCase; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.configmodel.producers.DocumentManager; import com.yahoo.vespa.configmodel.producers.DocumentTypes; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java index 86385b2f80d..859194fae79 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java @@ -8,7 +8,7 @@ import com.yahoo.document.Field; import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.document.StructDataType; import com.yahoo.documentmodel.NewDocumentType; -import com.yahoo.searchdefinition.FieldSets; +import com.yahoo.schema.FieldSets; import com.yahoo.vespa.model.application.validation.change.VespaConfigChangeAction; import com.yahoo.vespa.model.application.validation.change.VespaRefeedAction; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java index 977c10d0828..0d51e4b6e74 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.model.container.search.searchchain; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; +import com.yahoo.schema.derived.DerivedConfiguration; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.config.model.producer.AbstractConfigProducerRoot; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java index ab0b2f0d92c..e73eb905566 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java @@ -8,14 +8,13 @@ import com.yahoo.search.query.profile.QueryProfile; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.search.query.profile.QueryProfileVariant; import com.yahoo.search.query.profile.compiled.CompiledQueryProfile; -import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry; import com.yahoo.search.query.profile.config.QueryProfileConfigurer; import com.yahoo.search.query.profile.config.QueryProfileXMLReader; import com.yahoo.search.query.profile.types.FieldDescription; import com.yahoo.search.query.profile.types.FieldType; import com.yahoo.search.query.profile.types.QueryProfileType; import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry; -import com.yahoo.searchdefinition.derived.TestableDeployLogger; +import com.yahoo.schema.derived.TestableDeployLogger; import com.yahoo.vespa.model.container.search.QueryProfiles; import com.yahoo.vespa.model.test.utils.DeployLoggerStub; import org.junit.Test; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java index 52923779602..1d15f973d21 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SchemaClusterTest.java @@ -6,11 +6,11 @@ import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.container.QrSearchersConfig; import com.yahoo.document.DataType; import com.yahoo.search.config.ClusterConfig; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.config.search.DispatchConfig; import com.yahoo.vespa.indexinglanguage.expressions.AttributeExpression; import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression; |