From 413f06ac2611a91d646bdf0034010c6f1cc22745 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 15 Dec 2010 00:51:17 +0000
Subject: [PATCH] Use the new fluent API because it's sexy.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6380 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../admin/server/persist/ConfigRepository.java |  5 ++---
 .../peer/server/persist/NodeRepository.java    | 18 ++++++------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/threerings/admin/server/persist/ConfigRepository.java b/src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
index 9bd413dae..f6a192948 100644
--- a/src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
+++ b/src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
@@ -29,7 +29,6 @@ import com.google.common.collect.Maps;
 import com.samskivert.depot.DepotRepository;
 import com.samskivert.depot.PersistenceContext;
 import com.samskivert.depot.PersistentRecord;
-import com.samskivert.depot.clause.Where;
 
 /**
  * Stores configuration information in a database table.
@@ -52,8 +51,8 @@ public class ConfigRepository extends DepotRepository
     public HashMap<String, String> loadConfig (String node, String object)
     {
         HashMap<String, String> data = Maps.newHashMap();
-        Where where = new Where(ConfigRecord.OBJECT, object, ConfigRecord.NODE, node);
-        for (ConfigRecord record : findAll(ConfigRecord.class, where)) {
+        for (ConfigRecord record : from(ConfigRecord.class).
+                 where(ConfigRecord.OBJECT.eq(object), ConfigRecord.NODE.eq(node)).select()) {
             data.put(record.field, record.value);
         }
         return data;
diff --git a/src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java b/src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
index 312a6c562..754840a89 100644
--- a/src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
+++ b/src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
@@ -21,13 +21,11 @@
 
 package com.threerings.presents.peer.server.persist;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
 import java.sql.Timestamp;
 
-import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -36,8 +34,7 @@ import com.samskivert.util.StringUtil;
 import com.samskivert.depot.DepotRepository;
 import com.samskivert.depot.PersistenceContext;
 import com.samskivert.depot.PersistentRecord;
-import com.samskivert.depot.clause.QueryClause;
-import com.samskivert.depot.clause.Where;
+import com.samskivert.depot.Query;
 
 /**
  * Used to share information on active nodes in a Presents server cluster.
@@ -67,16 +64,13 @@ public class NodeRepository extends DepotRepository
      */
     public List<NodeRecord> loadNodes (String namespace)
     {
-        Iterable<QueryClause> clauses;
-        if (StringUtil.isBlank(namespace)) {
-            clauses = Collections.emptyList();
-        } else {
-            QueryClause clause = new Where(NodeRecord.NODE_NAME.like(namespace + "%"));
-            clauses = Lists.newArrayList(clause);
-        }
         // we specifically avoid caching this query because we want the servers to always see the
         // most up to date set of nodes
-        return findAll(NodeRecord.class, CacheStrategy.NONE, clauses);
+        Query<NodeRecord> query = from(NodeRecord.class).noCache();
+        if (!StringUtil.isBlank(namespace)) {
+            query = query.where(NodeRecord.NODE_NAME.like(namespace + "%"));
+        }
+        return query.select();
     }
 
     /**