From 4ed5ff7dc8eea12ff5506c130860db41ae4845d7 Mon Sep 17 00:00:00 2001 From: Thomas Risberg Date: Thu, 3 Feb 2011 11:57:45 -0500 Subject: [PATCH] created Sort as separate construct --- .../document/mongodb/builder/BasicSort.java | 37 +++++++++++++++++++ .../document/mongodb/builder/BasicUpdate.java | 18 --------- .../data/document/mongodb/builder/Sort.java | 24 ++++++++++++ .../document/mongodb/builder/SortSpec.java | 8 +++- .../data/document/mongodb/builder/Update.java | 2 - .../document/mongodb/builder/UpdateSpec.java | 18 --------- .../document/mongodb/builder/SortTests.java | 36 ++++++++++++++++++ .../document/mongodb/builder/UpdateTests.java | 17 --------- 8 files changed, 103 insertions(+), 57 deletions(-) create mode 100644 spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicSort.java create mode 100644 spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Sort.java create mode 100644 spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/SortTests.java diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicSort.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicSort.java new file mode 100644 index 000000000..2356e6d35 --- /dev/null +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicSort.java @@ -0,0 +1,37 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.document.mongodb.builder; + +import com.mongodb.DBObject; +import com.mongodb.util.JSON; + +public class BasicSort implements Sort { + + private DBObject sortObject; + + public BasicSort(String sortString) { + this.sortObject = (DBObject) JSON.parse(sortString); + } + + public BasicSort(DBObject sortObject) { + this.sortObject = sortObject; + } + + public DBObject getSortObject() { + return this.sortObject; + } + +} diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicUpdate.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicUpdate.java index d5767c6b8..e7cc94fa1 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicUpdate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/BasicUpdate.java @@ -22,8 +22,6 @@ public class BasicUpdate implements Update { private DBObject updateObject = null; - private DBObject sortObject; - public BasicUpdate(String updateString) { super(); this.updateObject = (DBObject) JSON.parse(updateString); @@ -34,24 +32,8 @@ public class BasicUpdate implements Update { this.updateObject = updateObject; } - public BasicUpdate(String updateString, String sortString) { - super(); - this.updateObject = (DBObject) JSON.parse(updateString); - this.sortObject = (DBObject) JSON.parse(sortString); - } - - public BasicUpdate(DBObject updateObject, DBObject sortObject) { - super(); - this.updateObject = updateObject; - this.sortObject = sortObject; - } - public DBObject getUpdateObject() { return updateObject; } - public DBObject getSortObject() { - return this.sortObject; - } - } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Sort.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Sort.java new file mode 100644 index 000000000..bf655815e --- /dev/null +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Sort.java @@ -0,0 +1,24 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.document.mongodb.builder; + +import com.mongodb.DBObject; + + +public interface Sort { + + DBObject getSortObject(); +} diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/SortSpec.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/SortSpec.java index 4d49faff7..94157d570 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/SortSpec.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/SortSpec.java @@ -22,7 +22,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; -public class SortSpec { +public class SortSpec implements Sort { public enum SortOrder { ASCENDING, DESCENDING @@ -34,7 +34,11 @@ public class SortSpec { criteria.put(key, order); return this; } - + + public Sort build() { + return this; + } + public DBObject getSortObject() { DBObject dbo = new BasicDBObject(); for (String k : criteria.keySet()) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Update.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Update.java index 5a3b0e787..c15fcd949 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Update.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/Update.java @@ -21,6 +21,4 @@ import com.mongodb.DBObject; public interface Update { DBObject getUpdateObject(); - - DBObject getSortObject(); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/UpdateSpec.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/UpdateSpec.java index 00804bc64..80c4f89a6 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/UpdateSpec.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/builder/UpdateSpec.java @@ -30,8 +30,6 @@ public class UpdateSpec implements Update { private HashMap criteria = new LinkedHashMap(); - private SortSpec sortSpec; - public UpdateSpec set(String key, Object value) { criteria.put("$set", Collections.singletonMap(key, value)); return this; @@ -86,15 +84,6 @@ public class UpdateSpec implements Update { return this; } - public SortSpec sort() { - synchronized (this) { - if (this.sortSpec == null) { - this.sortSpec = new SortSpec(); - } - } - return this.sortSpec; - } - public Update build() { return this; } @@ -107,11 +96,4 @@ public class UpdateSpec implements Update { return dbo; } - public DBObject getSortObject() { - if (this.sortSpec == null) { - return null; - } - return this.sortSpec.getSortObject(); - } - } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/SortTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/SortTests.java new file mode 100644 index 000000000..bad997c7e --- /dev/null +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/SortTests.java @@ -0,0 +1,36 @@ +/* + * Copyright 2010-2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.document.mongodb.builder; + +import org.junit.Assert; +import org.junit.Test; +import org.springframework.data.document.mongodb.builder.SortSpec.SortOrder; + +public class SortTests { + + @Test + public void testWithSortAscending() { + SortSpec s = new SortSpec().on("name", SortOrder.ASCENDING); + Assert.assertEquals("{ \"name\" : 1}", s.build().getSortObject().toString()); + } + + @Test + public void testWithSortDescending() { + SortSpec s = new SortSpec().on("name", SortOrder.DESCENDING); + Assert.assertEquals("{ \"name\" : -1}", s.build().getSortObject().toString()); + } + +} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/UpdateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/UpdateTests.java index f7bfb6c3a..247f13aac 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/UpdateTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/builder/UpdateTests.java @@ -121,21 +121,4 @@ public class UpdateTests { Assert.assertEquals("{ \"$rename\" : { \"directory\" : \"folder\"}}", u.build().getUpdateObject().toString()); } - @Test - public void testWithSortAscending() { - UpdateSpec u = new UpdateSpec(); - u.set("name",52); - u.sort().on("name", SortOrder.ASCENDING); - Assert.assertEquals("{ \"$set\" : { \"name\" : 52}}", u.build().getUpdateObject().toString()); - Assert.assertEquals("{ \"name\" : 1}", u.build().getSortObject().toString()); - } - - @Test - public void testWithSortDescending() { - UpdateSpec u = new UpdateSpec(); - u.set("name",52); - u.sort().on("name", SortOrder.DESCENDING); - Assert.assertEquals("{ \"$set\" : { \"name\" : 52}}", u.build().getUpdateObject().toString()); - Assert.assertEquals("{ \"name\" : -1}", u.build().getSortObject().toString()); - } }