Changeset 2443

Timestamp:

11/30/09 22:53:52 (2 years ago)

Author:

mswertz

Message:

Added static helper functions to easily query such as Sample.query(db) and Sample.get(db) and Sample.find(db) as alternative for db.query(Sample.class), db.get(Sample.class, id) and db.find(Sample.class).

File:

• molgenis/3.3/src/org/molgenis/generators/DataTypeGen.java.ftl (modified) (4 diffs)

molgenis/3.3/src/org/molgenis/generators/DataTypeGen.java.ftl

@@ -20 +20 @@
 import java.util.Vector;
 import java.util.ArrayList;
+import java.util.List;
 import java.io.StringWriter;
 import org.molgenis.util.Tuple;
@@ -25 +26 @@
 import java.text.ParseException;
 import org.molgenis.framework.db.DatabaseException;
+import org.molgenis.framework.db.Database;
+import org.molgenis.framework.db.DatabaseException;
+import org.molgenis.framework.db.Query;
+import org.molgenis.framework.db.QueryRule;
 
 <#--import parent class if extends-->
@@ -82 +87 @@
 public interface ${JavaName(entity)} extends <#if entity.hasImplements()><#list entity.getImplements() as i> ${JavaName(i)}<#if i_has_next>,</#if></#list><#else>org.molgenis.util.Entity</#if>
 <#else>
-public class ${JavaName(entity)} extends <#if entity.hasAncestor()>${JavaName(entity.getAncestor())}<#else>org.molgenis.util.AbstractEntity     </#if> <#if entity.hasImplements()>implements <#list entity.getImplements() as i> ${JavaName(i)}<#if i_has_next>,</#if></#list></#if>
+public class ${JavaName(entity)} extends <#if entity.hasAncestor()>${JavaName(entity.getAncestor())}<#else>org.molgenis.util.AbstractEntity</#if> <#if entity.hasImplements()>implements<#list entity.getImplements() as i> ${JavaName(i)}<#if i_has_next>,</#if></#list></#if>
 </#if>
 {
@@ -157 +162 @@
                 </#if>  
         </#list>
+        }
+        
+        //static methods
+        /**
+         * Shorthand for db.query(${JavaName(entity)}.class).
+         */
+        public static Query query(Database db)
+        {
+                return db.query(${JavaName(entity)}.class);
+        }
+        
+        /**
+         * Shorthand for db.findById(${JavaName(entity)}.class, id).
+         */
+        public static ${JavaName(entity)} get(Database db, Object id) throws DatabaseException
+        {
+                return db.findById(${JavaName(entity)}.class, id);
+        }
+        
+        /**
+         * Shorthand for db.find(${JavaName(entity)}.class, QueryRule ... rules).
+         */
+        public static List find(Database db, QueryRule ... rules) throws DatabaseException
+        {
+                return db.find(${JavaName(entity)}.class, rules);
         }