You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/07/20 08:03:30 UTC
[4/5] git commit: METAMODEL-70: Fixed dependency on hashmap specifics
- using treemap
METAMODEL-70: Fixed dependency on hashmap specifics - using treemap
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/39c4a391
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/39c4a391
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/39c4a391
Branch: refs/heads/master
Commit: 39c4a391b55e360eaa4132c598648e0b27563756
Parents: 85e457f
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Jul 19 21:48:41 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Jul 19 21:48:41 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/metamodel/pojo/ObjectTableDataProvider.java | 3 ++-
.../test/java/org/apache/metamodel/pojo/PojoDataContextTest.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/39c4a391/pojo/src/main/java/org/apache/metamodel/pojo/ObjectTableDataProvider.java
----------------------------------------------------------------------
diff --git a/pojo/src/main/java/org/apache/metamodel/pojo/ObjectTableDataProvider.java b/pojo/src/main/java/org/apache/metamodel/pojo/ObjectTableDataProvider.java
index 747267c..27d3cce 100644
--- a/pojo/src/main/java/org/apache/metamodel/pojo/ObjectTableDataProvider.java
+++ b/pojo/src/main/java/org/apache/metamodel/pojo/ObjectTableDataProvider.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.TreeMap;
import org.apache.metamodel.schema.ColumnType;
import org.apache.metamodel.schema.ColumnTypeImpl;
@@ -81,7 +82,7 @@ public final class ObjectTableDataProvider<E> implements TableDataProvider<E> {
}
private SimpleTableDef createTableDef() {
- final Map<String,ColumnType> columns = new LinkedHashMap<String, ColumnType>();
+ final Map<String,ColumnType> columns = new TreeMap<String, ColumnType>();
final Method[] methods = _class.getMethods();
for (final Method method : methods) {
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/39c4a391/pojo/src/test/java/org/apache/metamodel/pojo/PojoDataContextTest.java
----------------------------------------------------------------------
diff --git a/pojo/src/test/java/org/apache/metamodel/pojo/PojoDataContextTest.java b/pojo/src/test/java/org/apache/metamodel/pojo/PojoDataContextTest.java
index 778ed1a..e345a8c 100644
--- a/pojo/src/test/java/org/apache/metamodel/pojo/PojoDataContextTest.java
+++ b/pojo/src/test/java/org/apache/metamodel/pojo/PojoDataContextTest.java
@@ -63,8 +63,10 @@ public class PojoDataContextTest extends TestCase {
DataSet dataSet = dc.query().from("persons").innerJoin("titles").on("name", "name").selectAll().execute();
+ assertEquals("[persons.age, persons.name, titles.name, titles.title]",
+ Arrays.toString(dataSet.getSelectItems()));
assertTrue(dataSet.next());
- assertEquals("Row[values=[Elvis Presley, 42, Elvis Presley, The King]]", dataSet.getRow().toString());
+ assertEquals("Row[values=[42, Elvis Presley, Elvis Presley, The King]]", dataSet.getRow().toString());
assertFalse(dataSet.next());
}