diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-01-04 11:48:14 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-01-04 11:48:14 +0100 |
commit | 1d04a279451b57014451f2d22655e53a470f9fec (patch) | |
tree | bd7cb02af50d239b6e01e94e390f43d0dd647a4e /config-model | |
parent | 83d87a29cfc311483c433f7bc00135cb97de7af5 (diff) |
Avoid deprecated APIs
Diffstat (limited to 'config-model')
3 files changed, 6 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java index b29e4704f62..02f5a8c12c4 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java @@ -14,7 +14,7 @@ import com.yahoo.document.PositionDataType; */ public class VespaDocumentType { - public static NewDocumentType INSTANCE = newInstance(); + public static final NewDocumentType INSTANCE = newInstance(); public static final DataTypeName NAME = new DataTypeName("document"); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java index 52fd5286bcf..d484d32b02f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -517,7 +517,7 @@ public class RankProfile implements Cloneable { public void setInheritedSummaryFeatures(String parentProfile) { if ( ! parentProfile.equals(inheritedName)) throw new IllegalArgumentException("This can only inherit the summary features of its parent, '" + - inheritedName + ", but attemtping to inherit '" + parentProfile); + inheritedName + ", but attempting to inherit '" + parentProfile); this.inheritedSummaryFeatures = parentProfile; } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java index 60b06d3655c..e627f06ad42 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java @@ -31,8 +31,8 @@ import java.util.Set; * implicitly acquiring their fields as it's own. If a document is not set to inherit * any document, it will always inherit the document "document.0". * - * @author Thomas Gundersen - * @author bratseth + * @author Thomas Gundersen + * @author bratseth */ public class SDDocumentType implements Cloneable, Serializable { @@ -42,7 +42,8 @@ public class SDDocumentType implements Cloneable, Serializable { private final AnnotationTypeRegistry annotationTypes = new AnnotationTypeRegistry(); private DocumentType docType; private DataType structType; - // The field sets here are set from the processing step in SD, to ensure that the full Search and this SDDocumentType is built first. + // The field sets here are set from the processing step in SD, + // to ensure that the full Search and this SDDocumentType is built first. private FieldSets fieldSets; // Document references private Optional<DocumentReferences> documentReferences = Optional.empty(); |