Rewrite this instanceof check

joegallo · joegallo · commit 2f6cbf8bb386 · 2025-08-04T14:09:05.000-04:00
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java
@@ -290,7 +290,7 @@ private static BitSet computeBitSet(Query query, LeafReaderContext context) thro
 
     // Package private for testing
     static boolean isEffectiveMatchAllDocsQuery(Query rewrittenQuery) {
-        if (rewrittenQuery instanceof ConstantScoreQuery && ((ConstantScoreQuery) rewrittenQuery).getQuery() instanceof MatchAllDocsQuery) {
+        if (rewrittenQuery instanceof ConstantScoreQuery csq && csq.getQuery() instanceof MatchAllDocsQuery) {
             return true;
         }
         if (rewrittenQuery instanceof MatchAllDocsQuery) {

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ private static BitSet computeBitSet(Query query, LeafReaderContext context) thro`
`290`	`290`
`291`	`291`	`// Package private for testing`
`292`	`292`	`static boolean isEffectiveMatchAllDocsQuery(Query rewrittenQuery) {`
`293`		`- if (rewrittenQuery instanceof ConstantScoreQuery && ((ConstantScoreQuery) rewrittenQuery).getQuery() instanceof MatchAllDocsQuery) {`
	`293`	`+ if (rewrittenQuery instanceof ConstantScoreQuery csq && csq.getQuery() instanceof MatchAllDocsQuery) {`
`294`	`294`	`return true;`
`295`	`295`	`}`
`296`	`296`	`if (rewrittenQuery instanceof MatchAllDocsQuery) {`