diff options
Diffstat (limited to 'config-model/src/main/java/com')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java | 9 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java | 9 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/Application.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/Application.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/ApplicationBuilder.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DefaultRankProfile.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java) | 7 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DistributableResource.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DocumentGraphValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DocumentGraphValidator.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DocumentModelBuilder.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java) | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DocumentOnlySchema.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DocumentOnlySchema.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DocumentReference.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DocumentReference.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DocumentReferenceResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DocumentReferences.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferences.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/DocumentsOnlyRankProfile.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/DocumentsOnlyRankProfile.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/FeatureNames.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/FeatureNames.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/FieldOperationApplier.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplier.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/FieldOperationApplierForSearch.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForSearch.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/FieldOperationApplierForStructs.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForStructs.java) | 11 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/FieldSets.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/FieldSets.java) | 5 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/ImmutableSchema.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSchema.java) | 9 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/ImportedFieldsEnumerator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/ImportedFieldsEnumerator.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/Index.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/Index.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/LargeRankExpressions.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/MapEvaluationTypeContext.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/OnnxModel.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/OnnxModel.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/RankExpressionBody.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/RankExpressionBody.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/RankProfile.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java) | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/RankProfileRegistry.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/RankProfileRegistry.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/SDDocumentTypeOrderer.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/Schema.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/Schema.java) | 24 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/TemporarySDTypeResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/TemporarySDTypeResolver.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/UnrankedRankProfile.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/UnrankedRankProfile.java) | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java) | 26 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/Derived.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/Deriver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/Exportable.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/FieldRankSettings.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldRankSettings.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/FieldResultTransform.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/FileDistributedConstants.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/FileDistributedConstants.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/FileDistributedOnnxModels.java) | 7 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/ImportedFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/ImportedFields.java) | 25 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/Index.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/Index.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java) | 28 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/IndexSchema.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java) | 18 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java) | 9 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/Juniperrc.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/Juniperrc.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/NativeRankTypeDefinition.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinition.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/NativeRankTypeDefinitionSet.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionSet.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/NativeTable.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeTable.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java) | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/SchemaInfo.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/SchemaInfo.java) | 13 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/SearchOrderer.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/Summaries.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/SummaryClass.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/SummaryClassField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/SummaryMap.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java) | 7 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/VsmFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmFields.java) | 18 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/VsmSummary.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/package-info.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/package-info.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/validation/IndexStructureValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/validation/Validation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validation.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/validation/Validator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/Attribute.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/BooleanIndexDefinition.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/BooleanIndexDefinition.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/Case.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/Case.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/ComplexAttributeFieldUtils.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtils.java) | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/Dictionary.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/Dictionary.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/FieldSet.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/GeoPos.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/GeoPos.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/HnswIndexParams.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/HnswIndexParams.java) | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedComplexSDField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedComplexSDField.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedSDField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedSDField.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/ImmutableSDField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableSDField.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/ImportedComplexField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedComplexField.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/ImportedField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedField.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/ImportedFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedFields.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/ImportedSimpleField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedSimpleField.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/MatchAlgorithm.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/MatchAlgorithm.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/MatchType.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/MatchType.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/Matching.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/Matching.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/NormalizeLevel.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/NormalizeLevel.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/RankType.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/Ranking.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/SDDocumentType.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/SDField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/Sorting.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/Stemming.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/TemporaryImportedField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedField.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/TemporaryImportedFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedFields.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/TemporarySDDocumentType.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/TemporarySDField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/TypedKey.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/TypedKey.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/annotation/SDAnnotationType.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/SDAnnotationType.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/document/annotation/TemporaryAnnotationReferenceDataType.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/TemporaryAnnotationReferenceDataType.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/ConstantTensorTransformer.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/ExpressionTransforms.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ExpressionTransforms.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/FunctionInliner.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/FunctionInliner.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/FunctionShadower.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/FunctionShadower.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/LightGBMFeatureConverter.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/LightGBMFeatureConverter.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxFeatureConverter.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxFeatureConverter.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxModelTransformer.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java) | 7 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/RankProfileTransformContext.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/TensorFlowFeatureConverter.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TokenTransformer.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/XgboostFeatureConverter.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/XgboostFeatureConverter.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/AliasOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AliasOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/AttributeOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AttributeOperation.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/BoldingOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BoldingOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/DictionaryOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/DictionaryOperation.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/FieldOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/FieldOperationContainer.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperationContainer.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/IdOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IdOperation.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/IndexOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java) | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/IndexingOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/MatchOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/MatchOperation.java) | 11 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/NormalizingOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/NormalizingOperation.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/QueryCommandOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/QueryCommandOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/RankOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/RankTypeOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankTypeOperation.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/SortingOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SortingOperation.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/StemmingOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StemmingOperation.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/StructFieldOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StructFieldOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldLongOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldLongOperation.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldOperation.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldShortOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldShortOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryToOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryToOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/WeightOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/WeightOperation.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/fieldoperation/WeightedSetOperation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/WeightedSetOperation.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedFields.java) | 28 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedRanking.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedRanking.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java) | 20 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ConvertSchemaCollection.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertSchemaCollection.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/DictionaryOption.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/DictionaryOption.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/InheritanceResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/InheritanceResolver.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/IntermediateCollection.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedAnnotation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAnnotation.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedAttribute.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAttribute.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedBlock.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedBlock.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedDocument.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedDocumentSummary.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedFieldSet.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedFieldSet.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedIndex.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedIndex.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedIndexingOp.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedIndexingOp.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedMatchSettings.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedMatchSettings.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedRankFunction.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankFunction.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedRankProfile.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankProfile.java) | 13 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedSchema.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedSorting.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSorting.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedSummaryField.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSummaryField.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedType.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedType.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/SimpleCharStream.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/SimpleCharStream.java) | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/Utils.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/parser/Utils.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/AddAttributeTransformToSummaryOfImportedFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/AddExtraFieldsToDocument.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java) | 18 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/AttributeProperties.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributeProperties.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributesImplicitWord.java) | 11 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/Bolding.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/Bolding.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/BoolAttributeValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/BoolAttributeValidator.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/BuiltInFieldSets.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/BuiltInFieldSets.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java) | 14 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/DictionaryProcessor.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/DictionaryProcessor.java) | 14 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/DisallowComplexMapAndWsetKeyTypes.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypes.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/DiversitySettingsValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ExactMatch.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java) | 13 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/FastAccessValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/FastAccessValidator.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/FieldSetSettings.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/FieldSetSettings.java) | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/FilterFieldNames.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaryFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFields.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ImportedFieldsResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java) | 32 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/IndexFieldNames.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexFieldNames.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/IndexingInputs.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingOutputs.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingValidation.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/IndexingValues.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingValues.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/IntegerIndex2Attribute.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/LiteralBoost.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/MakeAliases.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeAliases.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/MatchConsistency.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchConsistency.java) | 11 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/MatchPhaseSettingsValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidator.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/MatchedElementsOnlyResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolver.java) | 14 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/MultifieldIndexHarmonizer.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/MultifieldIndexHarmonizer.java) | 14 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/MutableAttributes.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/MutableAttributes.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/NGramMatch.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java) | 13 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/OnnxModelConfigGenerator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelConfigGenerator.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/OnnxModelTypeResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelTypeResolver.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/OptimizeIlscript.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/OptimizeIlscript.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/PagedAttributeValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/PagedAttributeValidator.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java) | 14 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/Processing.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/Processor.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java) | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/RankingExpressionTypeResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ReferenceFieldsProcessor.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ReservedDocumentNames.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedDocumentNames.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ReservedFunctionNames.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedFunctionNames.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/SearchMustHaveDocument.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/SearchMustHaveDocument.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/SetRankTypeEmptyOnFilters.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/SortingSettings.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/SortingSettings.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/StringSettingsOnNonStringFields.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/StringSettingsOnNonStringFields.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/SummaryConsistency.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/SummaryDiskAccessValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/SummaryDynamicStructsArrays.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDynamicStructsArrays.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSource.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/SummaryNamesFieldCollisions.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryNamesFieldCollisions.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/TagType.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java) | 14 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/TensorFieldProcessor.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/TextMatch.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/TextMatch.java) | 13 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/TypedTransformProvider.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/UriHack.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java) | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/UrlFieldValidator.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/UrlFieldValidator.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypes.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypesDocumentsOnly.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesDocumentsOnly.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldWithIndexSettingsCreatesIndex.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java) | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/ValidateStructTypeInheritance.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateStructTypeInheritance.java) | 13 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/WordMatch.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java) | 13 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/IndexCommandResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/IndexCommandResolver.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/MultiFieldResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/MultiFieldResolver.java) | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java) | 20 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/StemmingResolver.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java) | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/package-info.java (renamed from config-model/src/main/java/com/yahoo/searchdefinition/processing/package-info.java) | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java | 7 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java | 18 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidator.java | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/NoPrefixForIndexes.java | 10 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java | 8 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.java | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTester.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java | 6 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java | 9 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java | 6 |
256 files changed, 879 insertions, 950 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 3cd2499f968..11d84884194 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -29,10 +29,10 @@ import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.Zone; import com.yahoo.io.IOUtils; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.Application; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.ApplicationBuilder; +import com.yahoo.schema.Application; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.ApplicationBuilder; import com.yahoo.vespa.config.ConfigDefinition; import com.yahoo.vespa.config.ConfigDefinitionBuilder; import com.yahoo.vespa.config.ConfigDefinitionKey; @@ -41,7 +41,6 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; import com.yahoo.vespa.model.container.search.QueryProfilesBuilder; import com.yahoo.vespa.model.container.search.SemanticRuleBuilder; import com.yahoo.vespa.model.container.search.SemanticRules; -import com.yahoo.yolean.Exceptions; import java.io.File; import java.io.FileNotFoundException; diff --git a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java index ff5930f8f6a..7f15da3179f 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java @@ -4,16 +4,15 @@ package com.yahoo.documentmodel; import com.yahoo.document.DataType; import com.yahoo.document.Document; import com.yahoo.document.Field; -import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.document.StructDataType; import com.yahoo.document.StructuredDataType; import com.yahoo.document.annotation.AnnotationType; import com.yahoo.document.annotation.AnnotationTypeRegistry; import com.yahoo.document.datatypes.FieldValue; -import com.yahoo.searchdefinition.FieldSets; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.FieldSet; -import com.yahoo.searchdefinition.processing.BuiltInFieldSets; +import com.yahoo.schema.FieldSets; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.FieldSet; +import com.yahoo.schema.processing.BuiltInFieldSets; import java.util.Collection; import java.util.Collections; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Application.java b/config-model/src/main/java/com/yahoo/schema/Application.java index 2dda670f07c..aa47818ff99 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Application.java +++ b/config-model/src/main/java/com/yahoo/schema/Application.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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.ModelContext; -import com.yahoo.searchdefinition.derived.SearchOrderer; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.processing.Processing; -import com.yahoo.searchdefinition.processing.Processor; +import com.yahoo.schema.derived.SearchOrderer; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.processing.Processing; +import com.yahoo.schema.processing.Processor; import com.yahoo.vespa.documentmodel.DocumentModel; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/ApplicationBuilder.java b/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java index fe0044ecfa4..d2c7035bac6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/ApplicationBuilder.java +++ b/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; @@ -14,10 +14,10 @@ import com.yahoo.io.reader.NamedReader; import com.yahoo.path.Path; import com.yahoo.search.query.profile.QueryProfileRegistry; import com.yahoo.search.query.profile.config.QueryProfileXMLReader; -import com.yahoo.searchdefinition.parser.ConvertSchemaCollection; -import com.yahoo.searchdefinition.parser.IntermediateCollection; -import com.yahoo.searchdefinition.parser.ParseException; -import com.yahoo.searchdefinition.processing.Processor; +import com.yahoo.schema.parser.ConvertSchemaCollection; +import com.yahoo.schema.parser.IntermediateCollection; +import com.yahoo.schema.parser.ParseException; +import com.yahoo.schema.processing.Processor; import com.yahoo.vespa.documentmodel.DocumentModel; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java b/config-model/src/main/java/com/yahoo/schema/DefaultRankProfile.java index 69850b21224..9ab03b8c4a1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DefaultRankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/DefaultRankProfile.java @@ -1,8 +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.derived.FileDistributedConstants; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.document.ImmutableSDField; import java.util.LinkedHashSet; import java.util.Set; @@ -18,7 +17,7 @@ public class DefaultRankProfile extends RankProfile { /** * Creates a new rank profile * - * @param rankProfileRegistry the {@link com.yahoo.searchdefinition.RankProfileRegistry} + * @param rankProfileRegistry the {@link com.yahoo.schema.RankProfileRegistry} * to use for storing and looking up rank profiles */ public DefaultRankProfile(Schema schema, RankProfileRegistry rankProfileRegistry) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java b/config-model/src/main/java/com/yahoo/schema/DistributableResource.java index be2aa500b2b..7a8a3963ba4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DistributableResource.java +++ b/config-model/src/main/java/com/yahoo/schema/DistributableResource.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.FileReference; import com.yahoo.config.application.api.FileRegistry; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentGraphValidator.java b/config-model/src/main/java/com/yahoo/schema/DocumentGraphValidator.java index 33f202a55fa..648cdf18c5b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentGraphValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/DocumentGraphValidator.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.SDDocumentType; +import com.yahoo.schema.document.SDDocumentType; import java.util.ArrayDeque; import java.util.Deque; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/schema/DocumentModelBuilder.java index bfe0db6f65d..1a6134b410f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/schema/DocumentModelBuilder.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.ArrayDataType; import com.yahoo.document.CollectionDataType; @@ -8,7 +8,6 @@ import com.yahoo.document.DocumentType; import com.yahoo.document.Field; import com.yahoo.document.MapDataType; import com.yahoo.document.StructDataType; -import com.yahoo.document.StructuredDataType; import com.yahoo.document.TemporaryStructuredDataType; import com.yahoo.document.WeightedSetDataType; import com.yahoo.document.annotation.AnnotationReferenceDataType; @@ -20,18 +19,17 @@ import com.yahoo.documentmodel.OwnedStructDataType; import com.yahoo.documentmodel.OwnedTemporaryType; import com.yahoo.documentmodel.TemporaryUnknownType; import com.yahoo.documentmodel.VespaDocumentType; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporaryImportedFields; -import com.yahoo.searchdefinition.document.annotation.SDAnnotationType; -import com.yahoo.searchdefinition.document.annotation.TemporaryAnnotationReferenceDataType; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporaryImportedFields; +import com.yahoo.schema.document.annotation.SDAnnotationType; +import com.yahoo.schema.document.annotation.TemporaryAnnotationReferenceDataType; import com.yahoo.vespa.documentmodel.DocumentModel; import com.yahoo.vespa.documentmodel.FieldView; import com.yahoo.vespa.documentmodel.SearchDef; import com.yahoo.vespa.documentmodel.SearchField; -import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentOnlySchema.java b/config-model/src/main/java/com/yahoo/schema/DocumentOnlySchema.java index 1d71a9f1494..f9005c7b775 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentOnlySchema.java +++ b/config-model/src/main/java/com/yahoo/schema/DocumentOnlySchema.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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.model.api.ModelContext; -import com.yahoo.searchdefinition.document.SDDocumentType; +import com.yahoo.schema.document.SDDocumentType; /** * A search that was derived from an sd file containing no search element(s), only diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReference.java b/config-model/src/main/java/com/yahoo/schema/DocumentReference.java index 145effcdc9d..048035ffef8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReference.java +++ b/config-model/src/main/java/com/yahoo/schema/DocumentReference.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.Field; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java b/config-model/src/main/java/com/yahoo/schema/DocumentReferenceResolver.java index 2e8362f1839..b3e06fd5e02 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferenceResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/DocumentReferenceResolver.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.document.Field; 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 java.util.Collection; import java.util.Map; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferences.java b/config-model/src/main/java/com/yahoo/schema/DocumentReferences.java index d0ac967ce7e..3583a5134e0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentReferences.java +++ b/config-model/src/main/java/com/yahoo/schema/DocumentReferences.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 java.util.Collections; import java.util.Iterator; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentsOnlyRankProfile.java b/config-model/src/main/java/com/yahoo/schema/DocumentsOnlyRankProfile.java index caaef63fd73..ffd517cf241 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentsOnlyRankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/DocumentsOnlyRankProfile.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 java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/FeatureNames.java b/config-model/src/main/java/com/yahoo/schema/FeatureNames.java index a226fa4812f..0671903194f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/FeatureNames.java +++ b/config-model/src/main/java/com/yahoo/schema/FeatureNames.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.searchlib.rankingexpression.Reference; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplier.java b/config-model/src/main/java/com/yahoo/schema/FieldOperationApplier.java index 7fa009bed67..b2f40b045ea 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplier.java +++ b/config-model/src/main/java/com/yahoo/schema/FieldOperationApplier.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.document.Field; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForSearch.java b/config-model/src/main/java/com/yahoo/schema/FieldOperationApplierForSearch.java index 52110e95ac7..b107dbaea59 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForSearch.java +++ b/config-model/src/main/java/com/yahoo/schema/FieldOperationApplierForSearch.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.document.Field; -import com.yahoo.searchdefinition.document.SDDocumentType; +import com.yahoo.schema.document.SDDocumentType; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForStructs.java b/config-model/src/main/java/com/yahoo/schema/FieldOperationApplierForStructs.java index 4a5a858f828..1ec1de6a9c6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForStructs.java +++ b/config-model/src/main/java/com/yahoo/schema/FieldOperationApplierForStructs.java @@ -1,14 +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.document.DataType; -import com.yahoo.document.Field; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import com.yahoo.schema.document.SDDocumentType; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/FieldSets.java b/config-model/src/main/java/com/yahoo/schema/FieldSets.java index 065ade9b094..0594056150c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/FieldSets.java +++ b/config-model/src/main/java/com/yahoo/schema/FieldSets.java @@ -1,13 +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 java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; -import java.util.stream.Collectors; -import com.yahoo.searchdefinition.document.FieldSet; +import com.yahoo.schema.document.FieldSet; /** * The field sets owned by a {@link Schema} diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSchema.java b/config-model/src/main/java/com/yahoo/schema/ImmutableSchema.java index 3719313179f..c352d9c417f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSchema.java +++ b/config-model/src/main/java/com/yahoo/schema/ImmutableSchema.java @@ -1,13 +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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.ModelContext; -import com.yahoo.searchdefinition.derived.FileDistributedOnnxModels; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.vespa.documentmodel.SummaryField; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/ImportedFieldsEnumerator.java b/config-model/src/main/java/com/yahoo/schema/ImportedFieldsEnumerator.java index 512cae5021a..0df79b30298 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/ImportedFieldsEnumerator.java +++ b/config-model/src/main/java/com/yahoo/schema/ImportedFieldsEnumerator.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.SDDocumentType; +import com.yahoo.schema.document.SDDocumentType; import java.util.Collection; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java b/config-model/src/main/java/com/yahoo/schema/Index.java index 14f07f224ab..190081cf80f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java +++ b/config-model/src/main/java/com/yahoo/schema/Index.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.BooleanIndexDefinition; -import com.yahoo.searchdefinition.document.HnswIndexParams; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.document.BooleanIndexDefinition; +import com.yahoo.schema.document.HnswIndexParams; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.Stemming; import java.io.Serializable; import java.util.Collections; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java b/config-model/src/main/java/com/yahoo/schema/LargeRankExpressions.java index 5e3ef39f360..cfdd4729b97 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java +++ b/config-model/src/main/java/com/yahoo/schema/LargeRankExpressions.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.application.api.FileRegistry; import java.util.Collection; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java b/config-model/src/main/java/com/yahoo/schema/MapEvaluationTypeContext.java index 23538deed66..c6c807f2dbb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java +++ b/config-model/src/main/java/com/yahoo/schema/MapEvaluationTypeContext.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.google.common.collect.ImmutableMap; -import com.yahoo.searchdefinition.expressiontransforms.OnnxModelTransformer; -import com.yahoo.searchdefinition.expressiontransforms.TokenTransformer; +import com.yahoo.schema.expressiontransforms.OnnxModelTransformer; +import com.yahoo.schema.expressiontransforms.TokenTransformer; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.searchlib.rankingexpression.Reference; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/OnnxModel.java b/config-model/src/main/java/com/yahoo/schema/OnnxModel.java index 4b849af9662..26a0b3e595d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/OnnxModel.java +++ b/config-model/src/main/java/com/yahoo/schema/OnnxModel.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.tensor.TensorType; import com.yahoo.vespa.model.ml.OnnxModelInfo; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankExpressionBody.java b/config-model/src/main/java/com/yahoo/schema/RankExpressionBody.java index 90109026dce..d383a25aecb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankExpressionBody.java +++ b/config-model/src/main/java/com/yahoo/schema/RankExpressionBody.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.application.api.FileRegistry; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/schema/RankProfile.java index ec560484513..5479ecf323f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.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 ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import com.google.common.collect.ImmutableMap; @@ -10,12 +10,12 @@ 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.search.query.ranking.Diversity; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.expressiontransforms.ExpressionTransforms; -import com.yahoo.searchdefinition.expressiontransforms.RankProfileTransformContext; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.expressiontransforms.ExpressionTransforms; +import com.yahoo.schema.expressiontransforms.RankProfileTransformContext; +import com.yahoo.schema.parser.ParseException; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; import com.yahoo.searchlib.rankingexpression.FeatureList; import com.yahoo.searchlib.rankingexpression.RankingExpression; @@ -138,7 +138,7 @@ public class RankProfile implements Cloneable { * * @param name the name of the new profile * @param schema the schema owning this profile - * @param rankProfileRegistry the {@link com.yahoo.searchdefinition.RankProfileRegistry} to use for storing + * @param rankProfileRegistry the {@link com.yahoo.schema.RankProfileRegistry} to use for storing * and looking up rank profiles. */ public RankProfile(String name, Schema schema, RankProfileRegistry rankProfileRegistry) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfileRegistry.java b/config-model/src/main/java/com/yahoo/schema/RankProfileRegistry.java index 2e815b7b503..06ffc934b2d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfileRegistry.java +++ b/config-model/src/main/java/com/yahoo/schema/RankProfileRegistry.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.SDDocumentType; +import com.yahoo.schema.document.SDDocumentType; import java.util.ArrayList; import java.util.Arrays; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java b/config-model/src/main/java/com/yahoo/schema/SDDocumentTypeOrderer.java index ce32f323f22..64bca9367d8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/SDDocumentTypeOrderer.java +++ b/config-model/src/main/java/com/yahoo/schema/SDDocumentTypeOrderer.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.application.api.DeployLogger; import com.yahoo.document.*; import com.yahoo.document.annotation.AnnotationReferenceDataType; import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.documentmodel.NewDocumentType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.TemporarySDDocumentType; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.TemporarySDDocumentType; import java.util.*; import java.util.logging.Level; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java b/config-model/src/main/java/com/yahoo/schema/Schema.java index 8139d46cc0a..c733b6012f9 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Schema.java +++ b/config-model/src/main/java/com/yahoo/schema/Schema.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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; @@ -9,17 +9,16 @@ import com.yahoo.config.model.application.provider.BaseDeployLogger; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.document.DataTypeName; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.derived.FileDistributedOnnxModels; -import com.yahoo.searchdefinition.derived.SummaryClass; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.ImportedField; -import com.yahoo.searchdefinition.document.ImportedFields; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.document.TemporaryImportedFields; -import com.yahoo.searchdefinition.document.annotation.SDAnnotationType; +import com.yahoo.schema.derived.SummaryClass; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.ImportedField; +import com.yahoo.schema.document.ImportedFields; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; +import com.yahoo.schema.document.TemporaryImportedFields; +import com.yahoo.schema.document.annotation.SDAnnotationType; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; @@ -28,7 +27,6 @@ import java.io.Reader; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/TemporarySDTypeResolver.java b/config-model/src/main/java/com/yahoo/schema/TemporarySDTypeResolver.java index 2eaf0d5e5ba..b1ce6f5eb4f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/TemporarySDTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/TemporarySDTypeResolver.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.TemporarySDDocumentType; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.TemporarySDDocumentType; import java.util.Collection; import java.util.LinkedList; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/UnrankedRankProfile.java b/config-model/src/main/java/com/yahoo/schema/UnrankedRankProfile.java index 0e4578878df..6c1f5fc8731 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/UnrankedRankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/UnrankedRankProfile.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; +package com.yahoo.schema; -import com.yahoo.searchdefinition.derived.FileDistributedConstants; import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.searchlib.rankingexpression.parser.ParseException; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java index cd10263b0ff..99f73a75669 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/AttributeFields.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.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.subscription.ConfigInstanceUtil; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.Dictionary; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.Ranking; -import com.yahoo.searchdefinition.document.Sorting; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.Dictionary; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.Ranking; +import com.yahoo.schema.document.Sorting; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.indexinglanguage.expressions.ToPositionExpression; @@ -21,10 +21,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isArrayOfSimpleStruct; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isMapOfPrimitiveType; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isMapOfSimpleStruct; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isSupportedComplexField; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isArrayOfSimpleStruct; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isMapOfPrimitiveType; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isMapOfSimpleStruct; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isSupportedComplexField; /** * The set of all attribute fields defined by a search definition diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java b/config-model/src/main/java/com/yahoo/schema/derived/Derived.java index 99c40c2700f..9943a02a2f2 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Derived.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/Derived.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.ConfigInstance; import com.yahoo.config.ConfigInstance.Builder; import com.yahoo.document.Field; import com.yahoo.io.IOUtils; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.text.StringUtilities; import java.io.IOException; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java index c7b9b94a4b2..0f5721bbab3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.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.ConfigInstance; import com.yahoo.config.model.deploy.DeployState; @@ -8,9 +8,9 @@ import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.io.IOUtils; import com.yahoo.protect.Validator; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.validation.Validation; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.validation.Validation; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import com.yahoo.vespa.model.container.search.QueryProfiles; @@ -50,7 +50,7 @@ public class DerivedConfiguration implements AttributesConfig.Producer { * @param schema the search to derive a configuration from. Derived objects will be snapshots, but this argument is * live. Which means that this object will be inconsistent when the given search definition is later * modified. - * @param rankProfileRegistry a {@link com.yahoo.searchdefinition.RankProfileRegistry} + * @param rankProfileRegistry a {@link com.yahoo.schema.RankProfileRegistry} */ public DerivedConfiguration(Schema schema, RankProfileRegistry rankProfileRegistry) { this(schema, rankProfileRegistry, new QueryProfileRegistry()); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java b/config-model/src/main/java/com/yahoo/schema/derived/Deriver.java index c90855896ec..44bea43a8e3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Deriver.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/Deriver.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.document.config.DocumenttypesConfig; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.ApplicationBuilder; -import com.yahoo.searchdefinition.parser.ParseException; +import com.yahoo.schema.ApplicationBuilder; +import com.yahoo.schema.parser.ParseException; import com.yahoo.vespa.configmodel.producers.DocumentManager; import com.yahoo.vespa.configmodel.producers.DocumentTypes; import java.io.IOException; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java b/config-model/src/main/java/com/yahoo/schema/derived/Exportable.java index ee96161d443..4fccfb5d9f8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Exportable.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/Exportable.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; /** * Classes exportable to configurations diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldRankSettings.java b/config-model/src/main/java/com/yahoo/schema/derived/FieldRankSettings.java index 2a2950f71e9..ccb25df031c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldRankSettings.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/FieldRankSettings.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.collections.Pair; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java b/config-model/src/main/java/com/yahoo/schema/derived/FieldResultTransform.java index 39432fd0049..99b2925d714 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FieldResultTransform.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/FieldResultTransform.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.vespa.documentmodel.SummaryTransform; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FileDistributedConstants.java b/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedConstants.java index 433bfb108d6..05f6be2f6f1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FileDistributedConstants.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedConstants.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.application.api.FileRegistry; -import com.yahoo.searchdefinition.DistributableResource; -import com.yahoo.searchdefinition.RankProfile; +import com.yahoo.schema.DistributableResource; +import com.yahoo.schema.RankProfile; import com.yahoo.tensor.TensorType; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FileDistributedOnnxModels.java b/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java index a1310d6c18e..b5c3909c78c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/FileDistributedOnnxModels.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/FileDistributedOnnxModels.java @@ -1,17 +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.application.api.FileRegistry; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.OnnxModel; import com.yahoo.vespa.config.search.core.OnnxModelsConfig; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Optional; import java.util.logging.Logger; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/ImportedFields.java b/config-model/src/main/java/com/yahoo/schema/derived/ImportedFields.java index 3b8c0a9cff2..fa3f49f06d5 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/ImportedFields.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/ImportedFields.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.derived; - -import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.ImportedComplexField; -import com.yahoo.searchdefinition.document.ImportedField; +package com.yahoo.schema.derived; + +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.ImportedComplexField; +import com.yahoo.schema.document.ImportedField; import com.yahoo.vespa.config.search.ImportedFieldsConfig; import java.util.Optional; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isArrayOfSimpleStruct; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isMapOfPrimitiveType; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isMapOfSimpleStruct; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isArrayOfSimpleStruct; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isMapOfPrimitiveType; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isMapOfSimpleStruct; /** * This class derives imported fields from search definition and produces imported-fields.cfg as needed by the search backend. @@ -23,7 +22,7 @@ import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isM */ public class ImportedFields extends Derived implements ImportedFieldsConfig.Producer { - private Optional<com.yahoo.searchdefinition.document.ImportedFields> importedFields = Optional.empty(); + private Optional<com.yahoo.schema.document.ImportedFields> importedFields = Optional.empty(); public ImportedFields(Schema schema) { derive(schema); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Index.java b/config-model/src/main/java/com/yahoo/schema/derived/Index.java index c19fc9ca942..3b5e617d3dc 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Index.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/Index.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.CollectionDataType; import com.yahoo.document.DataType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java index b65af3a8f02..4887ad52974 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.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.CollectionDataType; import com.yahoo.document.DataType; @@ -8,19 +8,19 @@ import com.yahoo.document.MapDataType; import com.yahoo.document.NumericDataType; import com.yahoo.document.PrimitiveDataType; import com.yahoo.document.StructuredDataType; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.BooleanIndexDefinition; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.FieldSet; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.processing.ExactMatch; -import com.yahoo.searchdefinition.processing.NGramMatch; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.BooleanIndexDefinition; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.FieldSet; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.Matching; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.Stemming; +import com.yahoo.schema.processing.ExactMatch; +import com.yahoo.schema.processing.NGramMatch; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.search.config.IndexInfoConfig; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexSchema.java index ce5731bcdeb..7f6c824b979 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexSchema.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.ArrayDataType; import com.yahoo.document.DataType; @@ -7,10 +7,10 @@ import com.yahoo.document.Field; import com.yahoo.document.StructuredDataType; import com.yahoo.document.TensorDataType; import com.yahoo.document.WeightedSetDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.BooleanIndexDefinition; -import com.yahoo.searchdefinition.document.FieldSet; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.BooleanIndexDefinition; +import com.yahoo.schema.document.FieldSet; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.config.search.IndexschemaConfig; import java.util.ArrayList; @@ -75,7 +75,7 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer { private void deriveIndexFields(Field field, Schema schema) { IndexField toAdd = new IndexField(field.getName(), Index.convertType(field.getDataType()), field.getDataType()); - com.yahoo.searchdefinition.Index definedIndex = schema.getIndex(field.getName()); + com.yahoo.schema.Index definedIndex = schema.getIndex(field.getName()); if (definedIndex != null) { toAdd.setIndexSettings(definedIndex); } @@ -174,7 +174,7 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer { public static class IndexField { private String name; private Index.Type type; - private com.yahoo.searchdefinition.Index.Type sdType; // The index type in "user intent land" + private com.yahoo.schema.Index.Type sdType; // The index type in "user intent land" private DataType sdFieldType; private boolean prefix = false; private boolean phrases = false; // TODO dead, but keep a while to ensure config compatibility? @@ -188,7 +188,7 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer { this.type = type; this.sdFieldType = sdFieldType; } - public void setIndexSettings(com.yahoo.searchdefinition.Index index) { + public void setIndexSettings(com.yahoo.schema.Index index) { if (type.equals(Index.Type.TEXT)) { prefix = index.isPrefix(); interleavedFeatures = index.useInterleavedFeatures(); @@ -224,7 +224,7 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer { * The user set index type * @return the type */ - public com.yahoo.searchdefinition.Index.Type getSdType() { + public com.yahoo.schema.Index.Type getSdType() { return sdType; } } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java index 23409729dbb..6dae89bf692 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.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.document.DataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.configdefinition.IlscriptsConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig.Ilscript.Builder; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Juniperrc.java b/config-model/src/main/java/com/yahoo/schema/derived/Juniperrc.java index 327d7df4d07..162efbb25b4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Juniperrc.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/Juniperrc.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.Schema; +import com.yahoo.schema.Schema; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.config.search.summary.JuniperrcConfig; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinition.java b/config-model/src/main/java/com/yahoo/schema/derived/NativeRankTypeDefinition.java index 66526684dc4..7d558ea51cc 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinition.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/NativeRankTypeDefinition.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.document.RankType; +import com.yahoo.schema.document.RankType; import java.util.Collections; import java.util.Iterator; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionSet.java b/config-model/src/main/java/com/yahoo/schema/derived/NativeRankTypeDefinitionSet.java index cadd3a9efb0..65e68181b5b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeRankTypeDefinitionSet.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/NativeRankTypeDefinitionSet.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.document.RankType; +import com.yahoo.schema.document.RankType; import java.util.Collections; import java.util.Map; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeTable.java b/config-model/src/main/java/com/yahoo/schema/derived/NativeTable.java index 3d1f565b793..6eff2487bca 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/NativeTable.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/NativeTable.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; /** * A named rank table of a certain type. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.java index 081450275d1..98815410876 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RankProfileList.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/RankProfileList.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.derived; +package com.yahoo.schema.derived; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.LargeRankExpressions; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.LargeRankExpressions; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.vespa.config.search.RankProfilesConfig; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.Schema; import com.yahoo.vespa.config.search.core.OnnxModelsConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import com.yahoo.vespa.config.search.core.RankingExpressionsConfig; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java index 6a288ab477a..a8a9b4c8755 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.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 ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import com.google.common.collect.ImmutableList; @@ -7,13 +7,13 @@ import com.yahoo.collections.Pair; import com.yahoo.compress.Compressor; import com.yahoo.config.model.api.ModelContext; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.FeatureNames; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.LargeRankExpressions; -import com.yahoo.searchdefinition.RankExpressionBody; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.expressiontransforms.OnnxModelTransformer; +import com.yahoo.schema.FeatureNames; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.LargeRankExpressions; +import com.yahoo.schema.RankExpressionBody; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.expressiontransforms.OnnxModelTransformer; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.searchlib.rankingexpression.Reference; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SchemaInfo.java b/config-model/src/main/java/com/yahoo/schema/derived/SchemaInfo.java index 0c1e5a76a89..18c6f335787 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SchemaInfo.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/SchemaInfo.java @@ -1,22 +1,17 @@ // 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.config.SchemaInfoConfig; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; import com.yahoo.searchlib.rankingexpression.Reference; -import com.yahoo.tensor.Tensor; -import com.yahoo.tensor.TensorType; -import com.yahoo.vespa.config.search.SummarymapConfig; import com.yahoo.vespa.documentmodel.SummaryTransform; -import com.yahoo.vespa.model.search.SearchCluster; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Optional; /** * Information about a schema. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java b/config-model/src/main/java/com/yahoo/schema/derived/SearchOrderer.java index 8703eb11433..3bab808beff 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SearchOrderer.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/SearchOrderer.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.document.DataTypeName; -import com.yahoo.searchdefinition.DocumentReference; -import com.yahoo.searchdefinition.DocumentReferences; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDDocumentType; +import com.yahoo.schema.DocumentReference; +import com.yahoo.schema.DocumentReferences; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDDocumentType; import java.util.*; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java b/config-model/src/main/java/com/yahoo/schema/derived/Summaries.java index e259c07dbb5..2b41fbb3b1a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/Summaries.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/Summaries.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.application.api.DeployLogger; import com.yahoo.config.model.api.ModelContext; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Schema; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.config.search.SummaryConfig; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/schema/derived/SummaryClass.java index ea8e2aac1f0..193c6893203 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/SummaryClass.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.config.application.api.DeployLogger; import com.yahoo.document.DataType; import com.yahoo.prelude.fastsearch.DocsumDefinitionSet; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Schema; import com.yahoo.vespa.config.search.SummaryConfig; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java b/config-model/src/main/java/com/yahoo/schema/derived/SummaryClassField.java index e9dd2ac321c..f042054a0b5 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClassField.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/SummaryClassField.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.CollectionDataType; import com.yahoo.document.DataType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java b/config-model/src/main/java/com/yahoo/schema/derived/SummaryMap.java index 9e1740b4073..df9174a12ed 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryMap.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/SummaryMap.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.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.config.search.SummarymapConfig; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import java.util.Collections; -import java.util.Iterator; import java.util.Map; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmFields.java b/config-model/src/main/java/com/yahoo/schema/derived/VsmFields.java index c9ad8ad2838..c8679b6166c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmFields.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/VsmFields.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.CollectionDataType; import com.yahoo.document.DataType; @@ -11,14 +11,14 @@ import com.yahoo.document.datatypes.PredicateFieldValue; import com.yahoo.document.datatypes.Raw; import com.yahoo.document.datatypes.StringFieldValue; import com.yahoo.document.datatypes.TensorFieldValue; -import com.yahoo.searchdefinition.FieldSets; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.FieldSet; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.FieldSets; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.FieldSet; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.Matching; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.config.search.vsm.VsmfieldsConfig; import java.util.LinkedHashMap; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java b/config-model/src/main/java/com/yahoo/schema/derived/VsmSummary.java index 998343bc467..30ae9c97268 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/VsmSummary.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/VsmSummary.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.document.GeoPos; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.GeoPos; +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.config.search.vsm.VsmsummaryConfig; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/package-info.java b/config-model/src/main/java/com/yahoo/schema/derived/package-info.java index e908045d777..370617ac6cc 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/package-info.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/package-info.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage -package com.yahoo.searchdefinition.derived; +package com.yahoo.schema.derived; import com.yahoo.osgi.annotation.ExportPackage; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java b/config-model/src/main/java/com/yahoo/schema/derived/validation/IndexStructureValidator.java index 76f52bce2a9..512d9f742bf 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/validation/IndexStructureValidator.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.validation; +package com.yahoo.schema.derived.validation; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; -import com.yahoo.searchdefinition.derived.IndexingScript; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.DerivedConfiguration; +import com.yahoo.schema.derived.IndexingScript; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; import com.yahoo.vespa.indexinglanguage.expressions.Expression; import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validation.java b/config-model/src/main/java/com/yahoo/schema/derived/validation/Validation.java index fd75fbb2f48..dba4dce49f0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validation.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/validation/Validation.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.validation; +package com.yahoo.schema.derived.validation; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.DerivedConfiguration; public class Validation { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java b/config-model/src/main/java/com/yahoo/schema/derived/validation/Validator.java index 7d3e5b8e9ed..bf0f007841c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/validation/Validator.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.validation; +package com.yahoo.schema.derived.validation; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.DerivedConfiguration; /** * @author mathiasm diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java b/config-model/src/main/java/com/yahoo/schema/document/Attribute.java index 2c4a2c06d02..f2279a52855 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Attribute.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Attribute.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.document; +package com.yahoo.schema.document; import com.yahoo.document.ArrayDataType; import com.yahoo.document.CollectionDataType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/BooleanIndexDefinition.java b/config-model/src/main/java/com/yahoo/schema/document/BooleanIndexDefinition.java index 3b6228029c7..8563d414c40 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/BooleanIndexDefinition.java +++ b/config-model/src/main/java/com/yahoo/schema/document/BooleanIndexDefinition.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.document; +package com.yahoo.schema.document; import java.util.Optional; import java.util.OptionalDouble; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Case.java b/config-model/src/main/java/com/yahoo/schema/document/Case.java index ef82a498e5e..443f67940a0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Case.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Case.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.document; +package com.yahoo.schema.document; /** * Describes if items should preserve lower/upper case, or shall be uncased diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtils.java b/config-model/src/main/java/com/yahoo/schema/document/ComplexAttributeFieldUtils.java index feac6b9618e..993bf16405a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtils.java +++ b/config-model/src/main/java/com/yahoo/schema/document/ComplexAttributeFieldUtils.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.document; +package com.yahoo.schema.document; import com.yahoo.document.ArrayDataType; import com.yahoo.document.DataType; import com.yahoo.document.MapDataType; -import com.yahoo.document.PositionDataType; import com.yahoo.document.StructDataType; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Dictionary.java b/config-model/src/main/java/com/yahoo/schema/document/Dictionary.java index 163651bf255..4744547c778 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Dictionary.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Dictionary.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; /** * Represents settings for dictionary control diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java b/config-model/src/main/java/com/yahoo/schema/document/FieldSet.java index 944564dbaa1..e62e784d7b3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/FieldSet.java +++ b/config-model/src/main/java/com/yahoo/schema/document/FieldSet.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.document; +package com.yahoo.schema.document; import java.util.LinkedHashSet; import java.util.Set; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/GeoPos.java b/config-model/src/main/java/com/yahoo/schema/document/GeoPos.java index 956d63a1cdf..829555d88c6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/GeoPos.java +++ b/config-model/src/main/java/com/yahoo/schema/document/GeoPos.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.document; +package com.yahoo.schema.document; import com.yahoo.document.DataType; import com.yahoo.document.PositionDataType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/HnswIndexParams.java b/config-model/src/main/java/com/yahoo/schema/document/HnswIndexParams.java index 4f717092f56..cc427356c78 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/HnswIndexParams.java +++ b/config-model/src/main/java/com/yahoo/schema/document/HnswIndexParams.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.document; +package com.yahoo.schema.document; -import java.util.Locale; import java.util.Optional; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedComplexSDField.java b/config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedComplexSDField.java index bdd5a4ea899..553b5b4d940 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedComplexSDField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedComplexSDField.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.document; +package com.yahoo.schema.document; import java.util.Collection; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedSDField.java b/config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedSDField.java index 71814c31087..335942de99d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableImportedSDField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/ImmutableImportedSDField.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.document; +package com.yahoo.schema.document; import com.yahoo.document.DataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.indexinglanguage.expressions.Expression; import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableSDField.java b/config-model/src/main/java/com/yahoo/schema/document/ImmutableSDField.java index 6d1dee67641..44e442811ba 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImmutableSDField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/ImmutableSDField.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.document; +package com.yahoo.schema.document; import com.yahoo.document.DataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.indexinglanguage.expressions.Expression; import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedComplexField.java b/config-model/src/main/java/com/yahoo/schema/document/ImportedComplexField.java index 9435f7cdd48..10c400bc4d6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedComplexField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/ImportedComplexField.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.document; +package com.yahoo.schema.document; -import com.yahoo.searchdefinition.DocumentReference; +import com.yahoo.schema.DocumentReference; import java.util.Collection; import java.util.Map; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedField.java b/config-model/src/main/java/com/yahoo/schema/document/ImportedField.java index 6f2142c3cea..50f8591bbce 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/ImportedField.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.document; +package com.yahoo.schema.document; -import com.yahoo.searchdefinition.DocumentReference; +import com.yahoo.schema.DocumentReference; /** * A field that is imported from a concrete field in a referenced document type and given an alias name. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedFields.java b/config-model/src/main/java/com/yahoo/schema/document/ImportedFields.java index 18bd3f43445..f6654896fae 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedFields.java +++ b/config-model/src/main/java/com/yahoo/schema/document/ImportedFields.java @@ -1,7 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.document; - -import com.yahoo.searchdefinition.Schema; +package com.yahoo.schema.document; import java.util.Collections; import java.util.Map; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedSimpleField.java b/config-model/src/main/java/com/yahoo/schema/document/ImportedSimpleField.java index 6acd1661294..244135ecc10 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ImportedSimpleField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/ImportedSimpleField.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.document; +package com.yahoo.schema.document; -import com.yahoo.searchdefinition.DocumentReference; +import com.yahoo.schema.DocumentReference; /** * A simple field that is imported from a concrete field in a referenced document type and given an alias name. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/MatchAlgorithm.java b/config-model/src/main/java/com/yahoo/schema/document/MatchAlgorithm.java index 545f2e293dc..8556fe491d0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/MatchAlgorithm.java +++ b/config-model/src/main/java/com/yahoo/schema/document/MatchAlgorithm.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.document; +package com.yahoo.schema.document; /** Which match algorithm is used by this matching setup */ diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/MatchType.java b/config-model/src/main/java/com/yahoo/schema/document/MatchType.java index dd4af0965d8..d2088e71282 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/MatchType.java +++ b/config-model/src/main/java/com/yahoo/schema/document/MatchType.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.document; +package com.yahoo.schema.document; public enum MatchType { TEXT("text"), diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Matching.java b/config-model/src/main/java/com/yahoo/schema/document/Matching.java index ffac35ba61e..f70f31be0bd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Matching.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Matching.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.document; +package com.yahoo.schema.document; import java.io.Serializable; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/NormalizeLevel.java b/config-model/src/main/java/com/yahoo/schema/document/NormalizeLevel.java index a1e2986b572..12880d0e1c8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/NormalizeLevel.java +++ b/config-model/src/main/java/com/yahoo/schema/document/NormalizeLevel.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.document; +package com.yahoo.schema.document; /** * class representing the character normalization diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java b/config-model/src/main/java/com/yahoo/schema/document/RankType.java index 6d84a9e97fc..067c1e7f266 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java +++ b/config-model/src/main/java/com/yahoo/schema/document/RankType.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.document; +package com.yahoo.schema.document; /** * The rank type of a field. For now this is just a container of a string name. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java b/config-model/src/main/java/com/yahoo/schema/document/Ranking.java index 235677cd05e..31fd9747e2d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Ranking.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.document; +package com.yahoo.schema.document; import java.io.Serializable; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java b/config-model/src/main/java/com/yahoo/schema/document/SDDocumentType.java index b87bdd8907e..d300bd08bfd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java +++ b/config-model/src/main/java/com/yahoo/schema/document/SDDocumentType.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.document; +package com.yahoo.schema.document; import com.yahoo.document.DataType; import com.yahoo.document.DataTypeName; @@ -11,9 +11,9 @@ import com.yahoo.document.annotation.AnnotationType; import com.yahoo.document.annotation.AnnotationTypeRegistry; import com.yahoo.documentmodel.NewDocumentType; import com.yahoo.documentmodel.VespaDocumentType; -import com.yahoo.searchdefinition.DocumentReferences; -import com.yahoo.searchdefinition.FieldSets; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.DocumentReferences; +import com.yahoo.schema.FieldSets; +import com.yahoo.schema.Schema; import java.io.Serializable; import java.util.ArrayList; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/schema/document/SDField.java index 382c0d0ceb5..668b6388620 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/SDField.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.document; +package com.yahoo.schema.document; import com.yahoo.document.CollectionDataType; import com.yahoo.document.DataType; @@ -14,10 +14,10 @@ import com.yahoo.documentmodel.TemporaryUnknownType; import com.yahoo.language.Linguistics; import com.yahoo.language.process.Embedder; import com.yahoo.language.simple.SimpleLinguistics; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.fieldoperation.FieldOperation; -import com.yahoo.searchdefinition.fieldoperation.FieldOperationContainer; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; +import com.yahoo.schema.fieldoperation.FieldOperation; +import com.yahoo.schema.fieldoperation.FieldOperationContainer; import com.yahoo.tensor.TensorType; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.indexinglanguage.ExpressionSearcher; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java b/config-model/src/main/java/com/yahoo/schema/document/Sorting.java index ef175f68ab8..2d0c9a5d27b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Sorting.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.document; +package com.yahoo.schema.document; import java.io.Serializable; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java b/config-model/src/main/java/com/yahoo/schema/document/Stemming.java index 5b4862d4643..5ec844e2540 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java +++ b/config-model/src/main/java/com/yahoo/schema/document/Stemming.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.document; +package com.yahoo.schema.document; import com.yahoo.language.process.StemMode; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedField.java b/config-model/src/main/java/com/yahoo/schema/document/TemporaryImportedField.java index fef5e25c402..efc0674586d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/TemporaryImportedField.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.document; +package com.yahoo.schema.document; /** * A field that is imported from a field in a referenced document type and given an alias name. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedFields.java b/config-model/src/main/java/com/yahoo/schema/document/TemporaryImportedFields.java index b4d76445507..7ad4feb6d32 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporaryImportedFields.java +++ b/config-model/src/main/java/com/yahoo/schema/document/TemporaryImportedFields.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.document; +package com.yahoo.schema.document; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Schema; import java.util.Collections; import java.util.HashMap; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java b/config-model/src/main/java/com/yahoo/schema/document/TemporarySDDocumentType.java index 1452ff430f3..3194a14a143 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDDocumentType.java +++ b/config-model/src/main/java/com/yahoo/schema/document/TemporarySDDocumentType.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.document; +package com.yahoo.schema.document; import com.yahoo.document.DataTypeName; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java b/config-model/src/main/java/com/yahoo/schema/document/TemporarySDField.java index 8c17b607f94..e455fa78455 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/TemporarySDField.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.document; +package com.yahoo.schema.document; import com.yahoo.document.DataType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TypedKey.java b/config-model/src/main/java/com/yahoo/schema/document/TypedKey.java index 767d6cc8009..8de8c7b64fd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TypedKey.java +++ b/config-model/src/main/java/com/yahoo/schema/document/TypedKey.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.document; +package com.yahoo.schema.document; import com.yahoo.document.DataType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/SDAnnotationType.java b/config-model/src/main/java/com/yahoo/schema/document/annotation/SDAnnotationType.java index b7ba2333b3c..3dc46a91c1b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/SDAnnotationType.java +++ b/config-model/src/main/java/com/yahoo/schema/document/annotation/SDAnnotationType.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.document.annotation; +package com.yahoo.schema.document.annotation; -import com.yahoo.searchdefinition.document.SDDocumentType; +import com.yahoo.schema.document.SDDocumentType; import com.yahoo.document.annotation.AnnotationType; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/TemporaryAnnotationReferenceDataType.java b/config-model/src/main/java/com/yahoo/schema/document/annotation/TemporaryAnnotationReferenceDataType.java index 717e778adb9..de9bd977823 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/TemporaryAnnotationReferenceDataType.java +++ b/config-model/src/main/java/com/yahoo/schema/document/annotation/TemporaryAnnotationReferenceDataType.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.document.annotation; +package com.yahoo.schema.document.annotation; import com.yahoo.document.annotation.AnnotationReferenceDataType; import com.yahoo.document.annotation.AnnotationType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/ConstantTensorTransformer.java index f6ed5abaa7f..4e320594918 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/ConstantTensorTransformer.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; -import com.yahoo.searchdefinition.FeatureNames; +import com.yahoo.schema.FeatureNames; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; import com.yahoo.searchlib.rankingexpression.evaluation.Value; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ExpressionTransforms.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/ExpressionTransforms.java index 1334a7a3aad..86aedd4332a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ExpressionTransforms.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/ExpressionTransforms.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; import com.google.common.collect.ImmutableList; import com.yahoo.searchlib.rankingexpression.RankingExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/FunctionInliner.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/FunctionInliner.java index 340eec278e3..382d51747bb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/FunctionInliner.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/FunctionInliner.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; -import com.yahoo.searchdefinition.RankProfile; +import com.yahoo.schema.RankProfile; import com.yahoo.searchlib.rankingexpression.rule.CompositeNode; import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode; import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/FunctionShadower.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/FunctionShadower.java index 1f0112194cf..702e4ea220e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/FunctionShadower.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/FunctionShadower.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; -import com.yahoo.searchdefinition.RankProfile; +import com.yahoo.schema.RankProfile; import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.searchlib.rankingexpression.rule.CompositeNode; import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/LightGBMFeatureConverter.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/LightGBMFeatureConverter.java index 1bccac237d5..af5fa5ebeab 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/LightGBMFeatureConverter.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/LightGBMFeatureConverter.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; import com.yahoo.path.Path; import com.yahoo.searchlib.rankingexpression.rule.Arguments; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxFeatureConverter.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxFeatureConverter.java index 6944a1f9dd1..2277491cd47 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxFeatureConverter.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxFeatureConverter.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; import com.yahoo.path.Path; import com.yahoo.searchlib.rankingexpression.rule.Arguments; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxModelTransformer.java index 58a9c78254a..4c38c257602 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/OnnxModelTransformer.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; import com.yahoo.path.Path; -import com.yahoo.searchdefinition.ImmutableSchema; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.RankProfile; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.RankProfile; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.searchlib.rankingexpression.rule.Arguments; import com.yahoo.searchlib.rankingexpression.rule.CompositeNode; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/RankProfileTransformContext.java index b284f9df325..cfc859345ad 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/RankProfileTransformContext.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.RankProfile; +import com.yahoo.schema.RankProfile; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.searchlib.rankingexpression.evaluation.DoubleValue; import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/TensorFlowFeatureConverter.java index 7b165d94cae..fd19c97036e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/TensorFlowFeatureConverter.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; import com.yahoo.path.Path; import com.yahoo.searchlib.rankingexpression.rule.Arguments; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TokenTransformer.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java index dbb32d88ef6..30d9a3766b3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TokenTransformer.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.searchlib.rankingexpression.evaluation.DoubleValue; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/XgboostFeatureConverter.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/XgboostFeatureConverter.java index 296ffd5f7fe..b05f9ba9166 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/XgboostFeatureConverter.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/XgboostFeatureConverter.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.expressiontransforms; +package com.yahoo.schema.expressiontransforms; import com.yahoo.path.Path; import com.yahoo.searchlib.rankingexpression.rule.Arguments; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AliasOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/AliasOperation.java index 1eb27cd31c2..b5648dde4fc 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AliasOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/AliasOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AttributeOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/AttributeOperation.java index e528b1a9971..3983137129d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/AttributeOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/AttributeOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.SDField; import com.yahoo.tensor.TensorType; import java.util.Locale; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BoldingOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/BoldingOperation.java index 63486a7656b..74e69e047ef 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BoldingOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/BoldingOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/DictionaryOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/DictionaryOperation.java index 5b2e0fb004f..a9a2ce7cbb1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/DictionaryOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/DictionaryOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.Dictionary; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.Dictionary; +import com.yahoo.schema.document.SDField; /** * Represents operations controlling setup of dictionary used for queries diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/FieldOperation.java index 2778a147a18..126f594c371 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/FieldOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; /** * An operation on a field. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperationContainer.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/FieldOperationContainer.java index f81b1e42449..d5e52fadffa 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/FieldOperationContainer.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/FieldOperationContainer.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IdOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/IdOperation.java index 2d9d2d0b8db..5e62742085f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IdOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/IdOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/IndexOperation.java index 4611f11f023..ab5ffa25f33 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/IndexOperation.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.fieldoperation; - -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Index.Type; -import com.yahoo.searchdefinition.document.BooleanIndexDefinition; -import com.yahoo.searchdefinition.document.HnswIndexParams; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; +package com.yahoo.schema.fieldoperation; + +import com.yahoo.schema.Index; +import com.yahoo.schema.Index.Type; +import com.yahoo.schema.document.BooleanIndexDefinition; +import com.yahoo.schema.document.HnswIndexParams; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; import java.util.LinkedList; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/IndexingOperation.java index cdd3cc386a4..bb79a45831e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexingOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/IndexingOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; import com.yahoo.language.Linguistics; import com.yahoo.language.process.Embedder; import com.yahoo.language.simple.SimpleLinguistics; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.parser.ParseException; -import com.yahoo.searchdefinition.parser.SimpleCharStream; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.parser.ParseException; +import com.yahoo.schema.parser.SimpleCharStream; import com.yahoo.vespa.indexinglanguage.ScriptParserContext; import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression; import com.yahoo.vespa.indexinglanguage.expressions.StatementExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/MatchOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/MatchOperation.java index 322f26bc0e3..a568b5b0f66 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/MatchOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/MatchOperation.java @@ -1,11 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.MatchAlgorithm; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.MatchAlgorithm; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.SDField; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/NormalizingOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/NormalizingOperation.java index cca7693119e..561c5b87899 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/NormalizingOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/NormalizingOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.NormalizeLevel; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.NormalizeLevel; +import com.yahoo.schema.document.SDField; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/QueryCommandOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/QueryCommandOperation.java index fc2dd303746..d0e9feb41e4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/QueryCommandOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/QueryCommandOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/RankOperation.java index df9095ffcc5..bbc6208ba1b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/RankOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankTypeOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/RankTypeOperation.java index 970e5bc0678..4a43a907549 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankTypeOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/RankTypeOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.Index; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.Index; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SortingOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SortingOperation.java index 148919c6de3..2e981a893ce 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SortingOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SortingOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Sorting; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Sorting; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StemmingOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/StemmingOperation.java index 6ee137ff38c..a4bb00b0d07 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StemmingOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/StemmingOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StructFieldOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/StructFieldOperation.java index 285e1d97242..ac80f5023fc 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StructFieldOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/StructFieldOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import java.util.Collections; import java.util.LinkedList; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldLongOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldLongOperation.java index f776f7b1cec..4576b7a34fe 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldLongOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldLongOperation.java @@ -1,13 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.fieldoperation; +package com.yahoo.schema.fieldoperation; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.Set; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldOperation.java index 5bd99fb3c8f..dd06d920aac 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldShortOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldShortOperation.java index e5b96940ac7..ccc22719f25 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldShortOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryInFieldShortOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryToOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryToOperation.java index 1378389c3e6..2d9cf3acf4e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryToOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/SummaryToOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; import java.util.Set; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/WeightOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/WeightOperation.java index cc3a0ba687b..57c28d9bdb5 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/WeightOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/WeightOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; /** * @author Einar M R Rosenvinge diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/WeightedSetOperation.java b/config-model/src/main/java/com/yahoo/schema/fieldoperation/WeightedSetOperation.java index 11d731f814d..8fb0cc9fcdb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/WeightedSetOperation.java +++ b/config-model/src/main/java/com/yahoo/schema/fieldoperation/WeightedSetOperation.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.fieldoperation; +package com.yahoo.schema.fieldoperation; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.document.Attribute; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import com.yahoo.document.WeightedSetDataType; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedFields.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java index 0e79356abd2..fa656b72530 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedFields.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java @@ -1,21 +1,21 @@ // 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.DataTypeName; -import com.yahoo.searchdefinition.parser.ConvertParsedTypes.TypeResolver; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.BooleanIndexDefinition; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.Dictionary; -import com.yahoo.searchdefinition.document.NormalizeLevel; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Sorting; -import com.yahoo.searchdefinition.document.annotation.SDAnnotationType; +import com.yahoo.schema.parser.ConvertParsedTypes.TypeResolver; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.BooleanIndexDefinition; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.Dictionary; +import com.yahoo.schema.document.NormalizeLevel; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Sorting; +import com.yahoo.schema.document.annotation.SDAnnotationType; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedRanking.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedRanking.java index 47d770f609e..bd628779b24 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedRanking.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedRanking.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.parser; +package com.yahoo.schema.parser; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.RankType; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.RankType; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java index 4c32f11c20d..f3289621ce1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; @@ -11,15 +11,15 @@ import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.document.DataType; import com.yahoo.document.DocumentTypeManager; -import com.yahoo.searchdefinition.DefaultRankProfile; -import com.yahoo.searchdefinition.DocumentOnlySchema; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.UnrankedRankProfile; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.TemporaryImportedField; -import com.yahoo.searchdefinition.parser.ConvertParsedTypes.TypeResolver; +import com.yahoo.schema.DefaultRankProfile; +import com.yahoo.schema.DocumentOnlySchema; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.UnrankedRankProfile; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.TemporaryImportedField; +import com.yahoo.schema.parser.ConvertParsedTypes.TypeResolver; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java index 7311c8a4216..9f1203ffc9f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.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.document.DataType; import com.yahoo.document.DocumentType; @@ -10,7 +10,7 @@ import com.yahoo.document.WeightedSetDataType; import com.yahoo.document.annotation.AnnotationReferenceDataType; import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.documentmodel.OwnedStructDataType; -import com.yahoo.searchdefinition.document.annotation.SDAnnotationType; +import com.yahoo.schema.document.annotation.SDAnnotationType; import java.util.ArrayList; import java.util.Collection; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertSchemaCollection.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertSchemaCollection.java index e46a6882bc7..5509d11885c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertSchemaCollection.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertSchemaCollection.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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; @@ -10,8 +10,8 @@ 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.DocumentTypeManager; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; import java.util.ArrayList; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/DictionaryOption.java b/config-model/src/main/java/com/yahoo/schema/parser/DictionaryOption.java index 095add74dd2..3acb51ace3f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/DictionaryOption.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/DictionaryOption.java @@ -1,4 +1,4 @@ -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; public enum DictionaryOption { HASH, BTREE, CASED, UNCASED diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/InheritanceResolver.java b/config-model/src/main/java/com/yahoo/schema/parser/InheritanceResolver.java index dbdcd4057e9..ad9acf2f095 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/InheritanceResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/InheritanceResolver.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 java.util.ArrayList; import java.util.HashMap; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java b/config-model/src/main/java/com/yahoo/schema/parser/IntermediateCollection.java index 8dd69085efb..8bb9bca3249 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/IntermediateCollection.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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; @@ -11,10 +11,8 @@ import com.yahoo.io.reader.NamedReader; import com.yahoo.yolean.Exceptions; import java.io.File; -import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAnnotation.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedAnnotation.java index 3baac504135..c36656838f7 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAnnotation.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedAnnotation.java @@ -1,4 +1,4 @@ -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; import java.util.ArrayList; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAttribute.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedAttribute.java index b48bad89114..be8d20fbe93 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAttribute.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedAttribute.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 java.util.LinkedHashMap; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedBlock.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedBlock.java index 151da352f2f..c20abf52bf3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedBlock.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedBlock.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; /** * Common methods for various Parsed* classes. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedDocument.java index ea138808289..281e7989885 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedDocument.java @@ -1,12 +1,10 @@ // 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 java.util.ArrayList; -import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Optional; /** * This class holds the extracted information after parsing a diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedDocumentSummary.java index 25adc6f134f..93469a86fe3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedDocumentSummary.java @@ -1,5 +1,5 @@ -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedField.java index fcbb62b1229..a4df2ac6dc2 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedField.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.parser; +package com.yahoo.schema.parser; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.document.Stemming; import java.util.ArrayList; import java.util.Collections; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedFieldSet.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedFieldSet.java index 9103ed46631..9e8906a41a4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedFieldSet.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedFieldSet.java @@ -1,4 +1,4 @@ -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; import java.util.ArrayList; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedIndex.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedIndex.java index a3504cd2bf7..cf70168e8d2 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedIndex.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedIndex.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.parser; +package com.yahoo.schema.parser; -import com.yahoo.searchdefinition.document.HnswIndexParams; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.document.HnswIndexParams; +import com.yahoo.schema.document.Stemming; import java.util.ArrayList; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedIndexingOp.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedIndexingOp.java index 4178de904de..3a2df2aac4c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedIndexingOp.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedIndexingOp.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.vespa.indexinglanguage.ExpressionSearcher; import com.yahoo.vespa.indexinglanguage.expressions.AttributeExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedMatchSettings.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedMatchSettings.java index 9b51521ad2b..4d3c45ad67f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedMatchSettings.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedMatchSettings.java @@ -1,8 +1,8 @@ -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.MatchAlgorithm; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.MatchAlgorithm; import java.util.Optional; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankFunction.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedRankFunction.java index a8ee9a24e69..73f1316d468 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankFunction.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedRankFunction.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 java.util.ArrayList; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankProfile.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedRankProfile.java index 8f0f92c4027..64dd8dd0ad4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedRankProfile.java @@ -1,15 +1,12 @@ // 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.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfile.MatchPhaseSettings; -import com.yahoo.searchdefinition.RankProfile.MutateOperation; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfile.MatchPhaseSettings; +import com.yahoo.schema.RankProfile.MutateOperation; import com.yahoo.searchlib.rankingexpression.FeatureList; import com.yahoo.searchlib.rankingexpression.Reference; -import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue; -import com.yahoo.searchlib.rankingexpression.evaluation.Value; -import com.yahoo.tensor.TensorType; import java.util.ArrayList; import java.util.Collections; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedSchema.java index 4c102594479..5ee483db044 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSchema.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedSchema.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.parser; +package com.yahoo.schema.parser; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.document.Stemming; import com.yahoo.searchlib.rankingexpression.Reference; import java.util.ArrayList; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSorting.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedSorting.java index 32c822bf25b..af84bbbb5bd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSorting.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedSorting.java @@ -1,8 +1,8 @@ -package com.yahoo.searchdefinition.parser; +package com.yahoo.schema.parser; -import com.yahoo.searchdefinition.document.Sorting.Function; -import com.yahoo.searchdefinition.document.Sorting.Strength; +import com.yahoo.schema.document.Sorting.Function; +import com.yahoo.schema.document.Sorting.Strength; import java.util.Optional; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java index 376fd592c9d..abe14b3689f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.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 java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSummaryField.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedSummaryField.java index 40e95045afd..38ee52c9d06 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedSummaryField.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedSummaryField.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 java.util.ArrayList; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedType.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedType.java index bcf8d8c9172..9c3206a333a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedType.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedType.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.tensor.TensorType; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/SimpleCharStream.java b/config-model/src/main/java/com/yahoo/schema/parser/SimpleCharStream.java index 0b275c6a722..0a53e0477ac 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/SimpleCharStream.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/SimpleCharStream.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.parser; +package com.yahoo.schema.parser; import com.yahoo.javacc.FastCharStream; /** * @author Simon Thoresen Hult */ -public class SimpleCharStream extends FastCharStream implements com.yahoo.searchdefinition.parser.CharStream, +public class SimpleCharStream extends FastCharStream implements com.yahoo.schema.parser.CharStream, com.yahoo.vespa.indexinglanguage.parser.CharStream { public SimpleCharStream(String input) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/Utils.java b/config-model/src/main/java/com/yahoo/schema/parser/Utils.java index e732bdad19c..cdb299c92df 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/Utils.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/Utils.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; /** * @author bjorncs diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java b/config-model/src/main/java/com/yahoo/schema/processing/AddAttributeTransformToSummaryOfImportedFields.java index 47ded54dcb6..d96cd88f6be 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/AddAttributeTransformToSummaryOfImportedFields.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableImportedComplexSDField; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableImportedComplexSDField; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java b/config-model/src/main/java/com/yahoo/schema/processing/AddExtraFieldsToDocument.java index 0be48d1fd25..ca81301da73 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/AddExtraFieldsToDocument.java @@ -1,21 +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.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.document.DataType; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.Field; -import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.model.container.search.QueryProfiles; /** - * This processor creates a {@link com.yahoo.searchdefinition.document.SDDocumentType} for each {@link Schema} + * This processor creates a {@link com.yahoo.schema.document.SDDocumentType} for each {@link Schema} * object which holds all the data that search * associates with a document described in a search definition file. This includes all extra fields, summary fields and * implicit fields. All non-indexed and non-summary fields are discarded. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java b/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.java index 254b3743f52..6c2d62f37cb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/AdjustPositionSummaryFields.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.config.application.api.DeployLogger; import com.yahoo.config.model.api.ModelContext; import com.yahoo.document.ArrayDataType; import com.yahoo.document.DataType; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryField.Source; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributeProperties.java b/config-model/src/main/java/com/yahoo/schema/processing/AttributeProperties.java index 42e14a2c1ee..6c7dbaecbfb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributeProperties.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/AttributeProperties.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributesImplicitWord.java b/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java index 3c10ccb92dc..415f23f2786 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AttributesImplicitWord.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/AttributesImplicitWord.java @@ -1,13 +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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.MatchType; import com.yahoo.document.NumericDataType; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Bolding.java b/config-model/src/main/java/com/yahoo/schema/processing/Bolding.java index 575a037be91..53a3d462d54 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Bolding.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/Bolding.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.Schema; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/BoolAttributeValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/BoolAttributeValidator.java index 6676e20c341..bdb1eed4b10 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/BoolAttributeValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/BoolAttributeValidator.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.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/BuiltInFieldSets.java b/config-model/src/main/java/com/yahoo/schema/processing/BuiltInFieldSets.java index ce93c1a5c3f..514cbf225fd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/BuiltInFieldSets.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/BuiltInFieldSets.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.config.application.api.DeployLogger; import com.yahoo.document.DocumentType; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java index d7882c7f8fb..5bb5079fab6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/CreatePositionZCurve.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.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.application.api.DeployLogger; import com.yahoo.config.model.api.ModelContext; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.ArrayDataType; import com.yahoo.document.DataType; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.GeoPos; +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.ExpressionConverter; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DictionaryProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/DictionaryProcessor.java index dc620e38e96..3209fd1703d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DictionaryProcessor.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/DictionaryProcessor.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.application.api.DeployLogger; import com.yahoo.document.NumericDataType; import com.yahoo.document.PrimitiveDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.Dictionary; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.Dictionary; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypes.java b/config-model/src/main/java/com/yahoo/schema/processing/DisallowComplexMapAndWsetKeyTypes.java index 6ffe00458a8..a5b4ca9a71f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DisallowComplexMapAndWsetKeyTypes.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/DisallowComplexMapAndWsetKeyTypes.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.application.api.DeployLogger; import com.yahoo.document.ArrayDataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.DataType; import com.yahoo.document.MapDataType; import com.yahoo.document.PrimitiveDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.document.WeightedSetDataType; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/DiversitySettingsValidator.java index 3759fc453df..0400292c7e5 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DiversitySettingsValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/DiversitySettingsValidator.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java b/config-model/src/main/java/com/yahoo/schema/processing/ExactMatch.java index ca473a2029f..aa2d8293cac 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ExactMatch.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ExactMatch.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.document.CollectionDataType; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; import com.yahoo.vespa.indexinglanguage.ExpressionSearcher; import com.yahoo.vespa.indexinglanguage.expressions.ExactExpression; import com.yahoo.vespa.indexinglanguage.expressions.Expression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FastAccessValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/FastAccessValidator.java index 60cc5c1cbb4..224000e6b64 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FastAccessValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/FastAccessValidator.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.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.stream.Collectors; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FieldSetSettings.java b/config-model/src/main/java/com/yahoo/schema/processing/FieldSetSettings.java index 1c50f78b539..f0c59ece1bf 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FieldSetSettings.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/FieldSetSettings.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.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.FieldSet; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.NormalizeLevel; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.FieldSet; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.Matching; +import com.yahoo.schema.document.NormalizeLevel; +import com.yahoo.schema.document.Stemming; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java b/config-model/src/main/java/com/yahoo/schema/processing/FilterFieldNames.java index 3f97bf83565..28973c82d42 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/FilterFieldNames.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/FilterFieldNames.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.RankProfile; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.Iterator; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java index 0db6f4f05ba..4080e37003f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaries.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaries.java @@ -1,20 +1,20 @@ // 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 java.util.logging.Level; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes; /** * Makes implicitly defined summaries into explicit summaries diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFields.java b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaryFields.java index df103dcb096..b17efbfe8e8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImplicitSummaryFields.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ImplicitSummaryFields.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.schema.RankProfileRegistry; import com.yahoo.document.DataType; -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/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/ImportedFieldsResolver.java index e836caac10d..ee465be44f2 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ImportedFieldsResolver.java @@ -1,30 +1,30 @@ // 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.document.DataType; import com.yahoo.document.PositionDataType; -import com.yahoo.searchdefinition.DocumentReference; -import com.yahoo.searchdefinition.DocumentReferences; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.ImportedComplexField; -import com.yahoo.searchdefinition.document.ImportedField; -import com.yahoo.searchdefinition.document.ImportedFields; -import com.yahoo.searchdefinition.document.ImportedSimpleField; -import com.yahoo.searchdefinition.document.TemporaryImportedField; +import com.yahoo.schema.DocumentReference; +import com.yahoo.schema.DocumentReferences; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.ImportedComplexField; +import com.yahoo.schema.document.ImportedField; +import com.yahoo.schema.document.ImportedFields; +import com.yahoo.schema.document.ImportedSimpleField; +import com.yahoo.schema.document.TemporaryImportedField; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isArrayOfSimpleStruct; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isMapOfPrimitiveType; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isMapOfSimpleStruct; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isArrayOfSimpleStruct; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isMapOfPrimitiveType; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isMapOfSimpleStruct; /** * Iterates all imported fields from schema parsing and validates and resolves them into concrete fields from referenced document types. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexFieldNames.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexFieldNames.java index 76e97ff0f2e..27101c47c7a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexFieldNames.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexFieldNames.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.document.SDField; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.Schema; import com.yahoo.vespa.model.container.search.QueryProfiles; /** @@ -37,7 +37,7 @@ public class IndexFieldNames extends Processor { * In {@link CreatePositionZCurve} we add some .position and .distance fields for pos fields. Make an exception for those for now. * TODO Vespa 8: Rename to _position and _distance and delete this method. * - * @param field an {@link com.yahoo.searchdefinition.document.SDField} + * @param field an {@link com.yahoo.schema.document.SDField} * @return true if allowed */ private boolean legalDottedPositionField(SDField field) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingInputs.java index e589bd8e91a..88e84d5289f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingInputs.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.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; import com.yahoo.vespa.indexinglanguage.expressions.Expression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingOutputs.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java index b10d839535d..ea65a223686 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingOutputs.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.DataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingValidation.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.java index 242f5dab308..d8c1fb3125f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingValidation.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingValidation.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.config.application.api.DeployLogger; import com.yahoo.document.ArrayDataType; import com.yahoo.document.DataType; import com.yahoo.document.MapDataType; import com.yahoo.document.WeightedSetDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.indexinglanguage.expressions.AttributeExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingValues.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingValues.java index 815e5a42df4..fa4b7d2bc40 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingValues.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingValues.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.indexinglanguage.expressions.Expression; import com.yahoo.vespa.indexinglanguage.expressions.InputExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java b/config-model/src/main/java/com/yahoo/schema/processing/IntegerIndex2Attribute.java index ff6224d8d19..1d8480a8e99 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IntegerIndex2Attribute.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/IntegerIndex2Attribute.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.NumericDataType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; import com.yahoo.vespa.indexinglanguage.expressions.AttributeExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java b/config-model/src/main/java/com/yahoo/schema/processing/LiteralBoost.java index afe004fd5f3..a84f895100a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/LiteralBoost.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/LiteralBoost.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.RankProfile; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.Iterator; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeAliases.java b/config-model/src/main/java/com/yahoo/schema/processing/MakeAliases.java index 14d75c6438e..7093242d0ac 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeAliases.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MakeAliases.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.Index; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.Index; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.ArrayList; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java b/config-model/src/main/java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.java index 49a56bafe2a..ea24bf0569d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MakeDefaultSummaryTheSuperSet.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MakeDefaultSummaryTheSuperSet.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfileRegistry; +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/main/java/com/yahoo/searchdefinition/processing/MatchConsistency.java b/config-model/src/main/java/com/yahoo/schema/processing/MatchConsistency.java index 6cb0a86b481..5fb59e53ba9 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchConsistency.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MatchConsistency.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; import com.yahoo.vespa.indexinglanguage.expressions.Expression; import com.yahoo.vespa.indexinglanguage.expressions.IndexExpression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/MatchPhaseSettingsValidator.java index 4eae6b47833..7c1c255097f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchPhaseSettingsValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MatchPhaseSettingsValidator.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/MatchedElementsOnlyResolver.java index 299f28ca573..ed95f87d7d6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MatchedElementsOnlyResolver.java @@ -1,21 +1,21 @@ // 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.document.ArrayDataType; import com.yahoo.document.DataType; import com.yahoo.document.WeightedSetDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ComplexAttributeFieldUtils; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isSupportedComplexField; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isSupportedComplexField; /** * Iterates all summary fields with 'matched-elements-only' and adjusts transform (if all struct-fields are attributes) diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MultifieldIndexHarmonizer.java b/config-model/src/main/java/com/yahoo/schema/processing/MultifieldIndexHarmonizer.java index 39220b8cf8f..3a889085871 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MultifieldIndexHarmonizer.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MultifieldIndexHarmonizer.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.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.processing.multifieldresolver.IndexCommandResolver; -import com.yahoo.searchdefinition.processing.multifieldresolver.RankTypeResolver; -import com.yahoo.searchdefinition.processing.multifieldresolver.StemmingResolver; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.processing.multifieldresolver.IndexCommandResolver; +import com.yahoo.schema.processing.multifieldresolver.RankTypeResolver; +import com.yahoo.schema.processing.multifieldresolver.StemmingResolver; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MutableAttributes.java b/config-model/src/main/java/com/yahoo/schema/processing/MutableAttributes.java index 198f89caddb..854f6b2dddb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/MutableAttributes.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/MutableAttributes.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.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.container.search.QueryProfiles; public class MutableAttributes extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java b/config-model/src/main/java/com/yahoo/schema/processing/NGramMatch.java index 2ba149925e9..f1ff910be43 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/NGramMatch.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/NGramMatch.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.document.CollectionDataType; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; import com.yahoo.vespa.indexinglanguage.expressions.*; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelConfigGenerator.java b/config-model/src/main/java/com/yahoo/schema/processing/OnnxModelConfigGenerator.java index 70ce051bb21..ce56a4320d3 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelConfigGenerator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/OnnxModelConfigGenerator.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.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.expressiontransforms.OnnxModelTransformer; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.expressiontransforms.OnnxModelTransformer; import com.yahoo.searchlib.rankingexpression.rule.CompositeNode; import com.yahoo.searchlib.rankingexpression.rule.ConstantNode; import com.yahoo.searchlib.rankingexpression.rule.ExpressionNode; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelTypeResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/OnnxModelTypeResolver.java index 83e0c367292..32229ea635b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/OnnxModelTypeResolver.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; import com.yahoo.vespa.model.container.search.QueryProfiles; import com.yahoo.vespa.model.ml.OnnxModelInfo; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OptimizeIlscript.java b/config-model/src/main/java/com/yahoo/schema/processing/OptimizeIlscript.java index 3175862e900..a3b026fb724 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OptimizeIlscript.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/OptimizeIlscript.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.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.indexinglanguage.ExpressionOptimizer; import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/PagedAttributeValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/PagedAttributeValidator.java index 2ca4abae2c4..34bb6e1db2e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/PagedAttributeValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/PagedAttributeValidator.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.tensor.TensorType; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.java index d7ae4c33fe1..280eae3d88b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/PredicateProcessor.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.DataType; import com.yahoo.document.datatypes.IntegerFieldValue; import com.yahoo.document.datatypes.LongFieldValue; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.BooleanIndexDefinition; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Index; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.BooleanIndexDefinition; +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/main/java/com/yahoo/searchdefinition/processing/Processing.java b/config-model/src/main/java/com/yahoo/schema/processing/Processing.java index c0ee0b5df53..63eca2121c1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processing.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/Processing.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.Schema; -import com.yahoo.searchdefinition.processing.multifieldresolver.RankProfileTypeSettingsProcessor; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.processing.multifieldresolver.RankProfileTypeSettingsProcessor; import com.yahoo.vespa.model.container.search.QueryProfiles; import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.deploy.TestProperties; @@ -113,7 +113,7 @@ public class Processing { * * @param schema the search to process * @param deployLogger the log to log messages and warnings for application deployment to - * @param rankProfileRegistry a {@link com.yahoo.searchdefinition.RankProfileRegistry} + * @param rankProfileRegistry a {@link com.yahoo.schema.RankProfileRegistry} * @param queryProfiles the query profiles contained in the application this search is part of * @param processorsToSkip a set of processor classes we should not invoke in this. Useful for testing. */ @@ -132,7 +132,7 @@ public class Processing { * Runs rank profiles processors only. * * @param deployLogger the log to log messages and warnings for application deployment to - * @param rankProfileRegistry a {@link com.yahoo.searchdefinition.RankProfileRegistry} + * @param rankProfileRegistry a {@link com.yahoo.schema.RankProfileRegistry} * @param queryProfiles the query profiles contained in the application this search is part of */ public void processRankProfiles(DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java b/config-model/src/main/java/com/yahoo/schema/processing/Processor.java index 590681ffb86..9768f33c27d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/Processor.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/Processor.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.application.api.DeployLogger; import com.yahoo.config.model.api.ModelContext; import com.yahoo.document.DataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.Index; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.Iterator; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/RankingExpressionTypeResolver.java index fdf1dc187cf..07f79f16334 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/RankingExpressionTypeResolver.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.config.application.api.DeployLogger; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.MapEvaluationTypeContext; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.MapEvaluationTypeContext; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.searchlib.rankingexpression.Reference; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReferenceFieldsProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.java index 09fdf9c65f6..43e39b1e546 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReferenceFieldsProcessor.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ReferenceFieldsProcessor.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedDocumentNames.java b/config-model/src/main/java/com/yahoo/schema/processing/ReservedDocumentNames.java index 4a39a52a005..7eaf690d899 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedDocumentNames.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ReservedDocumentNames.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.Schema; -import com.yahoo.searchdefinition.document.SDDocumentType; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDDocumentType; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.HashSet; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedFunctionNames.java b/config-model/src/main/java/com/yahoo/schema/processing/ReservedFunctionNames.java index f4f920d9ec8..1ec4d5b58f2 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedFunctionNames.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ReservedFunctionNames.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.processing; +package com.yahoo.schema.processing; import com.google.common.collect.ImmutableSet; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; import com.yahoo.searchlib.rankingexpression.parser.RankingExpressionParserConstants; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SearchMustHaveDocument.java b/config-model/src/main/java/com/yahoo/schema/processing/SearchMustHaveDocument.java index 68717f1f06b..b90a5fdec98 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SearchMustHaveDocument.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SearchMustHaveDocument.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java b/config-model/src/main/java/com/yahoo/schema/processing/SetRankTypeEmptyOnFilters.java index 6631258813a..f84d6f19145 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SetRankTypeEmptyOnFilters.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SetRankTypeEmptyOnFilters.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SortingSettings.java b/config-model/src/main/java/com/yahoo/schema/processing/SortingSettings.java index 33e9634323b..e0dfbab9780 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SortingSettings.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SortingSettings.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Sorting; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Sorting; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/StringSettingsOnNonStringFields.java b/config-model/src/main/java/com/yahoo/schema/processing/StringSettingsOnNonStringFields.java index 8c6b07515aa..8ca0b595907 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/StringSettingsOnNonStringFields.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/StringSettingsOnNonStringFields.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.CollectionDataType; import com.yahoo.document.NumericDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.container.search.QueryProfiles; public class StringSettingsOnNonStringFields extends Processor { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java b/config-model/src/main/java/com/yahoo/schema/processing/SummaryConsistency.java index e2e0cf94bb8..4fb45c3c68f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryConsistency.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SummaryConsistency.java @@ -1,20 +1,20 @@ // 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.document.DataType; import com.yahoo.document.TensorDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.document.WeightedSetDataType; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes; /** * Ensure that summary field transforms for fields having the same name diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/SummaryDiskAccessValidator.java index 0741b0fd6f1..40c38a350b0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SummaryDiskAccessValidator.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.SummaryClass; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.SummaryClass; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; @@ -14,7 +14,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.Optional; import java.util.logging.Level; -import static com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes; +import static com.yahoo.schema.document.ComplexAttributeFieldUtils.isComplexFieldWithOnlyStructFieldAttributes; /** * Emits a warning for summaries which accesses disk. diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDynamicStructsArrays.java b/config-model/src/main/java/com/yahoo/schema/processing/SummaryDynamicStructsArrays.java index c350c6800ed..ed1f47611eb 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDynamicStructsArrays.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SummaryDynamicStructsArrays.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.*; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java b/config-model/src/main/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSource.java index c6f5b35aaa8..c8f201e2915 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryFieldsMustHaveValidSource.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SummaryFieldsMustHaveValidSource.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.Schema; -import com.yahoo.searchdefinition.derived.SummaryClass; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.SummaryClass; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryNamesFieldCollisions.java b/config-model/src/main/java/com/yahoo/schema/processing/SummaryNamesFieldCollisions.java index 2d0afe88281..da5dfeb407b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryNamesFieldCollisions.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/SummaryNamesFieldCollisions.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 java.util.HashMap; import java.util.Map; import com.yahoo.collections.Pair; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryField.Source; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java b/config-model/src/main/java/com/yahoo/schema/processing/TagType.java index 357575660ea..f511d572bc6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TagType.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/TagType.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.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.*; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Matching; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/TensorFieldProcessor.java index a253076f320..e0ce9917179 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TensorFieldProcessor.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/TensorFieldProcessor.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.application.api.DeployLogger; import com.yahoo.document.CollectionDataType; import com.yahoo.document.TensorDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.HnswIndexParams; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.HnswIndexParams; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TextMatch.java b/config-model/src/main/java/com/yahoo/schema/processing/TextMatch.java index c2b41edf454..1783a3c7c63 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TextMatch.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/TextMatch.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.document.CollectionDataType; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; import com.yahoo.vespa.indexinglanguage.expressions.Expression; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TypedTransformProvider.java b/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java index d6fdb901ab7..1836cd631ad 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/TypedTransformProvider.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.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.document.DataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.vespa.indexinglanguage.ValueTransformProvider; import com.yahoo.vespa.indexinglanguage.expressions.*; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java b/config-model/src/main/java/com/yahoo/schema/processing/UriHack.java index 7397f9a289c..a4773a42ed6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/UriHack.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.application.api.DeployLogger; import com.yahoo.document.ArrayDataType; import com.yahoo.document.CollectionDataType; import com.yahoo.document.DataType; import com.yahoo.document.WeightedSetDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.Arrays; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UrlFieldValidator.java b/config-model/src/main/java/com/yahoo/schema/processing/UrlFieldValidator.java index 72f903f8365..63d4a342c72 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UrlFieldValidator.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/UrlFieldValidator.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.processing; +package com.yahoo.schema.processing; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.document.DataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java b/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypes.java index 68bf2511a4b..2327cf4d9c9 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypes.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypes.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.config.application.api.DeployLogger; import com.yahoo.document.DataType; import com.yahoo.document.TensorDataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; import com.yahoo.vespa.documentmodel.DocumentSummary; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesDocumentsOnly.java b/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypesDocumentsOnly.java index e8b218a80ad..08771b40fe9 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesDocumentsOnly.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypesDocumentsOnly.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.document.DataType; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; import com.yahoo.vespa.model.container.search.QueryProfiles; import java.util.HashMap; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java b/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldWithIndexSettingsCreatesIndex.java index 268a9f27b3c..5423defa74a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateFieldWithIndexSettingsCreatesIndex.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldWithIndexSettingsCreatesIndex.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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.Ranking; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.document.Matching; +import com.yahoo.schema.document.Ranking; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.Schema; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateStructTypeInheritance.java b/config-model/src/main/java/com/yahoo/schema/processing/ValidateStructTypeInheritance.java index d99832e3df6..cad555a24b1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ValidateStructTypeInheritance.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/ValidateStructTypeInheritance.java @@ -1,21 +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.Schema; +import com.yahoo.schema.Schema; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; +import com.yahoo.schema.RankProfileRegistry; import com.yahoo.vespa.model.container.search.QueryProfiles; -import com.yahoo.document.DataType; import com.yahoo.document.Field; -import com.yahoo.document.StructDataType; -import com.yahoo.searchdefinition.document.SDDocumentType; +import com.yahoo.schema.document.SDDocumentType; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; import java.util.HashSet; -import java.util.Set; /** * @author arnej diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java b/config-model/src/main/java/com/yahoo/schema/processing/WordMatch.java index 2a1afd616bc..1e312b71afd 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/WordMatch.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/WordMatch.java @@ -1,13 +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.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; +import com.yahoo.schema.Schema; import com.yahoo.vespa.model.container.search.QueryProfiles; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/IndexCommandResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/IndexCommandResolver.java index 56926436545..565a377f2a9 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/IndexCommandResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/IndexCommandResolver.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.multifieldresolver; +package com.yahoo.schema.processing.multifieldresolver; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.Schema; import java.util.ArrayList; import java.util.Arrays; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/MultiFieldResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/MultiFieldResolver.java index 80bb4faeaa5..ed8ad61706b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/MultiFieldResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/MultiFieldResolver.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.multifieldresolver; +package com.yahoo.schema.processing.multifieldresolver; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.Schema; import java.util.List; /** diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java index fb7e67f2aab..3d79ac7d68a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankProfileTypeSettingsProcessor.java @@ -1,20 +1,20 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchdefinition.processing.multifieldresolver; +package com.yahoo.schema.processing.multifieldresolver; import com.yahoo.config.application.api.DeployLogger; 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.TensorFieldType; -import com.yahoo.searchdefinition.FeatureNames; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.ImportedField; -import com.yahoo.searchdefinition.document.ImportedFields; -import com.yahoo.searchdefinition.processing.Processor; +import com.yahoo.schema.FeatureNames; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.ImportedField; +import com.yahoo.schema.document.ImportedFields; +import com.yahoo.schema.processing.Processor; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.tensor.TensorType; import com.yahoo.vespa.model.container.search.QueryProfiles; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.java index 231a97f30ec..6424fd8ba06 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/RankTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/RankTypeResolver.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.multifieldresolver; +package com.yahoo.schema.processing.multifieldresolver; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.document.RankType; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.document.RankType; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.Schema; import java.util.List; import java.util.logging.Level; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/StemmingResolver.java index 1bcf646c8ec..95d9a50a6ab 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/multifieldresolver/StemmingResolver.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.multifieldresolver; +package com.yahoo.schema.processing.multifieldresolver; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.document.Stemming; import java.util.List; import java.util.logging.Level; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/package-info.java b/config-model/src/main/java/com/yahoo/schema/processing/package-info.java index 9d259154373..e81d50897ac 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/package-info.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/package-info.java @@ -11,4 +11,4 @@ * New processors must be added to the list in Processing. */ @com.yahoo.api.annotations.PackageMarker -package com.yahoo.searchdefinition.processing; +package com.yahoo.schema.processing; diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java index a63728c403d..df78118009d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java +++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DataTypeRecognizer.java @@ -13,13 +13,12 @@ import com.yahoo.document.TensorDataType; import com.yahoo.document.WeightedSetDataType; import com.yahoo.document.annotation.AnnotationType; import com.yahoo.document.annotation.AnnotationReferenceDataType; -import com.yahoo.document.internal.GeoPosType; import com.yahoo.documentmodel.DataTypeCollection; import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.documentmodel.NewDocumentType; import com.yahoo.documentmodel.OwnedStructDataType; import com.yahoo.documentmodel.VespaDocumentType; -import com.yahoo.searchdefinition.document.annotation.SDAnnotationType; +import com.yahoo.schema.document.annotation.SDAnnotationType; import java.util.*; diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java index 986746bd80c..1974774f7b5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java +++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java @@ -2,26 +2,21 @@ package com.yahoo.vespa.configmodel.producers; import com.yahoo.document.config.DocumentmanagerConfig; -import static com.yahoo.document.config.DocumentmanagerConfig.*; import com.yahoo.document.*; import com.yahoo.document.annotation.AnnotationReferenceDataType; import com.yahoo.document.annotation.AnnotationType; -import com.yahoo.documentmodel.DataTypeCollection; import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.documentmodel.NewDocumentType; import com.yahoo.documentmodel.OwnedTemporaryType; import com.yahoo.documentmodel.TemporaryUnknownType; import com.yahoo.documentmodel.VespaDocumentType; -import com.yahoo.searchdefinition.document.FieldSet; +import com.yahoo.schema.document.FieldSet; import com.yahoo.vespa.documentmodel.DocumentModel; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java index 771d7c17162..bb57cd189c9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java +++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java @@ -5,13 +5,12 @@ import com.yahoo.document.*; import com.yahoo.document.config.DocumenttypesConfig; import com.yahoo.document.annotation.AnnotationReferenceDataType; import com.yahoo.document.annotation.AnnotationType; -import com.yahoo.documentmodel.DataTypeCollection; import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.documentmodel.NewDocumentType; import com.yahoo.documentmodel.OwnedTemporaryType; import com.yahoo.documentmodel.TemporaryUnknownType; import com.yahoo.documentmodel.VespaDocumentType; -import com.yahoo.searchdefinition.document.FieldSet; +import com.yahoo.schema.document.FieldSet; import com.yahoo.vespa.documentmodel.DocumentModel; import java.util.*; diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java index 2edc845d6b7..337f5e11329 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java @@ -2,11 +2,9 @@ package com.yahoo.vespa.documentmodel; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Schema; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java index da3070af55f..92a75cb051b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.documentmodel; import com.yahoo.document.DataType; import com.yahoo.document.Field; -import com.yahoo.searchdefinition.document.TypedKey; +import com.yahoo.schema.document.TypedKey; import java.io.Serializable; import java.util.*; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 149326130be..a919c19d754 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -11,7 +11,6 @@ import com.yahoo.config.FileReference; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.application.api.ValidationId; import com.yahoo.config.application.api.ValidationOverrides; import com.yahoo.config.model.ApplicationConfigProducerRoot; @@ -30,15 +29,14 @@ import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.container.QrConfig; import com.yahoo.path.Path; -import com.yahoo.searchdefinition.LargeRankExpressions; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.derived.FileDistributedOnnxModels; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.RankProfileRegistry; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.RankProfileList; -import com.yahoo.searchdefinition.document.SDField; -import com.yahoo.searchdefinition.processing.Processing; +import com.yahoo.schema.LargeRankExpressions; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.RankProfileRegistry; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.RankProfileList; +import com.yahoo.schema.document.SDField; +import com.yahoo.schema.processing.Processing; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.ConfigPayloadBuilder; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidator.java index d145ce6bd24..01bf846d4cb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidator.java @@ -2,11 +2,11 @@ package com.yahoo.vespa.model.application.validation; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.SchemaInfo; -import com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils; -import com.yahoo.searchdefinition.document.GeoPos; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.SchemaInfo; +import com.yahoo.schema.document.ComplexAttributeFieldUtils; +import com.yahoo.schema.document.GeoPos; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.search.SearchCluster; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java index fb70f2b769c..bc91c7cbad2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantValidator.java @@ -6,9 +6,9 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.path.Path; -import com.yahoo.searchdefinition.DistributableResource; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.DistributableResource; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.Schema; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.application.validation.ConstantTensorJsonValidator.InvalidConstantTensorException; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/NoPrefixForIndexes.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/NoPrefixForIndexes.java index 9de9c34737f..03f3cdba6cf 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/NoPrefixForIndexes.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/NoPrefixForIndexes.java @@ -2,11 +2,11 @@ package com.yahoo.vespa.model.application.validation; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.MatchAlgorithm; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.MatchAlgorithm; +import com.yahoo.schema.Index; +import com.yahoo.schema.derived.DerivedConfiguration; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.search.SearchCluster; import com.yahoo.vespa.model.search.DocumentDatabase; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java index 3492ccf0b21..5c531d28a8e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java @@ -10,7 +10,7 @@ import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.io.IOUtils; import com.yahoo.log.InvalidLogFormatException; import com.yahoo.log.LogMessage; -import com.yahoo.searchdefinition.DistributableResource; +import com.yahoo.schema.DistributableResource; import com.yahoo.system.ProcessExecuter; import com.yahoo.text.StringUtilities; import com.yahoo.vespa.config.search.AttributesConfig; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java index 162cbe7495f..f62247d788e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java @@ -11,10 +11,10 @@ import com.yahoo.documentmodel.NewDocumentReferenceDataType; import com.yahoo.document.StructDataType; import com.yahoo.document.TensorDataType; import com.yahoo.document.WeightedSetDataType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.SchemaInfo; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.SchemaInfo; +import com.yahoo.schema.document.SDDocumentType; +import com.yahoo.schema.document.SDField; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.search.SearchCluster; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java index 438b28948c6..458f8dfbd68 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/StreamingValidator.java @@ -6,9 +6,9 @@ import com.yahoo.config.model.deploy.DeployState; import com.yahoo.document.DataType; import com.yahoo.document.NumericDataType; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.MatchType; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.MatchType; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.search.SearchCluster; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java index 2820d0984db..0563aa02149 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StreamingSearchClusterChangeValidator.java @@ -6,8 +6,8 @@ import com.yahoo.config.model.api.ConfigChangeAction; import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.documentmodel.NewDocumentType; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.document.Attribute; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.document.Attribute; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.application.validation.change.search.ChangeMessageBuilder; import com.yahoo.vespa.model.application.validation.change.search.DocumentTypeChangeValidator; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java index 2a3c5fdc6b0..432424c8027 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidator.java @@ -5,12 +5,12 @@ import com.yahoo.config.application.api.ValidationId; import com.yahoo.config.application.api.ValidationOverrides; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.documentmodel.NewDocumentType; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.IndexSchema; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.Case; -import com.yahoo.searchdefinition.document.Dictionary; -import com.yahoo.searchdefinition.document.HnswIndexParams; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.IndexSchema; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.Case; +import com.yahoo.schema.document.Dictionary; +import com.yahoo.schema.document.HnswIndexParams; import com.yahoo.vespa.model.application.validation.change.VespaConfigChangeAction; import com.yahoo.vespa.model.application.validation.change.VespaRestartAction; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.java index b461b38c75f..bbfa939f8a3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeMessageBuilder.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.vespa.model.application.validation.change.search; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableSDField; -import com.yahoo.searchdefinition.document.Matching; -import com.yahoo.searchdefinition.document.MatchType; -import com.yahoo.searchdefinition.document.NormalizeLevel; -import com.yahoo.searchdefinition.document.Stemming; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableSDField; +import com.yahoo.schema.document.Matching; +import com.yahoo.schema.document.MatchType; +import com.yahoo.schema.document.NormalizeLevel; +import com.yahoo.schema.document.Stemming; import com.yahoo.vespa.documentmodel.SummaryField; import com.yahoo.vespa.documentmodel.SummaryTransform; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java index f6f6b6abdee..a6fcfd652a0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java @@ -3,8 +3,8 @@ package com.yahoo.vespa.model.application.validation.change.search; import com.yahoo.config.application.api.ValidationId; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.document.ImmutableSDField; +import com.yahoo.schema.Schema; +import com.yahoo.schema.document.ImmutableSDField; import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.indexinglanguage.expressions.Expression; import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java index a10d2c36de1..0909afb71e9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java @@ -8,9 +8,9 @@ import com.yahoo.document.Field; import com.yahoo.document.MapDataType; import com.yahoo.document.StructDataType; import com.yahoo.documentmodel.NewDocumentType; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.document.Attribute; -import com.yahoo.searchdefinition.document.ComplexAttributeFieldUtils; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.document.Attribute; +import com.yahoo.schema.document.ComplexAttributeFieldUtils; import com.yahoo.vespa.model.application.validation.change.VespaConfigChangeAction; import com.yahoo.vespa.model.application.validation.change.VespaRestartAction; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java index 40df899c94d..cb8e6ba85ff 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.model.container; import ai.vespa.models.evaluation.ModelsEvaluator; import com.yahoo.osgi.provider.model.ComponentModel; -import com.yahoo.searchdefinition.derived.RankProfileList; +import com.yahoo.schema.derived.RankProfileList; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.core.OnnxModelsConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTester.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTester.java index 6532fed9abf..4afde25cafd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTester.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTester.java @@ -18,7 +18,7 @@ import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.filedistribution.fileacquirer.FileAcquirer; import com.yahoo.filedistribution.fileacquirer.MockFileAcquirer; import com.yahoo.io.IOUtils; -import com.yahoo.searchdefinition.derived.RankProfileList; +import com.yahoo.schema.derived.RankProfileList; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.core.OnnxModelsConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java index 708e7c75ac8..97c3f85dced 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java @@ -8,7 +8,7 @@ import com.yahoo.search.config.SchemaInfoConfig; import com.yahoo.search.pagetemplates.PageTemplatesConfig; import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry; import com.yahoo.search.query.profile.config.QueryProfilesConfig; -import com.yahoo.searchdefinition.derived.SchemaInfo; +import com.yahoo.schema.derived.SchemaInfo; import com.yahoo.vespa.configdefinition.IlscriptsConfig; import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.Component; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java index 1ea84a33d2d..3d409263d8a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java @@ -7,7 +7,7 @@ import com.yahoo.component.chain.model.ChainSpecification; import com.yahoo.component.chain.model.ChainedComponentModel; import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig; import com.yahoo.prelude.cluster.QrMonitorConfig; -import com.yahoo.searchdefinition.derived.SchemaInfo; +import com.yahoo.schema.derived.SchemaInfo; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.search.config.ClusterConfig; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 5d8d36caa5e..0bd93c6d0df 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -34,8 +34,8 @@ import com.yahoo.config.provision.Zone; import com.yahoo.container.logging.FileConnectionLog; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.search.rendering.RendererRegistry; -import com.yahoo.searchdefinition.OnnxModel; -import com.yahoo.searchdefinition.derived.RankProfileList; +import com.yahoo.schema.OnnxModel; +import com.yahoo.schema.derived.RankProfileList; import com.yahoo.security.X509CertificateUtils; import com.yahoo.text.XML; import com.yahoo.vespa.defaults.Defaults; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index 2d01f9d903e..4be5153293f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -5,8 +5,8 @@ import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.documentmodel.NewDocumentType; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.SchemaInfo; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.SchemaInfo; import com.yahoo.vespa.config.search.DispatchConfig; import com.yahoo.vespa.config.search.core.ProtonConfig; import com.yahoo.vespa.model.builder.xml.dom.DomSearchTuningBuilder; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java index 255ce3a95f6..9ba87fd24bf 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java @@ -11,9 +11,9 @@ import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; import com.yahoo.search.query.profile.QueryProfileRegistry; -import com.yahoo.searchdefinition.FeatureNames; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.expressiontransforms.RankProfileTransformContext; +import com.yahoo.schema.FeatureNames; +import com.yahoo.schema.RankProfile; +import com.yahoo.schema.expressiontransforms.RankProfileTransformContext; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.searchlib.rankingexpression.Reference; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java index e628907068d..64a1015d056 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.model.search; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.search.config.SchemaInfoConfig; -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.ImportedFieldsConfig; import com.yahoo.vespa.config.search.IndexschemaConfig; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index 44e574199ea..d63ae451f39 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -7,9 +7,9 @@ import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig; import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.search.config.SchemaInfoConfig; -import com.yahoo.searchdefinition.DocumentOnlySchema; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; -import com.yahoo.searchdefinition.derived.SchemaInfo; +import com.yahoo.schema.DocumentOnlySchema; +import com.yahoo.schema.derived.DerivedConfiguration; +import com.yahoo.schema.derived.SchemaInfo; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.config.search.DispatchConfig; import com.yahoo.vespa.config.search.DispatchConfig.DistributionPolicy; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java index b4082308195..06a5929a430 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SchemaDefinitionXMLHandler.java @@ -1,11 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.search; -import com.yahoo.searchdefinition.Schema; +import com.yahoo.schema.Schema; import com.yahoo.vespa.model.builder.xml.dom.ModelElement; import java.io.Serializable; -import java.util.Collection; import java.util.List; /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java index 1141af6d79d..d727e6d6395 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java @@ -3,11 +3,8 @@ package com.yahoo.vespa.model.search; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.search.config.SchemaInfoConfig; -import com.yahoo.searchdefinition.RankProfile; -import com.yahoo.searchdefinition.derived.SchemaInfo; -import com.yahoo.searchdefinition.derived.SummaryMap; -import com.yahoo.searchlib.rankingexpression.Reference; -import com.yahoo.tensor.TensorType; +import com.yahoo.schema.derived.SchemaInfo; +import com.yahoo.schema.derived.SummaryMap; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.SummaryConfig; import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig; @@ -15,7 +12,7 @@ import com.yahoo.vespa.config.search.SummarymapConfig; import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; +import com.yahoo.schema.derived.DerivedConfiguration; import com.yahoo.config.model.producer.AbstractConfigProducer; import java.util.Collections; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java index 09ed8bad403..724ba70510f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java @@ -4,9 +4,9 @@ package com.yahoo.vespa.model.search; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig; -import com.yahoo.searchdefinition.Schema; -import com.yahoo.searchdefinition.derived.AttributeFields; -import com.yahoo.searchdefinition.derived.DerivedConfiguration; +import com.yahoo.schema.Schema; +import com.yahoo.schema.derived.AttributeFields; +import com.yahoo.schema.derived.DerivedConfiguration; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.SummaryConfig; |