root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Remove redundant casts 

See gh-12011
This commit is contained in:
igor-suhorukov 2018-02-13 00:42:51 +03:00 committed by Stephane Nicoll
parent 74cede5cdc
commit 71351de694
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicator.java
View File

@ -53,7 +53,7 @@ public class ElasticsearchHealthIndicator extends AbstractHealthIndicator {
*/ */
public ElasticsearchHealthIndicator(Client client, long responseTimeout, public ElasticsearchHealthIndicator(Client client, long responseTimeout,
List<String> indices) { List<String> indices) {
this(client, responseTimeout, (indices == null ? (String[]) null this(client, responseTimeout, (indices == null ? null
: indices.toArray(new String[indices.size()]))); : indices.toArray(new String[indices.size()])));
} }

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java
View File

@ -299,8 +299,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Map<String, String> getTemplateVariables(ServerWebExchange exchange) { private Map<String, String> getTemplateVariables(ServerWebExchange exchange) {
return (Map<String, String>) exchange return exchange.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
} }
private Mono<ResponseEntity<Object>> handleResult(Publisher<?> result, private Mono<ResponseEntity<Object>> handleResult(Publisher<?> result,

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
View File

@ -359,7 +359,7 @@ public final class ConditionMessage {
*/ */
public ConditionMessage items(Style style, Object... items) { public ConditionMessage items(Style style, Object... items) {
return items(style, return items(style,
items == null ? (Collection<?>) null : Arrays.asList(items)); items == null ? null : Arrays.asList(items));
} }
/** /**

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@ -265,8 +265,7 @@ public class FlywayAutoConfiguration {
private DatabaseDriver getDatabaseDriver() { private DatabaseDriver getDatabaseDriver() {
try { try {
String url = (String) JdbcUtils.extractDatabaseMetaData(this.dataSource, String url = JdbcUtils.extractDatabaseMetaData(this.dataSource, "getURL");
"getURL");
return DatabaseDriver.fromJdbcUrl(url); return DatabaseDriver.fromJdbcUrl(url);
} }
catch (MetaDataAccessException ex) { catch (MetaDataAccessException ex) {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
View File

@ -69,7 +69,7 @@ final class DatabaseLookup {
return Database.DEFAULT; return Database.DEFAULT;
} }
try { try {
String url = (String) JdbcUtils.extractDatabaseMetaData(dataSource, "getURL"); String url = JdbcUtils.extractDatabaseMetaData(dataSource, "getURL");
DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url); DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url);
Database database = LOOKUP.get(driver); Database database = LOOKUP.get(driver);
if (database != null) { if (database != null) {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
View File

@ -94,7 +94,7 @@ public final class AnsiColors {
private final double b; private final double b;
LabColor(Integer rgb) { LabColor(Integer rgb) {
this(rgb == null ? (Color) null : new Color(rgb)); this(rgb == null ? null : new Color(rgb));
} }
LabColor(Color color) { LabColor(Color color) {

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
View File

@ -22,7 +22,6 @@ import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.sql.DataSource;
import javax.sql.XAConnection; import javax.sql.XAConnection;
import javax.sql.XADataSource; import javax.sql.XADataSource;
@ -111,7 +110,7 @@ public class PoolingDataSourceBean extends PoolingDataSource
@Override @Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException { public Logger getParentLogger() throws SQLFeatureNotSupportedException {
try { try {
return ((DataSource) this).getParentLogger(); return this.getParentLogger();
} }
catch (Exception ex) { catch (Exception ex) {
// Work around https://jira.codehaus.org/browse/BTM-134 // Work around https://jira.codehaus.org/browse/BTM-134