removed unnecessary toArray conversion
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/056d4d18 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/056d4d18 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/056d4d18 Branch: refs/heads/master Commit: 056d4d18a9284c5f037ed80e00d6c16fab0c25e1 Parents: 5a9d2d1 Author: JoÌrg Unbehauen <jo...@unbehauen.net> Authored: Fri Jul 28 14:19:34 2017 +0200 Committer: JoÌrg Unbehauen <jo...@unbehauen.net> Committed: Fri Jul 28 14:19:34 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/metamodel/DeleteAndInsertBuilder.java | 2 +- core/src/main/java/org/apache/metamodel/convert/Converters.java | 2 +- .../main/java/org/apache/metamodel/xml/XmlDomDataContext.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/056d4d18/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java b/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java index 2227256..172432d 100644 --- a/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java +++ b/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java @@ -105,7 +105,7 @@ public class DeleteAndInsertBuilder extends AbstractRowUpdationBuilder { final List<FilterItem> whereItems = getWhereItems(); final DataSet dataSet = dc.query() .from(table) - .select(table.getColumns().toArray(new Column[table.getColumns().size()])) + .select(table.getColumns()) .where(whereItems).execute(); final List<Row> rows = dataSet.toRows(); return rows; http://git-wip-us.apache.org/repos/asf/metamodel/blob/056d4d18/core/src/main/java/org/apache/metamodel/convert/Converters.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/convert/Converters.java b/core/src/main/java/org/apache/metamodel/convert/Converters.java index 97b4e65..f0859bb 100644 --- a/core/src/main/java/org/apache/metamodel/convert/Converters.java +++ b/core/src/main/java/org/apache/metamodel/convert/Converters.java @@ -190,7 +190,7 @@ public final class Converters { detectors.put(column, new ColumnTypeDetector()); } - Query query = dataContext.query().from(table).select(columns.toArray(new Column[columns.size()])).toQuery(); + Query query = dataContext.query().from(table).select(columns).toQuery(); if (sampleSize > 0 && sampleSize != Integer.MAX_VALUE) { query.setMaxRows(sampleSize); } http://git-wip-us.apache.org/repos/asf/metamodel/blob/056d4d18/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java ---------------------------------------------------------------------- diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java b/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java index ad8181c..cfc3686 100644 --- a/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java +++ b/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java @@ -533,8 +533,8 @@ public class XmlDomDataContext extends QueryPostprocessDataContext { } Query q = new Query(); - q.select(primaryColumns.toArray(new Column[primaryColumns.size()])); - q.select(foreignColumns.toArray(new Column[foreignColumns.size()])); + q.select(primaryColumns); + q.select(foreignColumns); q.from(new FromItem(JoinType.LEFT, relationship)); if (logger.isDebugEnabled()) { logger.debug("Setting table data for '{}' to query result: {}", primaryTableName, q.toString());
