From ea504a93cf4c22cac41279dbf270cd3e58470590 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 31 Jul 2015 20:11:31 +1200 Subject: [PATCH] No effective change - code cleanup - remove redundant casts --- src/main/java/com/avaje/ebean/common/ModifyHolder.java | 2 +- src/main/java/com/avaje/ebean/util/StringHelper.java | 2 +- .../com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java | 2 +- .../ebeaninternal/server/deploy/id/ImportedIdSimple.java | 2 +- .../server/deploy/meta/DeployBeanProperty.java | 2 +- .../ebeaninternal/server/deploy/meta/DeployTableJoin.java | 4 ++-- .../ebeaninternal/server/deploy/parse/DeployBeanInfo.java | 2 +- .../ebeaninternal/server/deploy/parse/DeployInherit.java | 6 +++--- .../avaje/ebeaninternal/server/lib/util/DnodeParser.java | 2 +- .../avaje/ebeaninternal/server/lib/util/StringHelper.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/avaje/ebean/common/ModifyHolder.java b/src/main/java/com/avaje/ebean/common/ModifyHolder.java index 8c72aa850..e41987b0c 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyHolder.java +++ b/src/main/java/com/avaje/ebean/common/ModifyHolder.java @@ -58,7 +58,7 @@ class ModifyHolder implements Serializable { void modifyRemoval(Object bean) { if (bean != null) { // If it is to be added then just remove the addition - if (!modifyAdditions.remove((E) bean)) { + if (!modifyAdditions.remove(bean)) { modifyDeletions.add((E) bean); } } diff --git a/src/main/java/com/avaje/ebean/util/StringHelper.java b/src/main/java/com/avaje/ebean/util/StringHelper.java index 59cd663ad..6e0a23123 100644 --- a/src/main/java/com/avaje/ebean/util/StringHelper.java +++ b/src/main/java/com/avaje/ebean/util/StringHelper.java @@ -241,7 +241,7 @@ public class StringHelper { int startPos = 0; delimiter(str, delimiter, keepEmpties, startPos, list); String[] result = new String[list.size()]; - return (String[]) list.toArray(result); + return list.toArray(result); } private static void delimiter(String str, String delimiter, boolean keepEmpties, int startPos, diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java index 496f0b7dd..a5fea21d0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java @@ -62,7 +62,7 @@ public class DeployOrmXml { Dnode nqQueryNode = nqNode.find("query"); if (nqQueryNode != null) { String queryContent = nqQueryNode.getNodeContent(); - String queryName = (String) nqNode.getAttribute("name"); + String queryName = nqNode.getAttribute("name"); if (queryName != null && queryContent != null) { DNativeQuery query = new DNativeQuery(queryContent); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java index 272279b35..2cbead8a5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -56,7 +56,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable list) { - ImportedIdSimple[] importedIds = (ImportedIdSimple[]) list.toArray(new ImportedIdSimple[list.size()]); + ImportedIdSimple[] importedIds = list.toArray(new ImportedIdSimple[list.size()]); // sort into the same order as the BeanProperties Arrays.sort(importedIds, COMPARATOR); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index ce4b0c690..5a1620e39 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -873,7 +873,7 @@ public class DeployBeanProperty { * Return an extra attribute set on this property. */ public String getExtraAttribute(String key) { - return (String) extraAttributeMap.get(key); + return extraAttributeMap.get(key); } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java index dd7901965..b691cc14f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java @@ -135,14 +135,14 @@ public class DeployTableJoin { * Return the join columns. */ public DeployTableJoinColumn[] columns() { - return (DeployTableJoinColumn[]) columns.toArray(new DeployTableJoinColumn[columns.size()]); + return columns.toArray(new DeployTableJoinColumn[columns.size()]); } /** * For secondary table joins returns the properties mapped to that table. */ public DeployBeanProperty[] properties() { - return (DeployBeanProperty[]) properties.toArray(new DeployBeanProperty[properties.size()]); + return properties.toArray(new DeployBeanProperty[properties.size()]); } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java index a85e48cbe..1b1b58911 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java @@ -54,7 +54,7 @@ public class DeployBeanInfo { String key = tableName.toLowerCase(); - DeployTableJoin tableJoin = (DeployTableJoin) tableJoinMap.get(key); + DeployTableJoin tableJoin = tableJoinMap.get(key); if (tableJoin == null) { tableJoin = new DeployTableJoin(); tableJoin.setTable(tableName); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java index 158866e0e..eb16e18b8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java @@ -116,11 +116,11 @@ public class DeployInherit { // its the root of inheritance tree... } - Inheritance ia = (Inheritance) cls.getAnnotation(Inheritance.class); + Inheritance ia = cls.getAnnotation(Inheritance.class); if (ia != null) { ia.strategy(); } - DiscriminatorColumn da = (DiscriminatorColumn) cls.getAnnotation(DiscriminatorColumn.class); + DiscriminatorColumn da = cls.getAnnotation(DiscriminatorColumn.class); if (da != null) { // lowercase the discriminator column for RawSql and JSON info.setDiscriminatorColumn(da.name().toLowerCase()); @@ -133,7 +133,7 @@ public class DeployInherit { info.setDiscriminatorLength(da.length()); } - DiscriminatorValue dv = (DiscriminatorValue) cls.getAnnotation(DiscriminatorValue.class); + DiscriminatorValue dv = cls.getAnnotation(DiscriminatorValue.class); if (dv != null) { info.setDiscriminatorValue(dv.value()); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/DnodeParser.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/DnodeParser.java index 04c902118..e798a77ed 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/DnodeParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/DnodeParser.java @@ -192,7 +192,7 @@ public class DnodeParser extends DefaultHandler { stack.pop(); if (!stack.isEmpty()) { // get the new currentNode - currentNode = (Dnode) stack.pop(); + currentNode = stack.pop(); stack.push(currentNode); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java index 019a8c8bc..857116103 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java @@ -241,7 +241,7 @@ public class StringHelper { int startPos = 0; delimiter(str, delimiter, keepEmpties, startPos, list); String[] result = new String[list.size()]; - return (String[]) list.toArray(result); + return list.toArray(result); } private static void delimiter(String str, String delimiter, boolean keepEmpties, int startPos,