提交 5805991d authored 作者: Noel Grandin's avatar Noel Grandin

redundant type specifications

上级 33d135d2
...@@ -5263,7 +5263,7 @@ public class Parser { ...@@ -5263,7 +5263,7 @@ public class Parser {
*/ */
private static List<Column> createQueryColumnTemplateList(String[] cols, private static List<Column> createQueryColumnTemplateList(String[] cols,
Query theQuery, String[] querySQLOutput) { Query theQuery, String[] querySQLOutput) {
List<Column> columnTemplateList = new ArrayList<Column>(); List<Column> columnTemplateList = new ArrayList<>();
theQuery.prepare(); theQuery.prepare();
// array of length 1 to receive extra 'output' field in addition to // array of length 1 to receive extra 'output' field in addition to
// return value // return value
......
...@@ -114,7 +114,7 @@ public class MergeUsing extends Prepared { ...@@ -114,7 +114,7 @@ public class MergeUsing extends Prepared {
private int countUpdatedRows=0; private int countUpdatedRows=0;
private Column[] sourceKeys; private Column[] sourceKeys;
private Select targetMatchQuery; private Select targetMatchQuery;
private HashMap<Value, Integer> targetRowidsRemembered = new HashMap<Value,Integer>(); private HashMap<Value, Integer> targetRowidsRemembered = new HashMap<>();
private int sourceQueryRowNumber= 0; private int sourceQueryRowNumber= 0;
public MergeUsing(Merge merge) { public MergeUsing(Merge merge) {
...@@ -414,8 +414,8 @@ public class MergeUsing extends Prepared { ...@@ -414,8 +414,8 @@ public class MergeUsing extends Prepared {
} }
private HashSet<Column> buildColumnListFromOnCondition(TableFilter anyTableFilter) { private HashSet<Column> buildColumnListFromOnCondition(TableFilter anyTableFilter) {
HashSet<Column> filteredColumns = new HashSet<Column>(); HashSet<Column> filteredColumns = new HashSet<>();
HashSet<Column> columns = new HashSet<Column>(); HashSet<Column> columns = new HashSet<>();
ExpressionVisitor visitor = ExpressionVisitor.getColumnsVisitor(columns); ExpressionVisitor visitor = ExpressionVisitor.getColumnsVisitor(columns);
onCondition.isEverything(visitor); onCondition.isEverything(visitor);
for(Column c: columns){ for(Column c: columns){
......
...@@ -698,7 +698,7 @@ class ToDateTokenizer { ...@@ -698,7 +698,7 @@ class ToDateTokenizer {
Character key = Character.toUpperCase(formatStr.charAt(0)); Character key = Character.toUpperCase(formatStr.charAt(0));
switch (key) { switch (key) {
case '"': case '"':
result = new ArrayList<FormatTokenEnum>(); result = new ArrayList<>();
result.add(INLINE); result.add(INLINE);
break; break;
default: default:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论