diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java index 6fd4bda2bf..c7c26faa2f 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java @@ -137,7 +137,7 @@ public class CandidateComponentsIndexer implements Processor { List list = new ArrayList<>(); for (Element element : elements) { if (TYPE_KINDS.contains(element.getKind()) && element.getModifiers().contains(Modifier.STATIC)) { - list.add(TypeElement.class.cast(element)); + list.add((TypeElement) element); } } return list; diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java index 78a8c4e00a..702ea367fe 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java @@ -87,7 +87,7 @@ class KeyGeneratorAdapter implements KeyGenerator { @Override public Object generate(Object target, Method method, Object... params) { JCacheOperation operation = this.cacheOperationSource.getCacheOperation(method, target.getClass()); - if (!(AbstractJCacheKeyOperation.class.isInstance(operation))) { + if (!(operation instanceof AbstractJCacheKeyOperation)) { throw new IllegalStateException("Invalid operation, should be a key-based operation " + operation); } CacheKeyInvocationContext invocationContext = createCacheKeyInvocationContext(target, operation, params); diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index 6a360d6e4d..420e17d9a3 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -1994,7 +1994,7 @@ public class DataBinderTests { mpv.add("age", "invalid"); binder.bind(mpv); assertThat(binder.getBindingResult().getFieldError("age").getCode()).isEqualTo("errors.typeMismatch"); - assertThat(BeanWrapper.class.cast(binder.getInternalBindingResult().getPropertyAccessor()).getAutoGrowCollectionLimit()).isEqualTo(512); + assertThat(((BeanWrapper) binder.getInternalBindingResult().getPropertyAccessor()).getAutoGrowCollectionLimit()).isEqualTo(512); } @Test // SPR-15009 diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java index 907f5efb06..f3e4f0314b 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java @@ -652,7 +652,7 @@ public class JmsMessagingTemplateTests { new StubTextMessage((String) invocation.getArguments()[0])); javax.jms.Message message = creator.createMessage(mock); verify(mock).createTextMessage(any()); - return TextMessage.class.cast(message); + return (TextMessage) message; } } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java index b79cda218d..a97aff8dfb 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java @@ -51,7 +51,7 @@ public class SessionHolder extends EntityManagerHolder { public SessionHolder(Session session) { // Check below is always true against Hibernate >= 5.2 but not against 5.0/5.1 at runtime - super(EntityManager.class.isInstance(session) ? session : null); + super(session instanceof EntityManager ? session : null); this.session = session; } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java index bcd5fc0de4..90db97425d 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java @@ -69,7 +69,7 @@ public class HandlerResultMatchers { assertNotNull("No handler", handler); if (handler != null) { Class actual = handler.getClass(); - if (HandlerMethod.class.isInstance(handler)) { + if (handler instanceof HandlerMethod) { actual = ((HandlerMethod) handler).getBeanType(); } assertEquals("Handler type", type, ClassUtils.getUserClass(actual)); diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java index c615a28fa3..c4409329a5 100644 --- a/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java +++ b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java @@ -169,7 +169,7 @@ public abstract class DataAccessUtils { if (String.class == requiredType) { result = result.toString(); } - else if (Number.class.isAssignableFrom(requiredType) && Number.class.isInstance(result)) { + else if (Number.class.isAssignableFrom(requiredType) && result instanceof Number) { try { result = NumberUtils.convertNumberToTargetClass(((Number) result), (Class) requiredType); } diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java index 3665f93e71..900b925481 100644 --- a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java @@ -185,7 +185,7 @@ public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory, */ protected HttpURLConnection openConnection(URL url, @Nullable Proxy proxy) throws IOException { URLConnection urlConnection = (proxy != null ? url.openConnection(proxy) : url.openConnection()); - if (!HttpURLConnection.class.isInstance(urlConnection)) { + if (!(urlConnection instanceof HttpURLConnection)) { throw new IllegalStateException("HttpURLConnection required for [" + url + "] but got: " + urlConnection); } return (HttpURLConnection) urlConnection; diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java index dd646692ef..352d11c8b3 100644 --- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java @@ -216,7 +216,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest { @Override public ServerHttpAsyncRequestControl getAsyncRequestControl(ServerHttpResponse response) { if (this.asyncRequestControl == null) { - if (!ServletServerHttpResponse.class.isInstance(response)) { + if (!(response instanceof ServletServerHttpResponse)) { throw new IllegalArgumentException( "Response must be a ServletServerHttpResponse: " + response.getClass()); } diff --git a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java index d2cd49cda7..ba0c489216 100644 --- a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java @@ -66,7 +66,7 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq Object config = request.getHttpContext().getAttribute(HttpClientContext.REQUEST_CONFIG); assertThat(config).as("Request config should be set").isNotNull(); - assertThat(RequestConfig.class.isInstance(config)).as("Wrong request config type" + config.getClass().getName()).isTrue(); + assertThat(config instanceof RequestConfig).as("Wrong request config type" + config.getClass().getName()).isTrue(); RequestConfig requestConfig = (RequestConfig) config; assertThat(requestConfig.getConnectTimeout()).as("Wrong custom connection timeout").isEqualTo(1234); assertThat(requestConfig.getConnectionRequestTimeout()).as("Wrong custom connection request timeout").isEqualTo(4321);