Merge pull request #15554 from igor-suhorukov

* pr/15554:
  Polish "Replace redundant call to class isInstance() with instanceof"
  Replace redundant call to class isInstance() with instanceof
pull/15559/head
Stephane Nicoll 6 years ago
commit 67eb3b748c

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -68,7 +68,7 @@ class OnManagementPortCondition extends SpringBootCondition {
context.getClassLoader())) {
return false;
}
return WebApplicationContext.class.isInstance(resourceLoader);
return resourceLoader instanceof WebApplicationContext;
}
}

@ -61,7 +61,7 @@ public final class ConditionMessage {
@Override
public boolean equals(Object obj) {
if (obj == null || !ConditionMessage.class.isInstance(obj)) {
if (!(obj instanceof ConditionMessage)) {
return false;
}
if (obj == this) {

@ -70,7 +70,7 @@ public class HypermediaAutoConfigurationTests {
LinkDiscoverers discoverers = this.context.getBean(LinkDiscoverers.class);
assertThat(discoverers).isNotNull();
LinkDiscoverer discoverer = discoverers.getLinkDiscovererFor(MediaTypes.HAL_JSON);
assertThat(HalLinkDiscoverer.class.isInstance(discoverer)).isTrue();
assertThat(discoverer).isInstanceOf(HalLinkDiscoverer.class);
}
@Test

@ -198,7 +198,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
}
java.util.logging.Logger rootLogger = LogManager.getLogManager().getLogger("");
Handler[] handlers = rootLogger.getHandlers();
return handlers.length == 1 && SLF4JBridgeHandler.class.isInstance(handlers[0]);
return handlers.length == 1 && handlers[0] instanceof SLF4JBridgeHandler;
}
private void addLevelChangePropagator(LoggerContext loggerContext) {

Loading…
Cancel
Save