Skip to content

Commit 884d207

Browse files
tglmantglman
committedJun 25, 2014
upgraded java version to 1.7 and minor code refactor.
1 parent 65b99f9 commit 884d207

19 files changed

+106
-90
lines changed
 

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
<properties>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
<maven.compiler.source>1.5</maven.compiler.source>
30-
<maven.compiler.target>1.5</maven.compiler.target>
29+
<maven.compiler.source>1.7</maven.compiler.source>
30+
<maven.compiler.target>1.7</maven.compiler.target>
3131
</properties>
3232

3333
<dependencies>

‎src/main/java/org/objectquery/mongodb/MongoDBObjectQuery.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.objectquery.BaseQuery;
1111
import org.objectquery.DeleteQuery;
1212
import org.objectquery.InsertQuery;
13-
import org.objectquery.BaseSelectQuery;
13+
import org.objectquery.SelectQuery;
1414
import org.objectquery.UpdateQuery;
1515
import org.objectquery.generic.GenericBaseQuery;
1616
import org.objectquery.generic.ObjectQueryException;
@@ -28,7 +28,7 @@ public static MongoDBQueryBuilder mongoDBBuilder(BaseQuery<?> query) {
2828
}
2929

3030
@SuppressWarnings("unchecked")
31-
public static <RET extends List<?>> RET execute(BaseSelectQuery<?> query, Datastore engineSession) {
31+
public static <RET extends List<?>> RET execute(SelectQuery<?> query, Datastore engineSession) {
3232
DBCollection collection = getCollection(query, engineSession);
3333
DBCursor cursor = executeSelect(query, collection);
3434
Mapper mapper = ((DatastoreImpl) engineSession).getMapper();
@@ -40,7 +40,7 @@ public static <RET extends List<?>> RET execute(BaseSelectQuery<?> query, Datast
4040
return (RET) res;
4141
}
4242

43-
private static DBCursor executeSelect(BaseSelectQuery<?> query, DBCollection collection) {
43+
private static DBCursor executeSelect(SelectQuery<?> query, DBCollection collection) {
4444
MongoDBQueryBuilder builder = mongoDBBuilder(query);
4545
DBCursor cursor = collection.find(builder.getQuery(), builder.getProjections());
4646
return cursor;
@@ -51,7 +51,7 @@ private static DBCollection getCollection(BaseQuery<?> query, Datastore engineSe
5151
}
5252

5353
@SuppressWarnings("unchecked")
54-
public static <RET extends List<?>> RET execute(BaseSelectQuery<?> query, DBCollection engineSession) {
54+
public static <RET extends List<?>> RET execute(SelectQuery<?> query, DBCollection engineSession) {
5555
return (RET) executeSelect(query, engineSession).toArray();
5656
}
5757

‎src/main/java/org/objectquery/mongodb/MongoDBQueryBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public MongoDBQueryBuilder(GenericBaseQuery<?> query) {
3333
GenericInternalQueryBuilder builder = (GenericInternalQueryBuilder) query.getBuilder();
3434
switch (builder.getQueryType()) {
3535
case SELECT:
36-
buildSelect(query.getTargetClass(), builder, ((GenericSelectQuery<?,?>) query).getJoins(), query.getRootPathItem().getName());
36+
buildSelect(query.getTargetClass(), builder, ((GenericSelectQuery<?, ?>) query).getJoins(), query.getRootPathItem().getName());
3737
break;
3838
case DELETE:
3939
buildDelete(query.getTargetClass(), builder);

‎src/main/java/org/objectquery/mongodb/MongoDBQueryEngine.java

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.objectquery.DeleteQuery;
66
import org.objectquery.InsertQuery;
77
import org.objectquery.QueryEngine;
8+
import org.objectquery.SelectMapQuery;
89
import org.objectquery.SelectQuery;
910
import org.objectquery.UpdateQuery;
1011

@@ -32,4 +33,9 @@ public int execute(UpdateQuery<?> query, DBCollection engineSession) {
3233
return MongoDBObjectQuery.execute(query, engineSession);
3334
}
3435

36+
@Override
37+
public <RET extends List<M>, M> RET execute(SelectMapQuery<?, M> query, DBCollection engineSession) {
38+
// TODO Auto-generated method stub
39+
return null;
40+
}
3541
}

‎src/main/java/org/objectquery/mongodb/MorphiaQueryEngine.java

+7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.objectquery.DeleteQuery;
77
import org.objectquery.InsertQuery;
88
import org.objectquery.QueryEngine;
9+
import org.objectquery.SelectMapQuery;
910
import org.objectquery.SelectQuery;
1011
import org.objectquery.UpdateQuery;
1112

@@ -31,4 +32,10 @@ public int execute(UpdateQuery<?> query, Datastore engineSession) {
3132
return MongoDBObjectQuery.execute(query, engineSession);
3233
}
3334

35+
@Override
36+
public <RET extends List<M>, M> RET execute(SelectMapQuery<?, M> query, Datastore engineSession) {
37+
// TODO Auto-generated method stub
38+
return null;
39+
}
40+
3441
}

‎src/test/java/org/objectquery/mongodb/QueryEngineTest.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.objectquery.mongodb;
22

3-
import org.junit.Assert;
3+
import static org.junit.Assert.assertTrue;
4+
45
import org.junit.Test;
56
import org.mongodb.morphia.Datastore;
67
import org.objectquery.QueryEngine;
@@ -12,18 +13,18 @@ public class QueryEngineTest {
1213
@Test
1314
public void testFactory() {
1415
QueryEngine<DBCollection> instance = QueryEngine.instance(DBCollection.class);
15-
Assert.assertTrue(instance instanceof MongoDBQueryEngine);
16+
assertTrue(instance instanceof MongoDBQueryEngine);
1617
}
1718

1819
@Test
1920
public void testFactoryMorphia() {
2021
QueryEngine<Datastore> instance = QueryEngine.instance(Datastore.class);
21-
Assert.assertTrue(instance instanceof MorphiaQueryEngine);
22+
assertTrue(instance instanceof MorphiaQueryEngine);
2223
}
23-
24+
2425
@Test
2526
public void testDefaultFactory() {
2627
QueryEngine<DBCollection> instance = QueryEngine.defaultInstance();
27-
Assert.assertTrue(instance instanceof MongoDBQueryEngine);
28+
assertTrue(instance instanceof MongoDBQueryEngine);
2829
}
2930
}

‎src/test/java/org/objectquery/mongodb/TestDeleteQuery.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.objectquery.mongodb;
22

3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertTrue;
5+
36
import org.junit.After;
4-
import org.junit.Assert;
57
import org.junit.Before;
68
import org.junit.Test;
79
import org.mongodb.morphia.Datastore;
@@ -26,15 +28,15 @@ public void testSimpleDelete() {
2628
collection.save(ot);
2729
DeleteQuery<Other> dq = new GenericeDeleteQuery<Other>(Other.class);
2830
int deleted = MongoDBObjectQuery.execute(dq, collection);
29-
Assert.assertTrue(deleted != 0);
31+
assertTrue(deleted != 0);
3032

3133
}
3234

3335
@Test
3436
public void testSimpleDeleteGen() {
3537
DeleteQuery<Person> dq = new GenericeDeleteQuery<Person>(Person.class);
3638
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(dq);
37-
Assert.assertEquals("{ }", q.getQuery().toString());
39+
assertEquals("{ }", q.getQuery().toString());
3840
}
3941

4042
@Test
@@ -46,7 +48,7 @@ public void testDeleteCondition() {
4648
DeleteQuery<Person> dq = new GenericeDeleteQuery<Person>(Person.class);
4749
dq.eq(dq.target().getName(), "to-delete");
4850
int deleted = MongoDBObjectQuery.execute(dq, collection);
49-
Assert.assertTrue(deleted != 0);
51+
assertTrue(deleted != 0);
5052
}
5153

5254
@Test
@@ -55,7 +57,7 @@ public void testDeleteConditionGen() {
5557
DeleteQuery<Person> dq = new GenericeDeleteQuery<Person>(Person.class);
5658
dq.eq(dq.target().getName(), "to-delete");
5759
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(dq);
58-
Assert.assertEquals("{ \"$and\" : [ { \"name\" : \"to-delete\"}]}", q.getQuery().toString());
60+
assertEquals("{ \"$and\" : [ { \"name\" : \"to-delete\"}]}", q.getQuery().toString());
5961
}
6062

6163
@After

‎src/test/java/org/objectquery/mongodb/TestInsertQuery.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.objectquery.mongodb;
22

3-
import junit.framework.Assert;
3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertTrue;
45

56
import org.junit.After;
67
import org.junit.Before;
@@ -26,23 +27,23 @@ public void beforeTest() {
2627
public void testSimpleInsert() {
2728
InsertQuery<Other> ip = new GenericInsertQuery<Other>(Other.class);
2829
ip.set(ip.target().getText(), "test");
29-
Assert.assertTrue(MongoDBObjectQuery.execute(ip, datastore));
30+
assertTrue(MongoDBObjectQuery.execute(ip, datastore));
3031
}
3132

3233
@Test
3334
public void testSimpleInsertGen() {
3435
InsertQuery<Person> ip = new GenericInsertQuery<Person>(Person.class);
3536
ip.set(ip.target().getName(), "test");
3637
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(ip);
37-
Assert.assertEquals("{ \"name\" : \"test\"}", q.getData().toString());
38+
assertEquals("{ \"name\" : \"test\"}", q.getData().toString());
3839
}
3940

4041
@Test
4142
public void testMultipInsert() {
4243
InsertQuery<Home> ip = new GenericInsertQuery<Home>(Home.class);
4344
ip.set(ip.box(ip.target().getPrice()), 4D);
4445
ip.set(ip.box(ip.target().getWeight()), 6);
45-
Assert.assertTrue(MongoDBObjectQuery.execute(ip, datastore));
46+
assertTrue(MongoDBObjectQuery.execute(ip, datastore));
4647
}
4748

4849
@Test
@@ -51,7 +52,7 @@ public void testMultipInsertGen() {
5152
ip.set(ip.box(ip.target().getPrice()), 4D);
5253
ip.set(ip.box(ip.target().getWeight()), 6);
5354
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(ip);
54-
Assert.assertEquals("{ \"price\" : 4.0 , \"weight\" : 6}", q.getData().toString());
55+
assertEquals("{ \"price\" : 4.0 , \"weight\" : 6}", q.getData().toString());
5556

5657
}
5758

@@ -60,14 +61,14 @@ public void testNestedInsertGen() {
6061
InsertQuery<Person> ip = new GenericInsertQuery<Person>(Person.class);
6162
ip.set(ip.target().getDud().getName(), "test");
6263
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(ip);
63-
Assert.assertEquals("{ \"dud\" : { \"name\" : \"test\"}}", q.getData().toString());
64+
assertEquals("{ \"dud\" : { \"name\" : \"test\"}}", q.getData().toString());
6465
}
6566

6667
@Test
6768
public void testNestedInsert() {
6869
InsertQuery<Document> ip = new GenericInsertQuery<Document>(Document.class);
6970
ip.set(ip.target().getMetadata().getAuthor(), "test");
70-
Assert.assertTrue(MongoDBObjectQuery.execute(ip, datastore));
71+
assertTrue(MongoDBObjectQuery.execute(ip, datastore));
7172
}
7273

7374
@After

‎src/test/java/org/objectquery/mongodb/TestJoinQuery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class TestJoinQuery {
1010

1111
@Test(expected = ObjectQueryException.class)
1212
public void testSimpleJoin() {
13-
SelectQuery<Person> query = new GenericSelectQuery<Person,Object>(Person.class);
13+
SelectQuery<Person> query = new GenericSelectQuery<Person, Object>(Person.class);
1414
Person joined = query.join(Person.class);
1515
query.eq(query.target().getMom(), joined);
1616

‎src/test/java/org/objectquery/mongodb/TestPersistentJoin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void beforeTest() {
2020

2121
@Test(expected = ObjectQueryException.class)
2222
public void testSimpleJoin() {
23-
SelectQuery<Person> query = new GenericSelectQuery<Person,Object>(Person.class);
23+
SelectQuery<Person> query = new GenericSelectQuery<Person, Object>(Person.class);
2424
Person joined = query.join(Person.class);
2525
query.eq(query.target().getMom(), joined);
2626

‎src/test/java/org/objectquery/mongodb/TestPersistentSelect.java

+27-26
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.objectquery.mongodb;
22

3+
import static org.junit.Assert.assertEquals;
4+
35
import java.util.ArrayList;
46
import java.util.List;
57

68
import org.junit.After;
7-
import org.junit.Assert;
89
import org.junit.Before;
910
import org.junit.Test;
1011
import org.mongodb.morphia.Datastore;
@@ -34,15 +35,15 @@ public void testSimpleSelect() {
3435

3536
List<Person> res = MongoDBObjectQuery.execute(qp, datastore);
3637

37-
Assert.assertEquals(1, res.size());
38-
Assert.assertEquals(res.get(0).getName(), "tom");
38+
assertEquals(1, res.size());
39+
assertEquals(res.get(0).getName(), "tom");
3940
}
4041

4142
@Test
4243
public void testSimpleSelectWithutCond() {
4344
GenericSelectQuery<Person, Object> qp = new GenericSelectQuery<Person, Object>(Person.class);
4445
List<Person> res = MongoDBObjectQuery.execute(qp, datastore);
45-
Assert.assertEquals(3, res.size());
46+
assertEquals(3, res.size());
4647
}
4748

4849
@Test(expected = ObjectQueryException.class)
@@ -51,8 +52,8 @@ public void testSelectPathValue() {
5152
Person target = qp.target();
5253
qp.eq(target.getDud().getHome(), target.getMom().getHome());
5354
List<Person> res = MongoDBObjectQuery.execute(qp, datastore);
54-
Assert.assertEquals(1, res.size());
55-
Assert.assertEquals(res.get(0).getDud().getHome(), res.get(0).getMom().getHome());
55+
assertEquals(1, res.size());
56+
assertEquals(res.get(0).getDud().getHome(), res.get(0).getMom().getHome());
5657
}
5758

5859
@Test
@@ -61,8 +62,8 @@ public void testSelectPathParam() {
6162
Person target = qp.target();
6263
qp.eq(target.getHome().getAddress(), "homeless");
6364
List<Person> res = MongoDBObjectQuery.execute(qp, datastore);
64-
Assert.assertEquals(1, res.size());
65-
Assert.assertEquals(res.get(0).getHome().getAddress(), "homeless");
65+
assertEquals(1, res.size());
66+
assertEquals(res.get(0).getHome().getAddress(), "homeless");
6667
}
6768

6869
@Test(expected = ObjectQueryException.class)
@@ -81,9 +82,9 @@ public void testSelectPrjection() {
8182
qp.prj(target.getHome());
8283
qp.eq(target.getName(), "tom");
8384
List<DBObject> res = MongoDBObjectQuery.execute(qp, datastore.getCollection(Person.class));
84-
Assert.assertEquals(1, res.size());
85-
Assert.assertEquals("tom", res.get(0).get("name"));
86-
Assert.assertEquals("homeless", ((DBObject) res.get(0).get("home")).get("address"));
85+
assertEquals(1, res.size());
86+
assertEquals("tom", res.get(0).get("name"));
87+
assertEquals("homeless", ((DBObject) res.get(0).get("home")).get("address"));
8788
}
8889

8990
@Test
@@ -93,10 +94,10 @@ public void testSelectOrder() {
9394
qp.prj(target.getName());
9495
qp.order(target.getName());
9596
List<Person> res = MongoDBObjectQuery.execute(qp, datastore);
96-
Assert.assertEquals(3, res.size());
97-
Assert.assertEquals("tom", res.get(0).getName());
98-
Assert.assertEquals("tomdud", res.get(1).getName());
99-
Assert.assertEquals("tommum", res.get(2).getName());
97+
assertEquals(3, res.size());
98+
assertEquals("tom", res.get(0).getName());
99+
assertEquals("tomdud", res.get(1).getName());
100+
assertEquals("tommum", res.get(2).getName());
100101
}
101102

102103
@Test
@@ -106,10 +107,10 @@ public void testSelectOrderDesc() {
106107
qp.prj(target.getName());
107108
qp.order(target.getName(), OrderType.DESC);
108109
List<Person> res = MongoDBObjectQuery.execute(qp, datastore);
109-
Assert.assertEquals(3, res.size());
110-
Assert.assertEquals("tommum", res.get(0).getName());
111-
Assert.assertEquals("tomdud", res.get(1).getName());
112-
Assert.assertEquals("tom", res.get(2).getName());
110+
assertEquals(3, res.size());
111+
assertEquals("tommum", res.get(0).getName());
112+
assertEquals("tomdud", res.get(1).getName());
113+
assertEquals("tom", res.get(2).getName());
113114
}
114115

115116
@Test
@@ -124,7 +125,7 @@ public void testSelectSimpleConditions() {
124125
qp.ltEq(target.getName(), "tom");
125126
qp.notEq(target.getName(), "tom");
126127
List<Object[]> res = MongoDBObjectQuery.execute(qp, datastore);
127-
Assert.assertEquals(0, res.size());
128+
assertEquals(0, res.size());
128129

129130
}
130131

@@ -138,7 +139,7 @@ public void testSelectLikeConditions() {
138139
qp.likeNc(target.getName(), "tom");
139140
qp.notLikeNc(target.getName(), "tom");
140141
List<Object[]> res = MongoDBObjectQuery.execute(qp, datastore);
141-
Assert.assertEquals(0, res.size());
142+
assertEquals(0, res.size());
142143

143144
}
144145

@@ -154,7 +155,7 @@ public void testSelectINCondition() {
154155
qp.notIn(target.getName(), pars);
155156

156157
List<Object[]> res = MongoDBObjectQuery.execute(qp, datastore);
157-
Assert.assertEquals(0, res.size());
158+
assertEquals(0, res.size());
158159
}
159160

160161
@Test(expected = ObjectQueryException.class)
@@ -165,7 +166,7 @@ public void testSelectContainsCondition() {
165166
qp0.eq(target0.getName(), "tom");
166167

167168
List<Person> res0 = MongoDBObjectQuery.execute(qp0, datastore);
168-
Assert.assertEquals(1, res0.size());
169+
assertEquals(1, res0.size());
169170
Person p = res0.get(0);
170171

171172
GenericSelectQuery<Person, Object> qp = new GenericSelectQuery<Person, Object>(Person.class);
@@ -174,7 +175,7 @@ public void testSelectContainsCondition() {
174175
qp.notContains(target.getFriends(), p);
175176

176177
List<Object[]> res = MongoDBObjectQuery.execute(qp, datastore);
177-
Assert.assertEquals(0, res.size());
178+
assertEquals(0, res.size());
178179
}
179180

180181
@Test(expected = ObjectQueryException.class)
@@ -230,8 +231,8 @@ public void testSelectBetweenCondition() {
230231
qp.between(qp.box(target.getPrice()), 100000D, 2000000D);
231232

232233
List<Home> res = MongoDBObjectQuery.execute(qp, datastore);
233-
Assert.assertEquals(1, res.size());
234-
Assert.assertEquals(res.get(0).getPrice(), 1000000d, 0);
234+
assertEquals(1, res.size());
235+
assertEquals(res.get(0).getPrice(), 1000000d, 0);
235236
}
236237

237238
@After

‎src/test/java/org/objectquery/mongodb/TestPersistentSubQuery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void beforeTest() {
2121

2222
@Test(expected = ObjectQueryException.class)
2323
public void testSubquerySimple() {
24-
SelectQuery<Person> query = new GenericSelectQuery<Person,Object>(Person.class);
24+
SelectQuery<Person> query = new GenericSelectQuery<Person, Object>(Person.class);
2525

2626
BaseSelectQuery<Person> subQuery = query.subQuery(Person.class);
2727
subQuery.eq(subQuery.target().getName(), "tomdud");

‎src/test/java/org/objectquery/mongodb/TestSimpleQuery.java

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.objectquery.mongodb;
22

3+
import static org.junit.Assert.assertEquals;
4+
35
import java.util.ArrayList;
46
import java.util.List;
57

6-
import org.junit.Assert;
78
import org.junit.Test;
89
import org.objectquery.SelectQuery;
910
import org.objectquery.generic.GenericSelectQuery;
@@ -24,7 +25,7 @@ public void testBaseCondition() {
2425
Person target = qp.target();
2526
qp.eq(target.getName(), "tom");
2627

27-
Assert.assertEquals("{ \"$query\" : { \"$and\" : [ { \"name\" : \"tom\"}]}}", JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
28+
assertEquals("{ \"$query\" : { \"$and\" : [ { \"name\" : \"tom\"}]}}", JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
2829
}
2930

3031
@Test
@@ -34,7 +35,7 @@ public void testDupliedPath() {
3435
Person target = qp.target();
3536
qp.eq(target.getName(), "tom");
3637
qp.eq(target.getName(), "tom2");
37-
Assert.assertEquals("{ \"$query\" : { \"$and\" : [ { \"name\" : \"tom\"} , { \"name\" : \"tom2\"}]}}",
38+
assertEquals("{ \"$query\" : { \"$and\" : [ { \"name\" : \"tom\"} , { \"name\" : \"tom2\"}]}}",
3839
JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
3940
}
4041

@@ -45,7 +46,7 @@ public void testDottedPath() {
4546
Person target = qp.target();
4647
qp.eq(target.getDog().getName(), "tom");
4748
qp.eq(target.getDud().getName(), "tom3");
48-
Assert.assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"} , { \"dud.name\" : \"tom3\"}]}}",
49+
assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"} , { \"dud.name\" : \"tom3\"}]}}",
4950
JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
5051

5152
}
@@ -58,8 +59,8 @@ public void testProjection() {
5859
qp.prj(target.getName());
5960
qp.eq(target.getDog().getName(), "tom");
6061

61-
Assert.assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"}]}}", JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
62-
Assert.assertEquals("{ \"name\" : 1}", JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getProjections()));
62+
assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"}]}}", JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
63+
assertEquals("{ \"name\" : 1}", JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getProjections()));
6364

6465
}
6566

@@ -83,7 +84,7 @@ public void testSelectOrder() {
8384
qp.eq(target.getDog().getName(), "tom");
8485
qp.order(target.getName());
8586

86-
Assert.assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"}]} , \"$orderby\" : { \"name\" : 1}}",
87+
assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"}]} , \"$orderby\" : { \"name\" : 1}}",
8788
JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
8889
}
8990

@@ -95,7 +96,7 @@ public void testOrderAsc() {
9596
qp.eq(target.getDog().getName(), "tom");
9697
qp.order(target.getName(), OrderType.ASC);
9798

98-
Assert.assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"}]} , \"$orderby\" : { \"name\" : 1}}",
99+
assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"}]} , \"$orderby\" : { \"name\" : 1}}",
99100
JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
100101

101102
}
@@ -109,7 +110,7 @@ public void testOrderDesc() {
109110
qp.order(target.getName(), OrderType.DESC);
110111
qp.order(target.getDog().getName(), OrderType.DESC);
111112

112-
Assert.assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"}]} , \"$orderby\" : { \"name\" : -1 , \"dog\" : { \"name\" : -1}}}",
113+
assertEquals("{ \"$query\" : { \"$and\" : [ { \"dog.name\" : \"tom\"}]} , \"$orderby\" : { \"name\" : -1 , \"dog\" : { \"name\" : -1}}}",
113114
JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
114115
}
115116

@@ -147,7 +148,7 @@ public void testAllSimpleConditions() {
147148
qp.ltEq(target.getName(), "tom");
148149
qp.notEq(target.getName(), "tom");
149150

150-
Assert.assertEquals(
151+
assertEquals(
151152
"{ \"$query\" : { \"$and\" : [ { \"name\" : \"tom\"} , { \"name\" : { \"$gt\" : \"tom\"}} , { \"name\" : { \"$lt\" : \"tom\"}} , { \"name\" : { \"$gte\" : \"tom\"}}"
152153
+ " , { \"name\" : { \"$lte\" : \"tom\"}} , { \"name\" : { \"$ne\" : \"tom\"}}]}}",
153154
JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
@@ -173,7 +174,7 @@ public void testINCondition() {
173174
pars.add("tom");
174175
qp.in(target.getName(), pars);
175176
qp.notIn(target.getName(), pars);
176-
Assert.assertEquals("{ \"$query\" : { \"$and\" : [ { \"name\" : { \"$in\" : [ \"tom\"]}} , { \"name\" : { \"$nin\" : [ \"tom\"]}}]}}",
177+
assertEquals("{ \"$query\" : { \"$and\" : [ { \"name\" : { \"$in\" : [ \"tom\"]}} , { \"name\" : { \"$nin\" : [ \"tom\"]}}]}}",
177178
JSON.serialize(MongoDBObjectQuery.mongoDBBuilder(qp).getQuery()));
178179
}
179180

‎src/test/java/org/objectquery/mongodb/TestSubQuery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private static String getQueryString(SelectQuery<Person> query) {
1717

1818
@Test(expected = ObjectQueryException.class)
1919
public void testSubquerySimple() {
20-
SelectQuery<Person> query = new GenericSelectQuery<Person,Object>(Person.class);
20+
SelectQuery<Person> query = new GenericSelectQuery<Person, Object>(Person.class);
2121

2222
BaseSelectQuery<Person> subQuery = query.subQuery(Person.class);
2323
subQuery.eq(subQuery.target().getName(), "test");

‎src/test/java/org/objectquery/mongodb/TestUpdateQuery.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.objectquery.mongodb;
22

3-
import junit.framework.Assert;
3+
import static org.junit.Assert.assertEquals;
44

55
import org.junit.After;
66
import org.junit.Before;
@@ -34,7 +34,7 @@ public void testSimpleUpdate() {
3434
query.eq(query.target().getText(), "old-address");
3535

3636
int res = MongoDBObjectQuery.execute(query, datastore);
37-
Assert.assertEquals(1, res);
37+
assertEquals(1, res);
3838
}
3939

4040
@Test
@@ -43,8 +43,8 @@ public void testSimpleUpdateGen() {
4343
query.set(query.target().getAddress(), "new-address");
4444
query.eq(query.target().getAddress(), "old-address");
4545
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(query);
46-
Assert.assertEquals("{ \"$and\" : [ { \"address\" : \"old-address\"}]}", q.getQuery().toString());
47-
Assert.assertEquals("{ \"$set\" : { \"address\" : \"new-address\"}}", q.getData().toString());
46+
assertEquals("{ \"$and\" : [ { \"address\" : \"old-address\"}]}", q.getQuery().toString());
47+
assertEquals("{ \"$set\" : { \"address\" : \"new-address\"}}", q.getData().toString());
4848
}
4949

5050
@Test()
@@ -53,7 +53,7 @@ public void testSimpleNestedUpdate() {
5353
query.set(query.target().getMetadata().getAuthor(), "the real Author");
5454
query.eq(query.target().getMetadata().getAuthor(), "the Author");
5555
int res = MongoDBObjectQuery.execute(query, datastore);
56-
Assert.assertEquals(1, res);
56+
assertEquals(1, res);
5757
}
5858

5959
@Test()
@@ -62,8 +62,8 @@ public void testSimpleNestedUpdateGen() {
6262
query.set(query.target().getHome().getAddress(), "new-address");
6363
query.eq(query.target().getHome().getAddress(), "old-address");
6464
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(query);
65-
Assert.assertEquals("{ \"$and\" : [ { \"home.address\" : \"old-address\"}]}", q.getQuery().toString());
66-
Assert.assertEquals("{ \"$set\" : { \"home\" : { \"address\" : \"new-address\"}}}", q.getData().toString());
65+
assertEquals("{ \"$and\" : [ { \"home.address\" : \"old-address\"}]}", q.getQuery().toString());
66+
assertEquals("{ \"$set\" : { \"home\" : { \"address\" : \"new-address\"}}}", q.getData().toString());
6767
}
6868

6969
@Test
@@ -74,8 +74,8 @@ public void testMultirecodUpdateGen() {
7474
or.eq(query.target().getTitle(), "first update");
7575
or.eq(query.target().getTitle(), "second update");
7676
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(query);
77-
Assert.assertEquals("{ \"$and\" : [ { \"$or\" : [ { \"title\" : \"first update\"} , { \"title\" : \"second update\"}]}]}", q.getQuery().toString());
78-
Assert.assertEquals("{ \"$set\" : { \"title\" : \"a title\"}}", q.getData().toString());
77+
assertEquals("{ \"$and\" : [ { \"$or\" : [ { \"title\" : \"first update\"} , { \"title\" : \"second update\"}]}]}", q.getQuery().toString());
78+
assertEquals("{ \"$set\" : { \"title\" : \"a title\"}}", q.getData().toString());
7979
}
8080

8181
@Test
@@ -86,7 +86,7 @@ public void testMultirecodUpdate() {
8686
or.eq(query.target().getTitle(), "first update");
8787
or.eq(query.target().getTitle(), "second update");
8888
int res = MongoDBObjectQuery.execute(query, datastore);
89-
Assert.assertEquals(2, res);
89+
assertEquals(2, res);
9090
}
9191

9292
@Test
@@ -100,7 +100,7 @@ public void testMultipleUpdate() {
100100
query.set(query.box(query.target().getPrice()), 1d);
101101
query.eq(query.target().getText(), "2old-address");
102102
int res = MongoDBObjectQuery.execute(query, datastore);
103-
Assert.assertEquals(1, res);
103+
assertEquals(1, res);
104104
}
105105

106106
@Test
@@ -111,8 +111,8 @@ public void testMultipleUpdateGen() {
111111
query.eq(query.target().getAddress(), "old-address");
112112

113113
MongoDBQueryBuilder q = MongoDBObjectQuery.mongoDBBuilder(query);
114-
Assert.assertEquals("{ \"$and\" : [ { \"address\" : \"old-address\"}]}", q.getQuery().toString());
115-
Assert.assertEquals("{ \"$set\" : { \"address\" : \"new-address\" , \"price\" : 1.0}}", q.getData().toString());
114+
assertEquals("{ \"$and\" : [ { \"address\" : \"old-address\"}]}", q.getQuery().toString());
115+
assertEquals("{ \"$set\" : { \"address\" : \"new-address\" , \"price\" : 1.0}}", q.getData().toString());
116116
}
117117

118118
@After

‎src/test/java/org/objectquery/mongodb/domain/Dog.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
import org.mongodb.morphia.annotations.Id;
44

5-
65
public class Dog {
76

87
@Id
98
private String id;
109
private String name;
11-
// private Person owner;
10+
// private Person owner;
1211
private Home home;
1312

1413
public String getId() {
@@ -27,13 +26,13 @@ public void setName(String name) {
2726
this.name = name;
2827
}
2928

30-
// public Person getOwner() {
31-
// return owner;
32-
// }
33-
//
34-
// public void setOwner(Person owner) {
35-
// this.owner = owner;
36-
// }
29+
// public Person getOwner() {
30+
// return owner;
31+
// }
32+
//
33+
// public void setOwner(Person owner) {
34+
// this.owner = owner;
35+
// }
3736

3837
public Home getHome() {
3938
return home;

‎src/test/java/org/objectquery/mongodb/domain/Home.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.mongodb.morphia.annotations.Id;
44

5-
65
public class Home {
76
public enum HomeType {
87
KENNEL, HOUSE

‎src/test/java/org/objectquery/mongodb/domain/Other.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.mongodb.morphia.annotations.Id;
44

5-
65
public class Other {
76

87
@Id

‎src/test/java/org/objectquery/mongodb/domain/Window.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ public class Window {
44

55
private int width;
66
private int height;
7-
7+
88
}

0 commit comments

Comments
 (0)
Please sign in to comment.