Skip to content

Commit c547809

Browse files
XenoAmesssbrannen
authored andcommitted
Use instanceof instead of Class#isInstance where feasible
Closes gh-25446
1 parent 9fe1fee commit c547809

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

spring-context-indexer/src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private static List<TypeElement> staticTypesIn(Iterable<? extends Element> eleme
137137
List<TypeElement> list = new ArrayList<>();
138138
for (Element element : elements) {
139139
if (TYPE_KINDS.contains(element.getKind()) && element.getModifiers().contains(Modifier.STATIC)) {
140-
list.add(TypeElement.class.cast(element));
140+
list.add((TypeElement) element);
141141
}
142142
}
143143
return list;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public Object getTarget() {
8787
@Override
8888
public Object generate(Object target, Method method, Object... params) {
8989
JCacheOperation<?> operation = this.cacheOperationSource.getCacheOperation(method, target.getClass());
90-
if (!(AbstractJCacheKeyOperation.class.isInstance(operation))) {
90+
if (!(operation instanceof AbstractJCacheKeyOperation)) {
9191
throw new IllegalStateException("Invalid operation, should be a key-based operation " + operation);
9292
}
9393
CacheKeyInvocationContext<?> invocationContext = createCacheKeyInvocationContext(target, operation, params);

spring-context/src/test/java/org/springframework/validation/DataBinderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1994,7 +1994,7 @@ public void testSetCustomMessageCodesResolverBeforeInitializeBindingResultForBea
19941994
mpv.add("age", "invalid");
19951995
binder.bind(mpv);
19961996
assertThat(binder.getBindingResult().getFieldError("age").getCode()).isEqualTo("errors.typeMismatch");
1997-
assertThat(BeanWrapper.class.cast(binder.getInternalBindingResult().getPropertyAccessor()).getAutoGrowCollectionLimit()).isEqualTo(512);
1997+
assertThat(((BeanWrapper) binder.getInternalBindingResult().getPropertyAccessor()).getAutoGrowCollectionLimit()).isEqualTo(512);
19981998
}
19991999

20002000
@Test // SPR-15009

spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ protected TextMessage createTextMessage(MessageCreator creator) throws JMSExcept
652652
new StubTextMessage((String) invocation.getArguments()[0]));
653653
javax.jms.Message message = creator.createMessage(mock);
654654
verify(mock).createTextMessage(any());
655-
return TextMessage.class.cast(message);
655+
return (TextMessage) message;
656656
}
657657

658658
}

spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionHolder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class SessionHolder extends EntityManagerHolder {
5151

5252
public SessionHolder(Session session) {
5353
// Check below is always true against Hibernate >= 5.2 but not against 5.0/5.1 at runtime
54-
super(EntityManager.class.isInstance(session) ? session : null);
54+
super(session instanceof EntityManager ? session : null);
5555
this.session = session;
5656
}
5757

spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public ResultMatcher handlerType(Class<?> type) {
6969
assertNotNull("No handler", handler);
7070
if (handler != null) {
7171
Class<?> actual = handler.getClass();
72-
if (HandlerMethod.class.isInstance(handler)) {
72+
if (handler instanceof HandlerMethod) {
7373
actual = ((HandlerMethod) handler).getBeanType();
7474
}
7575
assertEquals("Handler type", type, ClassUtils.getUserClass(actual));

spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public static <T> T objectResult(@Nullable Collection<?> results, @Nullable Clas
169169
if (String.class == requiredType) {
170170
result = result.toString();
171171
}
172-
else if (Number.class.isAssignableFrom(requiredType) && Number.class.isInstance(result)) {
172+
else if (Number.class.isAssignableFrom(requiredType) && result instanceof Number) {
173173
try {
174174
result = NumberUtils.convertNumberToTargetClass(((Number) result), (Class<? extends Number>) requiredType);
175175
}

spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod)
185185
*/
186186
protected HttpURLConnection openConnection(URL url, @Nullable Proxy proxy) throws IOException {
187187
URLConnection urlConnection = (proxy != null ? url.openConnection(proxy) : url.openConnection());
188-
if (!HttpURLConnection.class.isInstance(urlConnection)) {
188+
if (!(urlConnection instanceof HttpURLConnection)) {
189189
throw new IllegalStateException("HttpURLConnection required for [" + url + "] but got: " + urlConnection);
190190
}
191191
return (HttpURLConnection) urlConnection;

spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public InputStream getBody() throws IOException {
216216
@Override
217217
public ServerHttpAsyncRequestControl getAsyncRequestControl(ServerHttpResponse response) {
218218
if (this.asyncRequestControl == null) {
219-
if (!ServletServerHttpResponse.class.isInstance(response)) {
219+
if (!(response instanceof ServletServerHttpResponse)) {
220220
throw new IllegalArgumentException(
221221
"Response must be a ServletServerHttpResponse: " + response.getClass());
222222
}

spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void assertCustomConfig() throws Exception {
6666

6767
Object config = request.getHttpContext().getAttribute(HttpClientContext.REQUEST_CONFIG);
6868
assertThat(config).as("Request config should be set").isNotNull();
69-
assertThat(RequestConfig.class.isInstance(config)).as("Wrong request config type" + config.getClass().getName()).isTrue();
69+
assertThat(config instanceof RequestConfig).as("Wrong request config type" + config.getClass().getName()).isTrue();
7070
RequestConfig requestConfig = (RequestConfig) config;
7171
assertThat(requestConfig.getConnectTimeout()).as("Wrong custom connection timeout").isEqualTo(1234);
7272
assertThat(requestConfig.getConnectionRequestTimeout()).as("Wrong custom connection request timeout").isEqualTo(4321);

0 commit comments

Comments
 (0)