Pattern matching for instanceof. Wrapping up (elastic#82768)

astefan · astefan · commit b84a5e2ee8d7 · 2022-01-20T08:13:09.000Z
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportFollowStatsAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportFollowStatsAction.java
@@ -103,8 +103,7 @@ protected void processTasks(final FollowStatsAction.StatsRequest request, final
         final Set<String> followerIndices = findFollowerIndicesFromShardFollowTasks(state, request.indices());
 
         for (final Task task : taskManager.getTasks().values()) {
-            if (task instanceof ShardFollowNodeTask) {
-                final ShardFollowNodeTask shardFollowNodeTask = (ShardFollowNodeTask) task;
+            if (task instanceof final ShardFollowNodeTask shardFollowNodeTask) {
                 if (followerIndices.contains(shardFollowNodeTask.getFollowShardId().getIndexName())) {
                     operation.accept(shardFollowNodeTask);
                 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/expressiondsl/FieldExpression.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/expressiondsl/FieldExpression.java
@@ -118,8 +118,7 @@ public FieldValue(Object value) {
         }
 
         private static CharacterRunAutomaton buildAutomaton(Object value) {
-            if (value instanceof String) {
-                final String str = (String) value;
+            if (value instanceof final String str) {
                 if (Regex.isSimpleMatchPattern(str) || Automatons.isLuceneRegex(str)) {
                     return new CharacterRunAutomaton(Automatons.patterns(str));
                 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/ClusterPermission.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/ClusterPermission.java
@@ -248,8 +248,7 @@ protected boolean extendedCheck(String action, TransportRequest request, Authent
 
         @Override
         protected boolean doImplies(final ActionBasedPermissionCheck permissionCheck) {
-            if (permissionCheck instanceof ActionRequestBasedPermissionCheck) {
-                final ActionRequestBasedPermissionCheck otherCheck = (ActionRequestBasedPermissionCheck) permissionCheck;
+            if (permissionCheck instanceof final ActionRequestBasedPermissionCheck otherCheck) {
                 return this.clusterPrivilege.equals(otherCheck.clusterPrivilege);
             }
             return false;
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ConfigurableClusterPrivileges.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ConfigurableClusterPrivileges.java
@@ -147,8 +147,7 @@ public ManageApplicationPrivileges(Set<String> applicationNames) {
             this.applicationNames = Collections.unmodifiableSet(applicationNames);
             this.applicationPredicate = StringMatcher.of(applicationNames);
             this.requestPredicate = request -> {
-                if (request instanceof ApplicationPrivilegesRequest) {
-                    final ApplicationPrivilegesRequest privRequest = (ApplicationPrivilegesRequest) request;
+                if (request instanceof final ApplicationPrivilegesRequest privRequest) {
                     final Collection<String> requestApplicationNames = privRequest.getApplicationNames();
                     return requestApplicationNames.isEmpty()
                         ? this.applicationNames.contains("*")
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ManageOwnApiKeyClusterPrivilege.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ManageOwnApiKeyClusterPrivilege.java
@@ -60,17 +60,15 @@ private ManageOwnClusterPermissionCheck() {
         protected boolean extendedCheck(String action, TransportRequest request, Authentication authentication) {
             if (request instanceof CreateApiKeyRequest) {
                 return true;
-            } else if (request instanceof GetApiKeyRequest) {
-                final GetApiKeyRequest getApiKeyRequest = (GetApiKeyRequest) request;
+            } else if (request instanceof final GetApiKeyRequest getApiKeyRequest) {
                 return checkIfUserIsOwnerOfApiKeys(
                     authentication,
                     getApiKeyRequest.getApiKeyId(),
                     getApiKeyRequest.getUserName(),
                     getApiKeyRequest.getRealmName(),
                     getApiKeyRequest.ownedByAuthenticatedUser()
                 );
-            } else if (request instanceof InvalidateApiKeyRequest) {
-                final InvalidateApiKeyRequest invalidateApiKeyRequest = (InvalidateApiKeyRequest) request;
+            } else if (request instanceof final InvalidateApiKeyRequest invalidateApiKeyRequest) {
                 final String[] apiKeyIds = invalidateApiKeyRequest.getIds();
                 if (apiKeyIds == null) {
                     return checkIfUserIsOwnerOfApiKeys(
@@ -92,8 +90,7 @@ protected boolean extendedCheck(String action, TransportRequest request, Authent
                             )
                         );
                 }
-            } else if (request instanceof QueryApiKeyRequest) {
-                final QueryApiKeyRequest queryApiKeyRequest = (QueryApiKeyRequest) request;
+            } else if (request instanceof final QueryApiKeyRequest queryApiKeyRequest) {
                 return queryApiKeyRequest.isFilterForCurrentUser();
             }
             throw new IllegalArgumentException(
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/test/TestMatchers.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/test/TestMatchers.java
@@ -47,8 +47,7 @@ public void describeTo(Description description) {
 
             @Override
             public boolean matches(Object actual) {
-                if (actual instanceof Throwable) {
-                    final Throwable throwable = (Throwable) actual;
+                if (actual instanceof final Throwable throwable) {
                     return messageMatcher.matches(throwable.getMessage());
                 } else {
                     return false;
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java
@@ -1275,8 +1275,7 @@ public void onFailure(Exception e) {
      */
     private <E extends Throwable> E traceLog(String action, String identifier, E exception) {
         if (logger.isTraceEnabled()) {
-            if (exception instanceof ElasticsearchException) {
-                final ElasticsearchException esEx = (ElasticsearchException) exception;
+            if (exception instanceof final ElasticsearchException esEx) {
                 final Object detail = esEx.getHeader("error_description");
                 if (detail != null) {
                     logger.trace(() -> new ParameterizedMessage("Failure in [{}] for id [{}] - [{}]", action, identifier, detail), esEx);
@@ -1295,8 +1294,7 @@ private <E extends Throwable> E traceLog(String action, String identifier, E exc
      */
     private <E extends Throwable> E traceLog(String action, E exception) {
         if (logger.isTraceEnabled()) {
-            if (exception instanceof ElasticsearchException) {
-                final ElasticsearchException esEx = (ElasticsearchException) exception;
+            if (exception instanceof final ElasticsearchException esEx) {
                 final Object detail = esEx.getHeader("error_description");
                 if (detail != null) {
                     logger.trace(() -> new ParameterizedMessage("Failure in [{}] - [{}]", action, detail), esEx);
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticatorChain.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticatorChain.java
@@ -168,9 +168,8 @@ private BiConsumer<Authenticator, ActionListener<AuthenticationResult<Authentica
                 // Because (1) unlike security errors which are intentionally obscure, non-security errors are clear
                 // about their nature so that no additional information is needed; (2) Non-security errors may
                 // not inherit ElasticsearchException and thus does not have the addMetadata method.
-                if (e instanceof ElasticsearchSecurityException) {
+                if (e instanceof final ElasticsearchSecurityException ese) {
                     // Attach any other unsuccessful messages to the final error
-                    final ElasticsearchSecurityException ese = (ElasticsearchSecurityException) e;
                     if (false == context.getUnsuccessfulMessages().isEmpty()) {
                         addMetadata(context, ese);
                     }
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java
@@ -2192,8 +2192,7 @@ private static ElasticsearchSecurityException unableToPerformAction(@Nullable Th
      */
     private <E extends Throwable> E traceLog(String action, String identifier, E exception) {
         if (logger.isTraceEnabled()) {
-            if (exception instanceof ElasticsearchException) {
-                final ElasticsearchException esEx = (ElasticsearchException) exception;
+            if (exception instanceof final ElasticsearchException esEx) {
                 final Object detail = esEx.getHeader("error_description");
                 if (detail != null) {
                     logger.trace(() -> new ParameterizedMessage("Failure in [{}] for id [{}] - [{}]", action, identifier, detail), esEx);
@@ -2212,8 +2211,7 @@ private <E extends Throwable> E traceLog(String action, String identifier, E exc
      */
     private <E extends Throwable> E traceLog(String action, E exception) {
         if (logger.isTraceEnabled()) {
-            if (exception instanceof ElasticsearchException) {
-                final ElasticsearchException esEx = (ElasticsearchException) exception;
+            if (exception instanceof final ElasticsearchException esEx) {
                 final Object detail = esEx.getHeader("error_description");
                 if (detail != null) {
                     logger.trace(() -> new ParameterizedMessage("Failure in [{}] - [{}]", action, detail), esEx);
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java
@@ -199,8 +199,7 @@ ResolvedIndices resolveIndicesAndAliases(
             assert indicesRequest.indices() == null || indicesRequest.indices().length == 0
                 : "indices are: " + Arrays.toString(indicesRequest.indices()); // Arrays.toString() can handle null values - all good
             resolvedIndicesBuilder.addLocal(getPutMappingIndexOrAlias((PutMappingRequest) indicesRequest, authorizedIndices, metadata));
-        } else if (indicesRequest instanceof IndicesRequest.Replaceable) {
-            final IndicesRequest.Replaceable replaceable = (IndicesRequest.Replaceable) indicesRequest;
+        } else if (indicesRequest instanceof final IndicesRequest.Replaceable replaceable) {
             final IndicesOptions indicesOptions = indicesRequest.indicesOptions();
             final boolean replaceWildcards = indicesOptions.expandWildcardsOpen() || indicesOptions.expandWildcardsClosed();
 
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/ApiKeyBoolQueryBuilder.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/ApiKeyBoolQueryBuilder.java
@@ -73,8 +73,7 @@ public static ApiKeyBoolQueryBuilder build(QueryBuilder queryBuilder, @Nullable
     }
 
     private static QueryBuilder doProcess(QueryBuilder qb) {
-        if (qb instanceof BoolQueryBuilder) {
-            final BoolQueryBuilder query = (BoolQueryBuilder) qb;
+        if (qb instanceof final BoolQueryBuilder query) {
             final BoolQueryBuilder newQuery = QueryBuilders.boolQuery()
                 .minimumShouldMatch(query.minimumShouldMatch())
                 .adjustPureNegative(query.adjustPureNegative());
@@ -87,29 +86,24 @@ private static QueryBuilder doProcess(QueryBuilder qb) {
             return qb;
         } else if (qb instanceof IdsQueryBuilder) {
             return qb;
-        } else if (qb instanceof TermQueryBuilder) {
-            final TermQueryBuilder query = (TermQueryBuilder) qb;
+        } else if (qb instanceof final TermQueryBuilder query) {
             final String translatedFieldName = ApiKeyFieldNameTranslators.translate(query.fieldName());
             return QueryBuilders.termQuery(translatedFieldName, query.value()).caseInsensitive(query.caseInsensitive());
-        } else if (qb instanceof TermsQueryBuilder) {
-            final TermsQueryBuilder query = (TermsQueryBuilder) qb;
+        } else if (qb instanceof final TermsQueryBuilder query) {
             if (query.termsLookup() != null) {
                 throw new IllegalArgumentException("terms query with terms lookup is not supported for API Key query");
             }
             final String translatedFieldName = ApiKeyFieldNameTranslators.translate(query.fieldName());
             return QueryBuilders.termsQuery(translatedFieldName, query.getValues());
-        } else if (qb instanceof PrefixQueryBuilder) {
-            final PrefixQueryBuilder query = (PrefixQueryBuilder) qb;
+        } else if (qb instanceof final PrefixQueryBuilder query) {
             final String translatedFieldName = ApiKeyFieldNameTranslators.translate(query.fieldName());
             return QueryBuilders.prefixQuery(translatedFieldName, query.value()).caseInsensitive(query.caseInsensitive());
-        } else if (qb instanceof WildcardQueryBuilder) {
-            final WildcardQueryBuilder query = (WildcardQueryBuilder) qb;
+        } else if (qb instanceof final WildcardQueryBuilder query) {
             final String translatedFieldName = ApiKeyFieldNameTranslators.translate(query.fieldName());
             return QueryBuilders.wildcardQuery(translatedFieldName, query.value())
                 .caseInsensitive(query.caseInsensitive())
                 .rewrite(query.rewrite());
-        } else if (qb instanceof RangeQueryBuilder) {
-            final RangeQueryBuilder query = (RangeQueryBuilder) qb;
+        } else if (qb instanceof final RangeQueryBuilder query) {
             final String translatedFieldName = ApiKeyFieldNameTranslators.translate(query.fieldName());
             if (query.relation() != null) {
                 throw new IllegalArgumentException("range query with relation is not supported for API Key query");
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmSettingsTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmSettingsTests.java
@@ -282,8 +282,7 @@ private MockSecureSettings normaliseSecureSettingPrefix(String prefix, SecureSet
         if (settings == null) {
             return null;
         }
-        if (settings instanceof MockSecureSettings) {
-            final MockSecureSettings source = (MockSecureSettings) settings;
+        if (settings instanceof final MockSecureSettings source) {
             final MockSecureSettings target = new MockSecureSettings();
             for (String key : settings.getSettingNames()) {
                 target.setString(prefix + key, source.getString(key).toString());
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStoreTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStoreTests.java
@@ -321,8 +321,7 @@ public void testFindTokensForException() {
     public void testDeleteToken() {
         final AtomicBoolean cacheCleared = new AtomicBoolean(false);
         responseProviderHolder.set((r, l) -> {
-            if (r instanceof DeleteRequest) {
-                final DeleteRequest dr = (DeleteRequest) r;
+            if (r instanceof final DeleteRequest dr) {
                 final boolean found = dr.id().equals(SERVICE_ACCOUNT_TOKEN_DOC_TYPE + "-elastic/fleet-server/token1");
                 l.onResponse(
                     new DeleteResponse(
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/TransformAggregations.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/TransformAggregations.java
@@ -233,8 +233,7 @@ public static Tuple<Map<String, String>, Map<String, String>> getAggregationInpu
             );
         }
 
-        if (agg instanceof ValuesSourceAggregationBuilder) {
-            ValuesSourceAggregationBuilder<?> valueSourceAggregation = (ValuesSourceAggregationBuilder<?>) agg;
+        if (agg instanceof ValuesSourceAggregationBuilder<?> valueSourceAggregation) {
             return new Tuple<>(
                 Collections.singletonMap(valueSourceAggregation.getName(), valueSourceAggregation.field()),
                 Collections.singletonMap(valueSourceAggregation.getName(), valueSourceAggregation.getType())

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,7 @@ protected void processTasks(final FollowStatsAction.StatsRequest request, final`
`103`	`103`	`final Set<String> followerIndices = findFollowerIndicesFromShardFollowTasks(state, request.indices());`
`104`	`104`
`105`	`105`	`for (final Task task : taskManager.getTasks().values()) {`
`106`		`- if (task instanceof ShardFollowNodeTask) {`
`107`		`- final ShardFollowNodeTask shardFollowNodeTask = (ShardFollowNodeTask) task;`
	`106`	`+ if (task instanceof final ShardFollowNodeTask shardFollowNodeTask) {`
`108`	`107`	`if (followerIndices.contains(shardFollowNodeTask.getFollowShardId().getIndexName())) {`
`109`	`108`	`operation.accept(shardFollowNodeTask);`
`110`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,7 @@ public FieldValue(Object value) {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`private static CharacterRunAutomaton buildAutomaton(Object value) {`
`121`		`- if (value instanceof String) {`
`122`		`- final String str = (String) value;`
	`121`	`+ if (value instanceof final String str) {`
`123`	`122`	`if (Regex.isSimpleMatchPattern(str) \|\| Automatons.isLuceneRegex(str)) {`
`124`	`123`	`return new CharacterRunAutomaton(Automatons.patterns(str));`
`125`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -248,8 +248,7 @@ protected boolean extendedCheck(String action, TransportRequest request, Authent`
`248`	`248`
`249`	`249`	`@Override`
`250`	`250`	`protected boolean doImplies(final ActionBasedPermissionCheck permissionCheck) {`
`251`		`- if (permissionCheck instanceof ActionRequestBasedPermissionCheck) {`
`252`		`- final ActionRequestBasedPermissionCheck otherCheck = (ActionRequestBasedPermissionCheck) permissionCheck;`
	`251`	`+ if (permissionCheck instanceof final ActionRequestBasedPermissionCheck otherCheck) {`
`253`	`252`	`return this.clusterPrivilege.equals(otherCheck.clusterPrivilege);`
`254`	`253`	`}`
`255`	`254`	`return false;`