AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new fluent API because it's sexy.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6380 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2010-12-15 00:51:17 +00:00
parent 1a6587f69b
commit 413f06ac26
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
+2 -3
View File
@@ -29,7 +29,6 @@ import com.google.common.collect.Maps;
import com.samskivert.depot.DepotRepository; import com.samskivert.depot.DepotRepository;
import com.samskivert.depot.PersistenceContext; import com.samskivert.depot.PersistenceContext;
import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.PersistentRecord;
import com.samskivert.depot.clause.Where;
/** /**
* Stores configuration information in a database table. * 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) public HashMap<String, String> loadConfig (String node, String object)
{ {
HashMap<String, String> data = Maps.newHashMap(); HashMap<String, String> data = Maps.newHashMap();
Where where = new Where(ConfigRecord.OBJECT, object, ConfigRecord.NODE, node); for (ConfigRecord record : from(ConfigRecord.class).
for (ConfigRecord record : findAll(ConfigRecord.class, where)) { where(ConfigRecord.OBJECT.eq(object), ConfigRecord.NODE.eq(node)).select()) {
data.put(record.field, record.value); data.put(record.field, record.value);
} }
return data; return data;
src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
+6 -12
View File
@@ -21,13 +21,11 @@
package com.threerings.presents.peer.server.persist; package com.threerings.presents.peer.server.persist;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.sql.Timestamp; import java.sql.Timestamp;
import com.google.common.collect.Lists;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@@ -36,8 +34,7 @@ import com.samskivert.util.StringUtil;
import com.samskivert.depot.DepotRepository; import com.samskivert.depot.DepotRepository;
import com.samskivert.depot.PersistenceContext; import com.samskivert.depot.PersistenceContext;
import com.samskivert.depot.PersistentRecord; import com.samskivert.depot.PersistentRecord;
import com.samskivert.depot.clause.QueryClause; import com.samskivert.depot.Query;
import com.samskivert.depot.clause.Where;
/** /**
* Used to share information on active nodes in a Presents server cluster. * 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) 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 // we specifically avoid caching this query because we want the servers to always see the
// most up to date set of nodes // 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();
} }
/** /**