Apache Lucene open-source search software
Replace explicit type conversion with instanceof pattern variable in luke module (#15837)
gaobinlong30c6deb8b65c
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/AnalysisPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/AnalysisPanelProvider.javaindex 4be1a7c4992..c8d1ab04658 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/AnalysisPanelProvider.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/AnalysisPanelProvider.java@@ -254,8 +254,7 @@ public final class AnalysisPanelProvider implements AnalysisTabOperator {}void showAnalysisChainDialog() {- if (getCurrentAnalyzer() instanceof CustomAnalyzer) {- CustomAnalyzer analyzer = (CustomAnalyzer) getCurrentAnalyzer();+ if (getCurrentAnalyzer() instanceof CustomAnalyzer analyzer) {new DialogOpener<>(analysisChainDialogFactory).open("Analysis chain",diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.javaindex 8fce4b270dc..61752b45d15 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java@@ -1166,25 +1166,16 @@ public final class DocumentsPanelProvider implements DocumentsTabOperator {} else {sb.append("#");// try faking it- Number numeric = f.getNumericValue();- if (numeric instanceof Integer) {- sb.append("i32");- } else if (numeric instanceof Long) {- sb.append("i64");- } else if (numeric instanceof Float) {- sb.append("f32");- } else if (numeric instanceof Double) {- sb.append("f64");- } else if (numeric instanceof Short) {- sb.append("i16");- } else if (numeric instanceof Byte) {- sb.append("i08");- } else if (numeric instanceof BigDecimal) {- sb.append("b^d");- } else if (numeric instanceof BigInteger) {- sb.append("b^i");- } else {- sb.append("???");+ switch (f.getNumericValue()) {+ case Integer _ -> sb.append("i32");+ case Long _ -> sb.append("i64");+ case Float _ -> sb.append("f32");+ case Double _ -> sb.append("f64");+ case Short _ -> sb.append("i16");+ case Byte _ -> sb.append("i08");+ case BigDecimal _ -> sb.append("b^d");+ case BigInteger _ -> sb.append("b^i");+ default -> sb.append("???");}}// has term vector?diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/fragments/search/SortPaneProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/fragments/search/SortPaneProvider.javaindex 3497c8cf429..70653af137b 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/fragments/search/SortPaneProvider.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/fragments/search/SortPaneProvider.java@@ -214,8 +214,8 @@ public final class SortPaneProvider implements SortTabOperator {sortFields.stream().map(sf -> {- if (sf instanceof SortedNumericSortField) {- return ((SortedNumericSortField) sf).getNumericType().name();+ if (sf instanceof SortedNumericSortField snsf) {+ return snsf.getNumericType().name();} else {return sf.getType().name();}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/inifile/SimpleIniFile.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/inifile/SimpleIniFile.javaindex 182555c43e3..ce653e75d0b 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/inifile/SimpleIniFile.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/inifile/SimpleIniFile.java@@ -46,9 +46,7 @@ public class SimpleIniFile implements IniFile {public synchronized void put(String section, String option, Object value) {if (checkString(section) && checkString(option) && Objects.nonNull(value)) {sections.putIfAbsent(section, new OptionMap());- sections- .get(section)- .put(option, (value instanceof String) ? (String) value : String.valueOf(value));+ sections.get(section).put(option, (value instanceof String s) ? s : String.valueOf(value));}}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/overview/OverviewImpl.java b/lucene/luke/src/java/org/apache/lucene/luke/models/overview/OverviewImpl.javaindex 548355a6906..35326579c27 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/models/overview/OverviewImpl.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/overview/OverviewImpl.java@@ -96,8 +96,8 @@ public final class OverviewImpl extends LukeModel implements Overview {@Overridepublic Optional<Long> getIndexVersion() {- if (reader instanceof DirectoryReader) {- return Optional.of(((DirectoryReader) reader).getVersion());+ if (reader instanceof DirectoryReader dr) {+ return Optional.of(dr.getVersion());}return Optional.empty();}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/search/SearchImpl.java b/lucene/luke/src/java/org/apache/lucene/luke/models/search/SearchImpl.javaindex 440751471ff..9bc2957f276 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/models/search/SearchImpl.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/search/SearchImpl.java@@ -460,8 +460,8 @@ public final class SearchImpl extends LukeModel implements Search {for (SortField sf : candidates) {if (sf instanceof SortedSetSortField) {return Optional.of(new SortedSetSortField(sf.getField(), reverse));- } else if (sf instanceof SortedNumericSortField) {- SortField.Type sfType = ((SortedNumericSortField) sf).getNumericType();+ } else if (sf instanceof SortedNumericSortField snsf) {+ SortField.Type sfType = snsf.getNumericType();if (sfType.name().equals(type)) {return Optional.of(new SortedNumericSortField(sf.getField(), sfType, reverse));}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/tools/IndexToolsImpl.java b/lucene/luke/src/java/org/apache/lucene/luke/models/tools/IndexToolsImpl.javaindex 151b06b07ef..78abacee6e2 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/models/tools/IndexToolsImpl.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/tools/IndexToolsImpl.java@@ -81,8 +81,8 @@ public final class IndexToolsImpl extends LukeModel implements IndexTools {@Overridepublic void optimize(boolean expunge, int maxNumSegments, PrintStream ps) {- if (reader instanceof DirectoryReader) {- Directory dir = ((DirectoryReader) reader).directory();+ if (reader instanceof DirectoryReader dr) {+ Directory dir = dr.directory();try (IndexWriter writer =IndexUtils.createWriter(dir, null, useCompound, keepAllCommits, ps)) {IndexUtils.optimizeIndex(writer, expunge, maxNumSegments);@@ -99,8 +99,8 @@ public final class IndexToolsImpl extends LukeModel implements IndexTools {try {if (dir != null) {return IndexUtils.checkIndex(dir, ps);- } else if (reader instanceof DirectoryReader) {- Directory dir = ((DirectoryReader) reader).directory();+ } else if (reader instanceof DirectoryReader dr) {+ Directory dir = dr.directory();return IndexUtils.checkIndex(dir, ps);} else {throw new IllegalStateException("Directory is not set.");@@ -127,8 +127,8 @@ public final class IndexToolsImpl extends LukeModel implements IndexTools {public void addDocument(Document doc, Analyzer analyzer) {Objects.requireNonNull(analyzer);- if (reader instanceof DirectoryReader) {- Directory dir = ((DirectoryReader) reader).directory();+ if (reader instanceof DirectoryReader dr) {+ Directory dir = dr.directory();try (IndexWriter writer =IndexUtils.createWriter(dir, analyzer, useCompound, keepAllCommits)) {writer.addDocument(doc);@@ -145,8 +145,8 @@ public final class IndexToolsImpl extends LukeModel implements IndexTools {public void deleteDocuments(Query query) {Objects.requireNonNull(query);- if (reader instanceof DirectoryReader) {- Directory dir = ((DirectoryReader) reader).directory();+ if (reader instanceof DirectoryReader dr) {+ Directory dir = dr.directory();try (IndexWriter writer = IndexUtils.createWriter(dir, null, useCompound, keepAllCommits)) {writer.deleteDocuments(query);writer.commit();diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java b/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.javaindex 9357a467487..97dc5f80798 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java@@ -212,8 +212,8 @@ public final class IndexUtils {if (reader != null) {reader.close();log.info("IndexReader successfully closed.");- if (reader instanceof DirectoryReader) {- Directory dir = ((DirectoryReader) reader).directory();+ if (reader instanceof DirectoryReader dr) {+ Directory dir = dr.directory();dir.close();log.info("Directory successfully closed.");}@@ -409,8 +409,8 @@ public final class IndexUtils {* @param reader - index reader*/public static Bits getLiveDocs(IndexReader reader) {- if (reader instanceof LeafReader) {- return ((LeafReader) reader).getLiveDocs();+ if (reader instanceof LeafReader leafReader) {+ return leafReader.getLiveDocs();} else {return MultiBits.getLiveDocs(reader);}@@ -422,8 +422,8 @@ public final class IndexUtils {* @param reader - index reader*/public static FieldInfos getFieldInfos(IndexReader reader) {- if (reader instanceof LeafReader) {- return ((LeafReader) reader).getFieldInfos();+ if (reader instanceof LeafReader leafReader) {+ return leafReader.getFieldInfos();} else {return FieldInfos.getMergedFieldInfos(reader);}@@ -458,8 +458,8 @@ public final class IndexUtils {* @throws IOException - if there is a low level IO error.*/public static Terms getTerms(IndexReader reader, String field) throws IOException {- if (reader instanceof LeafReader) {- return ((LeafReader) reader).terms(field);+ if (reader instanceof LeafReader leafReader) {+ return leafReader.terms(field);} else {return MultiTerms.getTerms(reader, field);}@@ -474,8 +474,8 @@ public final class IndexUtils {*/public static BinaryDocValues getBinaryDocValues(IndexReader reader, String field)throws IOException {- if (reader instanceof LeafReader) {- return ((LeafReader) reader).getBinaryDocValues(field);+ if (reader instanceof LeafReader leafReader) {+ return leafReader.getBinaryDocValues(field);} else {return MultiDocValues.getBinaryValues(reader, field);}@@ -490,8 +490,8 @@ public final class IndexUtils {*/public static NumericDocValues getNumericDocValues(IndexReader reader, String field)throws IOException {- if (reader instanceof LeafReader) {- return ((LeafReader) reader).getNumericDocValues(field);+ if (reader instanceof LeafReader leafReader) {+ return leafReader.getNumericDocValues(field);} else {return MultiDocValues.getNumericValues(reader, field);}@@ -506,8 +506,8 @@ public final class IndexUtils {*/public static SortedNumericDocValues getSortedNumericDocValues(IndexReader reader, String field)throws IOException {- if (reader instanceof LeafReader) {- return ((LeafReader) reader).getSortedNumericDocValues(field);+ if (reader instanceof LeafReader leafReader) {+ return leafReader.getSortedNumericDocValues(field);} else {return MultiDocValues.getSortedNumericValues(reader, field);}@@ -522,8 +522,8 @@ public final class IndexUtils {*/public static SortedDocValues getSortedDocValues(IndexReader reader, String field)throws IOException {- if (reader instanceof LeafReader) {- return ((LeafReader) reader).getSortedDocValues(field);+ if (reader instanceof LeafReader leafReader) {+ return leafReader.getSortedDocValues(field);} else {return MultiDocValues.getSortedValues(reader, field);}@@ -538,8 +538,8 @@ public final class IndexUtils {*/public static SortedSetDocValues getSortedSetDocvalues(IndexReader reader, String field)throws IOException {- if (reader instanceof LeafReader) {- return ((LeafReader) reader).getSortedSetDocValues(field);+ if (reader instanceof LeafReader leafReader) {+ return leafReader.getSortedSetDocValues(field);} else {return MultiDocValues.getSortedSetValues(reader, field);}