Skip to content

Commit 86ac477

Browse files
aleksandyaleksandy
committed
remove redundant casting
1 parent 1fe2c2a commit 86ac477

35 files changed

Lines changed: 74 additions & 111 deletions

‎framework/src/play/Logger.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,8 +592,7 @@ static boolean niceThrowable(org.apache.logging.log4j.Level level, Throwable e,
592592
StringWriter sw = new StringWriter();
593593

594594
// Better format for Play exceptions
595-
if (e instanceof PlayException) {
596-
PlayException playException = (PlayException) e;
595+
if (e instanceof PlayException playException) {
597596
PrintWriter errorOut = new PrintWriter(sw);
598597
errorOut.println("");
599598
errorOut.println("");

‎framework/src/play/cache/MemcachedImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public Map<String, Object> get(String[] keys) {
165165
} catch (Exception e) {
166166
future.cancel(false);
167167
}
168-
return Collections.<String, Object>emptyMap();
168+
return Collections.emptyMap();
169169
}
170170

171171
@Override

‎framework/src/play/data/binding/Unbinder.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static void unbindMap(Map<String, Object> result, Object src, Class<?> s
7272
if (!isDirect(key.getClass())) {
7373
throw new UnsupportedOperationException("Unbind won't work with indirect map keys yet");
7474
}
75-
String paramKey = name + '.' + key.toString();
75+
String paramKey = name + '.' + key;
7676
Unbinder.unBind(result, entry.getValue(), paramKey, annotations);
7777
}
7878
}
@@ -118,8 +118,7 @@ private static void internalUnbind(Map<String, Object> result, Object src, Class
118118
for (Annotation annotation : annotations) {
119119
if (annotation.annotationType().equals(As.class)) {
120120
// Check the unbinder param first
121-
Class<? extends TypeUnbinder<?>> toInstantiate = (Class<? extends TypeUnbinder<?>>) ((As) annotation)
122-
.unbinder();
121+
Class<? extends TypeUnbinder<?>> toInstantiate = ((As) annotation).unbinder();
123122
if (!(toInstantiate.equals(As.DEFAULT.class))) {
124123
TypeUnbinder<?> myInstance = toInstantiate.getDeclaredConstructor().newInstance();
125124
isExtendedTypeBinder = myInstance.unBind(result, src, srcClazz, name, annotations);

‎framework/src/play/data/parsing/ApacheMultipartParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ private static String getUniqueId() {
482482

483483
@Override
484484
public String toString() {
485-
return "name=" + this.getName() + ", StoreLocation=" + String.valueOf(this.getStoreLocation()) + ", size=" + this.getSize()
485+
return "name=" + this.getName() + ", StoreLocation=" + this.getStoreLocation() + ", size=" + this.getSize()
486486
+ "bytes, " + "isFormField=" + isFormField() + ", FieldName=" + this.getFieldName();
487487
}
488488

‎framework/src/play/data/validation/EqualsCheck.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ public boolean isSatisfied(Object validatedObject, Object value, OValContext con
3636
requireMessageVariablesRecreation();
3737
try {
3838
if (context != null) {
39-
if (context instanceof MethodParameterContext) {
40-
MethodParameterContext ctx = (MethodParameterContext) context;
39+
if (context instanceof MethodParameterContext ctx) {
4140
Method method = ctx.getMethod();
4241
String[] paramNames = Java.parameterNames(method);
4342
int index = -1;
@@ -60,8 +59,7 @@ public boolean isSatisfied(Object validatedObject, Object value, OValContext con
6059

6160

6261
}
63-
if (context instanceof FieldContext) {
64-
FieldContext ctx = (FieldContext) context;
62+
if (context instanceof FieldContext ctx) {
6563
try {
6664
Field otherField = ctx.getField().getDeclaringClass().getDeclaredField(to);
6765
otherKey = to;

‎framework/src/play/data/validation/UniqueCheck.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ public boolean isSatisfied(Object validatedObject, Object value,
8282
if (i > 0) {
8383
jpql.append(" And ");
8484
}
85-
jpql.append("o.").append(propertyNames[i]).append(" = ?").append(String.valueOf(index++)).append(" ");
85+
jpql.append("o.").append(propertyNames[i]).append(" = ?").append(index++).append(" ");
8686
}
8787
if (isUpdate) {
8888
values[propertyNames.length] = keyValue;
89-
jpql.append(" and o.").append(keyProperty).append(" <> ?").append(String.valueOf(index++)).append(" ");
89+
jpql.append(" and o.").append(keyProperty).append(" <> ?").append(index++).append(" ");
9090
}
9191
return JPQL.instance.count(entityName, jpql.toString(), values) == 0L;
9292
}

‎framework/src/play/data/validation/ValidCheck.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@ public boolean isSatisfied(Object validatedObject, Object value, OValContext con
2525
}
2626
try {
2727
if (context != null) {
28-
if (context instanceof MethodParameterContext) {
29-
MethodParameterContext ctx = (MethodParameterContext) context;
28+
if (context instanceof MethodParameterContext ctx) {
3029
String[] paramNames = Java.parameterNames(ctx.getMethod());
3130
key = paramNames[ctx.getParameterIndex()];
3231
}
33-
if (context instanceof FieldContext) {
34-
FieldContext ctx = (FieldContext) context;
32+
if (context instanceof FieldContext ctx) {
3533
key = ctx.getField().getName();
3634
}
3735
}
@@ -66,8 +64,7 @@ boolean validateObject(String key, Object value) {
6664
return true;
6765
} else {
6866
for (ConstraintViolation violation : violations) {
69-
if (violation.getContext() instanceof FieldContext) {
70-
FieldContext ctx = (FieldContext) violation.getContext();
67+
if (violation.getContext() instanceof FieldContext ctx) {
7168
String fkey = (key == null ? "" : key + ".") + ctx.getField().getName();
7269
Error error = new Error(
7370
fkey,

‎framework/src/play/db/Evolutions.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,7 @@ public static synchronized boolean applyScript(String dbName, boolean runScript,
465465
Logger.error(e, "Can't apply evolution");
466466
if (Evolutions.autoCommit()) {
467467
String message = e.getMessage();
468-
if (e instanceof SQLException) {
469-
SQLException ex = (SQLException) e;
468+
if (e instanceof SQLException ex) {
470469
message += " [ERROR:" + ex.getErrorCode() + ", SQLSTATE:" + ex.getSQLState() + "]";
471470
}
472471

‎framework/src/play/db/c3p0/C3P0DataSourceFactory.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,13 @@ public String getStatus() {
7474

7575
for (String dbName : dbNames) {
7676
DataSource ds = DB.getDataSource(dbName);
77-
if (ds == null || !(ds instanceof ComboPooledDataSource)) {
77+
if (ds == null || !(ds instanceof ComboPooledDataSource datasource)) {
7878
out.println("Datasource:");
7979
out.println("~~~~~~~~~~~");
8080
out.println("(not yet connected)");
8181
return sw.toString();
8282
}
83-
ComboPooledDataSource datasource = (ComboPooledDataSource) ds;
84-
out.println("Datasource (" + dbName + "):");
83+
out.println("Datasource (" + dbName + "):");
8584
out.println("~~~~~~~~~~~");
8685
out.println("Jdbc url: " + datasource.getJdbcUrl());
8786
out.println("Jdbc driver: " + datasource.getDriverClass());

‎framework/src/play/db/helper/SqlQuery.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ protected SqlQuery() {
1515
public List<Object> getParams() { return params; }
1616

1717
public int paramCurrentIndex() { return params.size()+1; }
18-
public String pmark() { return "?"+Integer.toString(paramCurrentIndex()); }
19-
public String pmark(int offset) { return "?"+Integer.toString(paramCurrentIndex()+offset); }
18+
public String pmark() { return "?"+ paramCurrentIndex(); }
19+
public String pmark(int offset) { return "?"+ (paramCurrentIndex() + offset); }
2020

2121
public static class Concat {
2222
private String prefix, separator, suffix;

0 commit comments

Comments
 (0)