diff options
3 files changed, 17 insertions, 47 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/Schema.java b/config-model/src/main/java/com/yahoo/schema/Schema.java index 6548907000a..279b5729ea1 100644 --- a/config-model/src/main/java/com/yahoo/schema/Schema.java +++ b/config-model/src/main/java/com/yahoo/schema/Schema.java @@ -293,8 +293,7 @@ public class Schema implements ImmutableSchema { @Override public List<ImmutableSDField> allFieldsList() { - List<ImmutableSDField> all = new ArrayList<>(); - all.addAll(extraFieldList()); + List<ImmutableSDField> all = new ArrayList<>(extraFieldList()); for (Field field : documentType.fieldSet()) { all.add((ImmutableSDField) field); } @@ -668,11 +667,10 @@ public class Schema implements ImmutableSchema { @Override public boolean equals(Object o) { - if (!(o instanceof Schema)) { + if (!(o instanceof Schema other)) { return false; } - Schema other = (Schema)o; return getName().equals(other.getName()); } @@ -688,7 +686,7 @@ public class Schema implements ImmutableSchema { public boolean isAccessingDiskSummary(SummaryField field) { if (!field.getTransform().isInMemory()) return true; - if (field.getSources().size() == 0) return isAccessingDiskSummary(getName()); + if (field.getSources().isEmpty()) return isAccessingDiskSummary(getName()); for (SummaryField.Source source : field.getSources()) { if (isAccessingDiskSummary(source.getName())) return true; @@ -717,22 +715,6 @@ public class Schema implements ImmutableSchema { return owner.schemas().get(inherited.get()); } - /** - * For adding structs defined in document scope - * - * @param dt the struct to add - * @return self, for chaining - */ - public Schema addType(SDDocumentType dt) { - documentType.addType(dt); // TODO This is a very very dirty thing. It must go - return this; - } - - public Schema addAnnotation(SDAnnotationType dt) { - documentType.addAnnotation(dt); - return this; - } - public void validate(DeployLogger logger) { if (inherited.isPresent()) { if (! owner.schemas().containsKey(inherited.get())) diff --git a/config-model/src/main/java/com/yahoo/schema/document/SDField.java b/config-model/src/main/java/com/yahoo/schema/document/SDField.java index 972d3a57040..5cc51f9fedc 100644 --- a/config-model/src/main/java/com/yahoo/schema/document/SDField.java +++ b/config-model/src/main/java/com/yahoo/schema/document/SDField.java @@ -599,9 +599,9 @@ public class SDField extends Field implements TypedKey, ImmutableSDField { * per field, not per index) */ public void setRankType(RankType rankType) { - this.rankType=rankType; + this.rankType = rankType; for (Index index : getIndices().values()) { - if (index.getRankType()==null) + if (index.getRankType() == null) index.setRankType(rankType); } diff --git a/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java b/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java index feabf7f76f1..16345c98cff 100644 --- a/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java +++ b/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java @@ -27,30 +27,18 @@ public final class ParserFactory { */ @SuppressWarnings("deprecation") public static Parser newInstance(Query.Type type, ParserEnvironment environment) { - switch (type) { - case ALL: - return new AllParser(environment, false); - case ANY: - return new AnyParser(environment); - case PHRASE: - return new PhraseParser(environment); - case ADVANCED: - return new AdvancedParser(environment); - case WEB: - return new WebParser(environment); - case PROGRAMMATIC: - return new ProgrammaticParser(); - case YQL: - return new YqlParser(environment); - case SELECT: - return new SelectParser(environment); - case WEAKAND: - return new AllParser(environment, true); - case TOKENIZE: - return new TokenizeParser(environment); - default: - throw new UnsupportedOperationException(type.toString()); - } + return switch (type) { + case ALL -> new AllParser(environment, false); + case ANY -> new AnyParser(environment); + case PHRASE -> new PhraseParser(environment); + case ADVANCED -> new AdvancedParser(environment); + case WEB -> new WebParser(environment); + case PROGRAMMATIC -> new ProgrammaticParser(); + case YQL -> new YqlParser(environment); + case SELECT -> new SelectParser(environment); + case WEAKAND -> new AllParser(environment, true); + case TOKENIZE -> new TokenizeParser(environment); + }; } } |