Skip to content

Commit

Permalink
TEIID-3757, TEIID-3039, TEIID-3761, TEIID-3762 making ordering
Browse files Browse the repository at this point in the history 
consistent
  • Loading branch information
@shawkins
shawkins committed Oct 26, 2015
1 parent ea5d7d9 commit 84ad870
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 28 deletions.
4 changes: 2 additions & 2 deletions odata/src/main/java/org/teiid/odata/EntityList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;

import org.odata4j.core.OEntities;
Expand Down Expand Up @@ -160,7 +160,7 @@ public boolean isSameRow(Object previous, Object current) {
private OEntity buildEntity(ResultSet rs, DocumentNode node, EdmEntitySet edmEntitySet, String invalidCharacterReplacement)
throws TransformationException, SQLException, IOException {

HashMap<String, OProperty<?>> properties = new HashMap<String, OProperty<?>>();
LinkedHashMap<String, OProperty<?>> properties = new LinkedHashMap<String, OProperty<?>>();
if (node.getProjectedColumns().isEmpty()) {
for (int i = 0; i < rs.getMetaData().getColumnCount(); i++) {
Object value = rs.getObject(i+1);
Expand Down
44 changes: 18 additions & 26 deletions odata/src/test/java/org/teiid/odata/TestODataIntegration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,9 @@
*/
package org.teiid.odata;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyListOf;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.stub;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;

import java.io.IOException;
import java.io.StringWriter;
Expand Down Expand Up @@ -692,7 +684,7 @@ public void testGetEntity() throws Exception {
"{\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/vw.x('x')\", \"type\" : \"vw.x\"\n" +
"}, \"b\" : {\n" +
"}, \"a\" : \"x\", \"b\" : {\n" +
"\"results\" : [\n" +
"1, 2, 3\n" +
"]\n" +
Expand All @@ -708,7 +700,7 @@ public void testGetEntity() throws Exception {
"]\n" +
"}\n" +
"]\n" +
"}, \"a\" : \"x\"\n" +
"}\n" +
"}\n" +
"]\n" +
"}\n" +
Expand Down Expand Up @@ -755,7 +747,8 @@ public void testArrayResultsInAtom() throws Exception {
"</content>";
assertTrue(response.getEntity().contains(expected));

expected = "<m:properties>" +
expected = "<m:properties>" +
"<d:a>x</d:a>" +
"<d:b m:type=\"Collection(Edm.Int32)\">" +
"<d:element>1</d:element>" +
"<d:element>2</d:element>" +
Expand All @@ -770,8 +763,7 @@ public void testArrayResultsInAtom() throws Exception {
"<d:element>c</d:element>" +
"<d:element>d</d:element>" +
"</d:element>" +
"</d:c>" +
"<d:a>x</d:a>" +
"</d:c>" +
"</m:properties>";
request = new ClientRequest(TestPortProvider.generateURL("/odata/northwind/x"));
response = request.get(String.class);
Expand Down Expand Up @@ -1423,10 +1415,10 @@ public boolean supportsOuterJoins() {
"{\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.x('xa')\", \"type\" : \"m.x\"\n" +
"}, \"b\" : \"xb\", \"a\" : \"xa\", \"y\" : {\n" +
"}, \"a\" : \"xa\", \"b\" : \"xb\", \"y\" : {\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.y('xa')\", \"type\" : \"m.y\"\n" +
"}, \"b1\" : \"yb\", \"a1\" : \"xa\"\n" +
"}, \"a1\" : \"xa\", \"b1\" : \"yb\"\n" +
"}, \"z\" : {\n" +
"\"__deferred\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.x('xa')/z\"\n" +
Expand All @@ -1435,10 +1427,10 @@ public boolean supportsOuterJoins() {
"}, {\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.x('xa1')\", \"type\" : \"m.x\"\n" +
"}, \"b\" : \"xb1\", \"a\" : \"xa1\", \"y\" : {\n" +
"}, \"a\" : \"xa1\", \"b\" : \"xb1\", \"y\" : {\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.y('xa1')\", \"type\" : \"m.y\"\n" +
"}, \"b1\" : \"yb1\", \"a1\" : \"xa1\"\n" +
"}, \"a1\" : \"xa1\", \"b1\" : \"yb1\"\n" +
"}, \"z\" : {\n" +
"\"__deferred\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.x('xa1')/z\"\n" +
Expand All @@ -1447,10 +1439,10 @@ public boolean supportsOuterJoins() {
"}, {\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.x('xa2')\", \"type\" : \"m.x\"\n" +
"}, \"b\" : \"xb2\", \"a\" : \"xa2\", \"y\" : {\n" +
"}, \"a\" : \"xa2\", \"b\" : \"xb2\", \"y\" : {\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.y('xa2')\", \"type\" : \"m.y\"\n" +
"}, \"b1\" : \"yb2\", \"a1\" : \"xa2\"\n" +
"}, \"a1\" : \"xa2\", \"b1\" : \"yb2\"\n" +
"}, \"z\" : {\n" +
"\"__deferred\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.x('xa2')/z\"\n" +
Expand All @@ -1473,7 +1465,7 @@ public boolean supportsOuterJoins() {
"{\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.x('xa')\", \"type\" : \"m.x\"\n" +
"}, \"b\" : \"xb\", \"a\" : \"xa\", \"y\" : {\n" +
"}, \"a\" : \"xa\", \"b\" : \"xb\", \"y\" : {\n" +
"\"__deferred\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.x('xa')/y\"\n" +
"}\n" +
Expand All @@ -1482,15 +1474,15 @@ public boolean supportsOuterJoins() {
"{\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.z('zb')\", \"type\" : \"m.z\"\n" +
"}, \"b1\" : \"zb\", \"a1\" : \"xa\"\n" +
"}, \"a1\" : \"xa\", \"b1\" : \"zb\"\n" +
"}, {\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.z('zb1')\", \"type\" : \"m.z\"\n" +
"}, \"b1\" : \"zb1\", \"a1\" : \"xa\"\n" +
"}, \"a1\" : \"xa\", \"b1\" : \"zb1\"\n" +
"}, {\n" +
"\"__metadata\" : {\n" +
"\"uri\" : \"http://localhost:8081/odata/northwind/m.z('zb2')\", \"type\" : \"m.z\"\n" +
"}, \"b1\" : \"zb2\", \"a1\" : \"xa\"\n" +
"}, \"a1\" : \"xa\", \"b1\" : \"zb2\"\n" +
"}\n" +
"]\n" +
"}\n" +
Expand Down

0 comments on commit 84ad870

Please sign in to comment.