You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/04/19 20:22:18 UTC
svn commit: r395336 - in
/incubator/roller/branches/roller-newbackend/src/org/roller:
business/hibernate/ model/ presentation/weblog/actions/
Author: agilliland
Date: Wed Apr 19 11:22:14 2006
New Revision: 395336
URL: http://svn.apache.org/viewcvs?rev=395336&view=rev
Log:
manager method name refactorings for RefererManager.
storeXXX() -> saveXXX()
retrieveXXX() -> getXXX()
createXXX() -> addXXX() (or is removed)
plus:
removed method removeReferersForEntry()
removed method getEntryReferers()
removed method removeReferer(id)
added method removeReferer(referer)
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
incubator/roller/branches/roller-newbackend/src/org/roller/model/RefererManager.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java?rev=395336&r1=395335&r2=395336&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java Wed Apr 19 11:22:14 2006
@@ -72,52 +72,21 @@
/**
- * @see org.roller.pojos.RefererManager#storeReferer(org.roller.pojos.RefererData)
+ *
+ *
+ * @see org.roller.pojos.RefererManager#saveReferer(org.roller.pojos.RefererData)
*/
- public void storeReferer(RefererData referer) throws RollerException {
+ public void saveReferer(RefererData referer) throws RollerException {
strategy.store(referer);
}
- /**
- * @see org.roller.pojos.RefererManager#removeReferer(java.lang.String)
- */
- public void removeReferer(String id) throws RollerException {
- strategy.remove(id, RefererData.class);
- }
-
-
public void removeReferer(RefererData referer) throws RollerException {
strategy.remove(referer);
}
/**
- * @see org.roller.pojos.RefererManager#getReferersToEntry(java.lang.String, java.lang.String)
- */
- public void removeReferersForEntry(String entryid) throws RollerException {
-
- if (null == entryid)
- throw new RollerException("entryid is null");
-
- try {
- Session session = ((HibernatePersistenceStrategy)strategy).getSession();
- Criteria criteria = session.createCriteria(RefererData.class);
- criteria.createAlias("weblogEntry","e");
- criteria.add(Expression.eq("e.id", entryid));
-
- Iterator referer = criteria.list().iterator();
- while (referer.hasNext()) {
- this.strategy.remove((RefererData) referer.next());
- }
-
- } catch (HibernateException e) {
- throw new RollerException(e);
- }
- }
-
-
- /**
* Clear referrer dayhits and remove referrers without excerpts.
*
* TODO: do we really need dialect specific queries?
@@ -603,28 +572,11 @@
/**
* @see org.roller.pojos.RefererManager#retrieveReferer(java.lang.String)
*/
- public RefererData retrieveReferer(String id) throws RollerException {
+ public RefererData getReferer(String id) throws RollerException {
return (RefererData)strategy.load(id,RefererData.class);
}
- public List getEntryReferers(String entryId, boolean authorized)
- throws RollerException {
- //TODO: Redesign this so this is performed using the DB query, and
- // not in java code for perf/memory reasons
- List authorizedvisible = new ArrayList();
- List referers = getReferersToEntry(entryId);
- for (Iterator rItr = referers.iterator(); rItr.hasNext();) {
- RefererData referer = (RefererData) rItr.next();
- if ( referer.getVisible().booleanValue() || authorized ) {
- authorizedvisible.add( referer );
- }
- }
-
- return authorizedvisible;
- }
-
-
public void processReferrer(String requestUrl,
String referrerUrl,
String weblogHandle,
@@ -698,7 +650,7 @@
log.debug("Incrementing hit count on existing referer: "+referrerUrl);
- storeReferer(ref);
+ saveReferer(ref);
} else if (matchRef.size() == 0) {
@@ -752,7 +704,7 @@
log.warn("Interrupted during linkback extraction",e);
}
} else {
- storeReferer(ref);
+ saveReferer(ref);
}
}
} catch (RollerException pe) {
@@ -808,13 +760,13 @@
mReferer.setDuplicate(Boolean.TRUE);
}
- storeReferer(mReferer);
+ saveReferer(mReferer);
}
else {
// Store the new referer
- storeReferer(mReferer);
+ saveReferer(mReferer);
// Hacky Referer URL weighting kludge:
//
@@ -866,14 +818,14 @@
referer.setDuplicate(Boolean.FALSE);
referer.setVisible(visible);
}
- storeReferer(referer);
+ saveReferer(referer);
}
}
} else {
// It is not a linkback, but store it anyway
- storeReferer(mReferer);
+ saveReferer(mReferer);
log.info("No excerpt found at refering URL "
+ mReferer.getRefererUrl());
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/model/RefererManager.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/model/RefererManager.java?rev=395336&r1=395335&r2=395336&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/model/RefererManager.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/model/RefererManager.java Wed Apr 19 11:22:14 2006
@@ -1,7 +1,6 @@
package org.roller.model;
-import java.io.Serializable;
import java.util.List;
import org.roller.RollerException;
import org.roller.pojos.RefererData;
@@ -11,19 +10,13 @@
/**
* Interface to Referer management.
*/
-public interface RefererManager extends Serializable {
+public interface RefererManager {
/**
* Store the referer.
*/
- public void storeReferer(RefererData referer) throws RollerException;
-
-
- /**
- * Remove referer specified by ID.
- */
- public void removeReferer( String id ) throws RollerException;
+ public void saveReferer(RefererData referer) throws RollerException;
/**
@@ -33,14 +26,6 @@
/**
- * Remove all referers for the specific weblog entry.
- * @param entryId Weblog entry ID
- * @throws RollerException
- */
- public void removeReferersForEntry(String entryid) throws RollerException;
-
-
- /**
* Clear referrer dayhits and remove referrers without excerpts.
*/
public void clearReferrers() throws RollerException;
@@ -53,9 +38,9 @@
/**
- * Retrieve referer specifie by ID.
+ * Retrieve referer by ID.
*/
- public RefererData retrieveReferer(String id) throws RollerException;
+ public RefererData getReferer(String id) throws RollerException;
/**
@@ -100,17 +85,6 @@
* @throws RollerException
*/
public List getReferersToEntry(String entryid) throws RollerException;
-
-
- /**
- * Get referers that refer to a specific weblog entry.
- * @param entryId Weblog entry ID
- * @param authorized Is the current user authorized to edit these Referers.
- * @return List of RefererData objects.
- * @throws RollerException
- */
- public List getEntryReferers(String entryId, boolean authorized)
- throws RollerException;
/**
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java?rev=395336&r1=395335&r2=395336&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java Wed Apr 19 11:22:14 2006
@@ -19,6 +19,7 @@
import org.apache.struts.actions.DispatchAction;
import org.roller.model.RefererManager;
import org.roller.model.RollerFactory;
+import org.roller.pojos.RefererData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
@@ -131,13 +132,15 @@
{
RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
WebsiteData website = rreq.getWebsite();
-
+
+ RefererData referer = null;
String[] deleteIds = req.getParameterValues("id");
if (deleteIds != null)
{
for (int i=0; i<deleteIds.length; i++)
{
- refmgr.removeReferer(deleteIds[i]);
+ referer = refmgr.getReferer(deleteIds[i]);
+ refmgr.removeReferer(referer);
}
RollerFactory.getRoller().flush();
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java?rev=395336&r1=395335&r2=395336&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java Wed Apr 19 11:22:14 2006
@@ -49,12 +49,12 @@
{
RefererManager refmgr =
RollerFactory.getRoller().getRefererManager();
- RefererData ref = refmgr.retrieveReferer(refid);
+ RefererData ref = refmgr.getReferer(refid);
entry = ref.getWeblogEntry();
boolean was = ref.getVisible()==null ?
false : ref.getVisible().booleanValue();
ref.setVisible(Boolean.valueOf( !was )); // what up, dog?
- refmgr.storeReferer(ref);
+ refmgr.saveReferer(ref);
RollerFactory.getRoller().flush();