Update of /cvsroot/roller/roller/src/org/roller/business
In directory sc8-pr-cvs1:/tmp/cvs-serv26342/src/org/roller/business
Modified Files:
NewsfeedManagerBase.java WeblogManagerBase.java
BookmarkManagerBase.java UserManagerBase.java
RefererManagerBase.java
Log Message:
Introducing new query abstraction which I hope will replace
the Queries class. Currently, only NewsfeedManagerBase
uses the new query API. I've tested with both Hibernate and
Castor.
Index: NewsfeedManagerBase.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/business/NewsfeedManagerBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NewsfeedManagerBase.java 3 Sep 2003 21:21:13 -0000 1.3
--- NewsfeedManagerBase.java 19 Oct 2003 21:48:38 -0000 1.4
***************
*** 8,13 ****
import org.roller.RollerException;
import org.roller.model.NewsfeedManager;
- import org.roller.model.PersistenceStrategy;
import org.roller.pojos.NewsfeedData;
--- 8,17 ----
import org.roller.RollerException;
+ import org.roller.business.persistence.Condition;
+ import org.roller.business.persistence.FieldCondition;
+ import org.roller.business.persistence.PersistenceStrategy;
+ import org.roller.business.persistence.Query;
+ import org.roller.business.persistence.QueryFactory;
import org.roller.model.NewsfeedManager;
import org.roller.pojos.NewsfeedData;
***************
*** 61,70 ****
if ( userName==null )
throw new RollerException("Username is null");
-
- Object[] args = { userName };
- Type[] types = {Hibernate.STRING};
! List list = mSupport.query(Queries.NEWSFEEDS_BY_USER, args, types );
return (NewsfeedData[])list.toArray(new NewsfeedData[list.size()]);
}
--- 65,80 ----
if ( userName==null )
throw new RollerException("Username is null");
! QueryFactory factory = mSupport.getQueryFactory();
! Query query = factory.createQuery(NewsfeedData.class.getName());
! Condition c =
!
factory.createCondition("website.user.userName",Query.EQ,userName);
! query.setWhere(c);
! List list = query.execute();
+ // Object[] args = { userName };
+ // Type[] types = {Hibernate.STRING};
+ // List list = mSupport.query(Queries.NEWSFEEDS_BY_USER, args, types );
+
return (NewsfeedData[])list.toArray(new NewsfeedData[list.size()]);
}
***************
*** 80,88 ****
throw new RollerException("Newsfeed name is null");
! Object[] args = { userName, name };
! Type[] types = {Hibernate.STRING,Hibernate.STRING};
!
! List list = mSupport.query(
! Queries.NEWSFEEDS_BY_USER + Queries.NAME_RESTRICTION, args, types
);
return list.size()!=0 ? (NewsfeedData)list.get(0) : null;
--- 90,105 ----
throw new RollerException("Newsfeed name is null");
! QueryFactory factory = mSupport.getQueryFactory();
! Query query = factory.createQuery(NewsfeedData.class.getName());
! Condition c1 =
! factory.createCondition("website.user.userName", Query.EQ,
userName);
! Condition c2 = factory.createCondition("name", Query.EQ, name);
! query.setWhere(factory.createCondition(c1, Query.AND, c2));
! List list = query.execute();
!
! // Object[] args = { userName, name };
! // Type[] types = {Hibernate.STRING,Hibernate.STRING};
! // List list = mSupport.query(
! // Queries.NEWSFEEDS_BY_USER + Queries.NAME_RESTRICTION, args,
types );
return list.size()!=0 ? (NewsfeedData)list.get(0) : null;
Index: WeblogManagerBase.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/business/WeblogManagerBase.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** WeblogManagerBase.java 9 Sep 2003 19:02:01 -0000 1.17
--- WeblogManagerBase.java 19 Oct 2003 21:48:38 -0000 1.18
***************
*** 8,12 ****
import org.roller.RollerException;
! import org.roller.model.PersistenceStrategy;
import org.roller.model.WeblogManager;
import org.roller.pojos.CommentData;
--- 8,12 ----
import org.roller.RollerException;
! import org.roller.business.persistence.PersistenceStrategy;
import org.roller.model.WeblogManager;
import org.roller.pojos.CommentData;
Index: BookmarkManagerBase.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/business/BookmarkManagerBase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BookmarkManagerBase.java 14 Sep 2003 19:00:57 -0000 1.7
--- BookmarkManagerBase.java 19 Oct 2003 21:48:38 -0000 1.8
***************
*** 10,15 ****
import org.jdom.input.SAXBuilder;
import org.roller.RollerException;
import org.roller.model.BookmarkManager;
- import org.roller.model.PersistenceStrategy;
import org.roller.model.UserManager;
import org.roller.pojos.BookmarkData;
--- 10,15 ----
import org.jdom.input.SAXBuilder;
import org.roller.RollerException;
+ import org.roller.business.persistence.PersistenceStrategy;
import org.roller.model.BookmarkManager;
import org.roller.model.UserManager;
import org.roller.pojos.BookmarkData;
Index: UserManagerBase.java
===================================================================
RCS file: /cvsroot/roller/roller/src/org/roller/business/UserManagerBase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** UserManagerBase.java 14 Oct 2003 03:01:53 -0000 1.10
--- UserManagerBase.java 19 Oct 2003 21:48:38 -0000 1.11
***************
*** 10,16 ****
import org.apache.commons.logging.LogFactory;
import org.roller.RollerException;
import org.roller.model.BookmarkManager;
import org.roller.model.NewsfeedManager;
- import org.roller.model.PersistenceStrategy;
import org.roller.model.Roller;
import org.roller.model.UserManager;
--- 10,16 ----
import org.apache.commons.logging.LogFactory;
import org.roller.RollerException;
+ import org.roller.business.persistence.PersistenceStrategy;
import org.roller.model.BookmarkManager;
import org.roller.model.NewsfeedManager;
import org.roller.model.Roller;
import org.roller.model.UserManager;
Index: RefererManagerBase.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/business/RefererManagerBase.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** RefererManagerBase.java 16 Oct 2003 16:16:43 -0000 1.19
--- RefererManagerBase.java 19 Oct 2003 21:48:38 -0000 1.20
***************
*** 8,13 ****
import org.roller.RollerException;
import org.roller.ThreadManager;
import org.roller.model.ParsedRequest;
- import org.roller.model.PersistenceStrategy;
import org.roller.model.RefererManager;
import org.roller.pojos.RefererData;
--- 8,13 ----
import org.roller.RollerException;
import org.roller.ThreadManager;
+ import org.roller.business.persistence.PersistenceStrategy;
import org.roller.model.ParsedRequest;
import org.roller.model.RefererManager;
import org.roller.pojos.RefererData;
-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; & in the Server Room
http://www.enterpriselinuxforum.com
|
