You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@roller.apache.org by Mitesh Meswani <Mi...@Sun.COM> on 2007/01/27 01:00:45 UTC
Re: svn commit: r500412 -
/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
Hi Allen,
Please see inline....
agilliland@apache.org wrote:
> Author: agilliland
> Date: Fri Jan 26 15:42:08 2007
> New Revision: 500412
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=500412
> Log:
> fix for removeWebsite() so that it properly removes entries on a weblog via calls to WeblogManager.removeWeblogEntry().
>
> update to getWebsites() method so that endDate is not mandatory.
>
>
> Modified:
> incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
>
> Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
> URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java?view=diff&rev=500412&r1=500411&r2=500412
> ==============================================================================
> --- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java (original)
> +++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java Fri Jan 26 15:42:08 2007
> @@ -167,9 +167,7 @@
> entryQuery.add(Expression.eq("website", website));
> List entries = entryQuery.list();
> for (Iterator iter = entries.iterator(); iter.hasNext();) {
> - WeblogEntryData entry = (WeblogEntryData) iter.next();
> -
> - this.strategy.remove(entry);
> + wmgr.removeWeblogEntry((WeblogEntryData) iter.next());
> }
>
> // remove associated referers
> @@ -187,8 +185,7 @@
> pageQuery.add(Expression.eq("website", website));
> List pages = pageQuery.list();
> for (Iterator iter = pages.iterator(); iter.hasNext();) {
> - WeblogTemplate page = (WeblogTemplate) iter.next();
> - this.strategy.remove(page);
> + this.removePage((WeblogTemplate) iter.next());
> }
>
> // remove folders (including bookmarks)
> @@ -203,6 +200,11 @@
> this.strategy.remove(rootCat);
> }
>
> + // remove permissions
> + List permissions = this.getAllPermissions(website);
> + for (Iterator iter = permissions.iterator(); iter.hasNext(); ) {
> + this.removePermissions((PermissionsData) iter.next());
> + }
> }
>
> public void saveUser(UserData data) throws RollerException {
> @@ -466,23 +468,25 @@
> /**
> * Get websites of a user
> */
> - public List getWebsites(
> - UserData user, Boolean enabled, Boolean active,
> - Date startDate, Date endDate, int offset, int length)
> - throws RollerException {
> - // TODO: ATLAS getWebsites DONE TESTED
> - if (endDate == null) endDate = new Date();
> + public List getWebsites(UserData user, Boolean enabled, Boolean active,
> + Date startDate, Date endDate, int offset, int length)
> + throws RollerException {
> +
> try {
> Session session = ((HibernatePersistenceStrategy)this.strategy).getSession();
> Criteria criteria = session.createCriteria(WebsiteData.class);
> +
> if (user != null) {
> criteria.createAlias("permissions","permissions");
> criteria.add(Expression.eq("permissions.user", user));
> criteria.add(Expression.eq("permissions.pending", Boolean.FALSE));
> - } criteria.add(Expression.lt("dateCreated", endDate));
> + }
> if (startDate != null) {
> criteria.add(Expression.gt("dateCreated", startDate));
> - }
> + }
> *+ if (endDate != null) {
> + criteria.add(Expression.lt("dateCreated", endDate));
> + }
> *
Following are callers of this method.
login-redirect.jsp ()
WeblogsPager.getItems() (org.apache.roller.ui.rendering.pagers)
login-redirect.jsp ()
PermissionTest.testInvitations()(2 usages) (org.apache.roller.business)
SyncWebsitesTask.runTask() (org.apache.roller.planet.tasks)
BloggerAPIHandler.getUsersBlogs(String, String, String)
(org.apache.roller.webservices.xmlrpc)
SiteModel.getNewWeblogs(int, int) (org.apache.roller.ui.rendering.model)
WeblogTest.testWeblogLookups()(5 usages) (org.apache.roller.business)
All of them pass a null as value of endDate to this method. So,
effectively we are never using the parameter. Do you think it makes
sense to change signature of this method to remove endDate?
Regards,
Mitesh
> if (enabled != null) {
> criteria.add(Expression.eq("enabled", enabled));
> }
> @@ -496,7 +500,9 @@
> criteria.setMaxResults(length);
> }
> criteria.addOrder(Order.desc("dateCreated"));
> +
> return criteria.list();
> +
> } catch (HibernateException e) {
> throw new RollerException(e);
> }
>
>
>
Re: svn commit: r500412 -
/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
Posted by Allen Gilliland <al...@sun.com>.
Mitesh Meswani wrote:
> Hi Allen,
>
*snip*
> Following are callers of this method.
>
> login-redirect.jsp ()
> WeblogsPager.getItems() (org.apache.roller.ui.rendering.pagers)
> login-redirect.jsp ()
> PermissionTest.testInvitations()(2 usages) (org.apache.roller.business)
> SyncWebsitesTask.runTask() (org.apache.roller.planet.tasks)
> BloggerAPIHandler.getUsersBlogs(String, String, String)
> (org.apache.roller.webservices.xmlrpc)
> SiteModel.getNewWeblogs(int, int) (org.apache.roller.ui.rendering.model)
> WeblogTest.testWeblogLookups()(5 usages) (org.apache.roller.business)
>
> All of them pass a null as value of endDate to this method. So,
> effectively we are never using the parameter. Do you think it makes
> sense to change signature of this method to remove endDate?
well, I think it's fine if we just leave it alone. It's not hurting
anything right now and there may be potential uses for it in the future.
Plus, it seems like wasted effort to go through the effort to take it
out of the method signature.
-- Allen
>
> Regards,
> Mitesh
>> if (enabled != null) {
>> criteria.add(Expression.eq("enabled", enabled));
>> }
>> @@ -496,7 +500,9 @@
>> criteria.setMaxResults(length);
>> }
>> criteria.addOrder(Order.desc("dateCreated"));
>> + return criteria.list();
>> + } catch (HibernateException e) {
>> throw new RollerException(e);
>> }
>>
>>
>>