From 3e6a6fac44c8fc7adf00f4c2d3320887aa7589d1 Mon Sep 17 00:00:00 2001 From: "Michael S. Klishin" Date: Wed, 14 Sep 2011 14:11:56 +0400 Subject: [PATCH] Simplify finders that use document id --- src/monger/collection.clj | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/monger/collection.clj b/src/monger/collection.clj index 5925b0b..2a03458 100644 --- a/src/monger/collection.clj +++ b/src/monger/collection.clj @@ -92,20 +92,17 @@ (defn ^DBObject find-by-id ([^String collection, id] - (let [#^DBCollection coll (.getCollection monger.core/*mongodb-database* collection)] - (.findOne coll (to-db-object { :_id id })))) + (find-one collection { :_id id })) ([^String collection, id, ^List fields] - (let [#^DBCollection coll (.getCollection monger.core/*mongodb-database* collection) - map-of-fields (fields-to-db-object fields)] - (.findOne #^DBCollection coll #^DBObject (to-db-object { :_id id }) #^DBObject (to-db-object map-of-fields))))) + (find-one collection { :_id id } fields))) (defn ^IPersistentMap find-map-by-id ([^String collection, id] - (from-db-object ^DBObject (find-by-id collection id) true)) + (from-db-object ^DBObject (find-one-as-map collection { :_id id }) true)) ([^String collection, id, keywordize] - (from-db-object ^DBObject (find-by-id collection id) keywordize)) + (from-db-object ^DBObject (find-one-as-map collection { :_id id }) keywordize)) ([^String collection, id, ^List fields, keywordize] - (from-db-object ^DBObject (find-by-id collection id fields) keywordize))) + (from-db-object ^DBObject (find-one-as-map collection { :_id id } fields) keywordize))) ;;