From 7a89a68da3a50d8607b58fac9920329be6db4aa1 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 15 Aug 2022 14:11:37 +0200 Subject: Cleanup only --- .../java/com/yahoo/prelude/query/parser/AbstractParser.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'container-search/src/main/java/com/yahoo/prelude') diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java index ffd44bec935..d682ca9564e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java @@ -244,9 +244,7 @@ public abstract class AbstractParser implements CustomParser { private static void assignDefaultIndex(String defaultIndex, Item item) { if (defaultIndex == null || item == null) return; - if (item instanceof IndexedItem) { - IndexedItem indexName = (IndexedItem) item; - + if (item instanceof IndexedItem indexName) { if ("".equals(indexName.getIndexName())) indexName.setIndexName(defaultIndex); } @@ -299,8 +297,7 @@ public abstract class AbstractParser implements CustomParser { return unwashed; } else if (unwashed instanceof PhraseItem) { return collapsePhrase((PhraseItem) unwashed); - } else if (unwashed instanceof CompositeItem) { - CompositeItem composite = (CompositeItem) unwashed; + } else if (unwashed instanceof CompositeItem composite) { ListIterator i = composite.getItemIterator(); while (i.hasNext()) { @@ -318,9 +315,8 @@ public abstract class AbstractParser implements CustomParser { } private static Item collapsePhrase(PhraseItem phrase) { - if (phrase.getItemCount() == 1 && phrase.getItem(0) instanceof WordItem) { + if (phrase.getItemCount() == 1 && phrase.getItem(0) instanceof WordItem word) { // TODO: Other stuff which needs propagation? - WordItem word = (WordItem) phrase.getItem(0); word.setWeight(phrase.getWeight()); return word; } else { -- cgit v1.2.3