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/17 21:44:21 UTC
svn commit: r394759 - in /incubator/roller/branches/roller-newbackend:
src/org/roller/business/hibernate/ src/org/roller/model/
tests/org/roller/business/
Author: agilliland
Date: Mon Apr 17 12:44:20 2006
New Revision: 394759
URL: http://svn.apache.org/viewcvs?rev=394759&view=rev
Log:
cleaning out all the old xxxAndCommit() methods from persistence strategy.
cleaning out all the old xxxManager bulk operation methods, which are no longer needed.
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePersistenceStrategy.java
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePlanetManagerImpl.java
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
incubator/roller/branches/roller-newbackend/src/org/roller/model/UserManager.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePersistenceStrategy.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePersistenceStrategy.java?rev=394759&r1=394758&r2=394759&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePersistenceStrategy.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePersistenceStrategy.java Mon Apr 17 12:44:20 2006
@@ -171,42 +171,9 @@
/**
- * Store object and commit it.
- *
- * If the commit fails then we rollback and release the session.
- */
- protected void storeAndCommit(PersistentObject obj) throws RollerException {
- this.store(obj);
- }
-
-
- /**
- * Store a collection of objects.
- */
- protected void store(Collection objects) throws RollerException {
-
- Object obj = null;
- Iterator items = objects.iterator();
- while(items.hasNext()) {
- obj = items.next();
-
- this.store((PersistentObject) obj);
- }
- }
-
-
- /**
- * Store a collection of objects and then commit.
- *
- * If the commit fails then we rollback and release the session.
- */
- protected void storeAndCommit(Collection objects) throws RollerException {
- this.store(objects);
- }
-
-
- /**
* Remove object.
+ *
+ * TODO BACKEND: force the use of remove(Object) moving forward.
*/
protected void remove(String id, Class clazz) throws HibernateException {
@@ -222,46 +189,6 @@
/**
- * Remove object and commit.
- *
- * If the commit fails then we rollback and release.
- */
- protected void removeAndCommit(String id, Class clazz) throws RollerException {
-
- if(id == null || clazz == null) {
- throw new RollerException("Cannot remove object when values are null");
- }
-
- this.remove(id, clazz);
- }
-
-
- /**
- * Remove a collection of objects.
- */
- protected void remove(Collection ids, Class clazz) throws RollerException {
-
- String id = null;
- Iterator items = ids.iterator();
- while(items.hasNext()) {
- id = (String) items.next();
-
- this.remove(id, clazz);
- }
- }
-
-
- /**
- * Remove a collection of objects and then commit.
- *
- * If the commit fails then we rollback and release the session.
- */
- protected void removeAndCommit(Collection ids, Class clazz) throws RollerException {
- this.remove(ids, clazz);
- }
-
-
- /**
* Remove object.
*/
protected void remove(PersistentObject obj) throws HibernateException {
@@ -281,56 +208,6 @@
/**
- * Remove object and commit.
- *
- * If the commit fails then we rollback and release.
- */
- protected void removeAndCommit(PersistentObject obj) throws RollerException {
-
- if(obj == null) {
- throw new RollerException("Cannot remove null object");
- }
-
- this.remove(obj);
- }
-
-
- /**
- * Remove a collection of objects.
- */
- protected void remove(Collection objects) throws RollerException {
-
- Object obj = null;
- Iterator items = objects.iterator();
- while(items.hasNext()) {
- obj = items.next();
-
- this.remove((PersistentObject) obj);
- }
- }
-
-
- /**
- * Remove a collection of objects and then commit.
- *
- * If the commit fails then we rollback and release the session.
- */
- protected void removeAndCommit(Collection objects) throws RollerException {
- this.remove(objects);
- }
-
-
- /**
- * Store hierarchical object and commit it.
- *
- * If the commit fails then we rollback and release the session.
- */
- protected void storeAndCommit(HierarchicalPersistentObject obj) throws RollerException {
- this.store(obj);
- }
-
-
- /**
* Store hierarchical object.
*
* NOTE: if the object has proper cascade setting then is all this necessary?
@@ -416,7 +293,6 @@
// Clear new parent now that new parent has been saved
mNewParent = null;
-
}
@@ -429,24 +305,7 @@
throw new HibernateException("Cannot save null object");
}
- // TODO BACKEND: double check that this is okay
getSession().saveOrUpdate(assoc);
-
- }
-
-
- /**
- * Remove hierarchical object and commit.
- *
- * If the commit fails then we rollback and release.
- */
- protected void removeAndCommit(HierarchicalPersistentObject obj) throws RollerException {
-
- if(obj == null) {
- throw new RollerException("Cannot remove null object");
- }
-
- this.remove(obj);
}
@@ -494,7 +353,6 @@
this.remove(assoc);
}
- // remove myself
getSession().delete(obj);
}
@@ -508,9 +366,7 @@
throw new HibernateException("Cannot save null object");
}
- // TODO BACKEND: double check that this is okay
getSession().delete(assoc);
-
}
}
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePlanetManagerImpl.java?rev=394759&r1=394758&r2=394759&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernatePlanetManagerImpl.java Mon Apr 17 12:44:20 2006
@@ -86,7 +86,7 @@
public void saveConfiguration(PlanetConfigData config) throws RollerException {
- strategy.storeAndCommit(config);
+ strategy.store(config);
}
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java?rev=394759&r1=394758&r2=394759&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java Mon Apr 17 12:44:20 2006
@@ -39,6 +39,7 @@
import org.roller.pojos.WeblogEntryData;
import org.roller.pojos.WebsiteData;
+
/**
* Hibernate implementation of the UserManager.
*/
@@ -69,11 +70,6 @@
}
- public void storeWebsites(Collection weblogs) throws RollerException {
- this.strategy.store(weblogs);
- }
-
-
public void removeWebsite(String id) throws RollerException {
// load the weblog first
@@ -183,14 +179,6 @@
}
- /**
- * Store a collection of users in a single transaction.
- */
- public void storeUsers(Collection users) throws RollerException {
- this.strategy.store(users);
- }
-
-
public void removeUser(UserData user) throws RollerException {
this.strategy.remove(user);
}
@@ -206,11 +194,6 @@
}
- public void storePermissions(Collection permissions) throws RollerException {
- this.strategy.store(permissions);
- }
-
-
public void removePermissions(PermissionsData perms) throws RollerException {
this.strategy.remove(perms);
}
@@ -275,27 +258,10 @@
}
- public void addWebsites(Collection weblogs) throws RollerException {
-
- // store the new weblogs
- WebsiteData newWeblog = null;
- Iterator items = weblogs.iterator();
- while(items.hasNext()) {
- newWeblog = (WebsiteData) items.next();
-
- this.strategy.store(newWeblog);
- this.addWeblogContents(newWeblog);
- }
- }
-
-
public void createWebsite(WebsiteData newWeblog) throws RollerException {
- // simplification, just use addWebsites(collection)
- Collection newWeblogs = new ArrayList();
- newWeblogs.add(newWeblog);
-
- this.addWebsites(newWeblogs);
+ this.strategy.store(newWeblog);
+ this.addWeblogContents(newWeblog);
}
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/model/UserManager.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/model/UserManager.java?rev=394759&r1=394758&r2=394759&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/model/UserManager.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/model/UserManager.java Mon Apr 17 12:44:20 2006
@@ -40,12 +40,6 @@
public void storeUser(UserData data) throws RollerException;
- /**
- * Store a set of users in a single transaction.
- */
- public void storeUsers(Collection users) throws RollerException;
-
-
public void removeUser(UserData user) throws RollerException;
@@ -129,23 +123,11 @@
/**
- * Add a collection of weblogs in a single transaction.
- */
- public void addWebsites(Collection websites) throws RollerException;
-
-
- /**
* Store a single weblog.
*/
public void storeWebsite(WebsiteData data) throws RollerException;
- /**
- * Store a collection of weblogs in a single transaction.
- */
- public void storeWebsites(Collection weblogs) throws RollerException;
-
-
public void removeWebsite(WebsiteData website) throws RollerException;
@@ -180,12 +162,6 @@
public void storePermissions(PermissionsData perms) throws RollerException;
-
-
- /**
- * Store a collection of permissions in a single transaction.
- */
- public void storePermissions(Collection permissions) throws RollerException;
public void removePermissions(PermissionsData perms) throws RollerException;
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java?rev=394759&r1=394758&r2=394759&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java Mon Apr 17 12:44:20 2006
@@ -175,69 +175,6 @@
/**
- * Test advanced CRUD methods.
- */
- public void testAdvancedPermissionCRUD() throws Exception {
-
- log.info("Test Advanced Permission CRUD");
-
- UserManager mgr = RollerFactory.getRoller().getUserManager();
- List perms = null;
-
- // need a second user and weblog to test with
- UserData testUser2 = TestUtils.setupUser("permUser2");
- WebsiteData testWeblog2 = TestUtils.setupWeblog("permWeblog2", testUser);
- TestUtils.endSession(true);
-
- // some perms to test with
- PermissionsData perm1 = new PermissionsData();
- perm1.setUser(testUser2);
- perm1.setWebsite(testWeblog);
- perm1.setPending(false);
- perm1.setPermissionMask(PermissionsData.AUTHOR);
-
- PermissionsData perm2 = new PermissionsData();
- perm2.setUser(testUser2);
- perm2.setWebsite(testWeblog2);
- perm2.setPending(false);
- perm2.setPermissionMask(PermissionsData.AUTHOR);
-
- Collection newPerms = new ArrayList();
- newPerms.add(perm1);
- newPerms.add(perm2);
-
- // add perms (collection)
- mgr.storePermissions(newPerms);
- TestUtils.endSession(true);
-
- // make sure perms were added
- perms = null;
- perms = mgr.getAllPermissions(testUser2);
- assertNotNull(perms);
- assertEquals(2, perms.size());
-
- // store perms (collection)
- perm1 = mgr.getPermissions(testWeblog, testUser2);
- perm2 = mgr.getPermissions(testWeblog2, testUser2);
- perm1.setPending(true);
- perm2.setPending(true);
- mgr.storePermissions(newPerms);
- TestUtils.endSession(true);
-
- // make sure perms were stored
- perms = null;
- perms = mgr.getPendingPermissions(testUser2);
- assertNotNull(perms);
- assertEquals(2, perms.size());
-
- // remove test data
- TestUtils.teardownWeblog(testWeblog2.getId());
- TestUtils.teardownUser(testUser2.getId());
- TestUtils.endSession(true);
- }
-
-
- /**
* Tests weblog invitation process.
*/
public void testInvitations() throws Exception {
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java?rev=394759&r1=394758&r2=394759&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java Mon Apr 17 12:44:20 2006
@@ -197,71 +197,7 @@
TestUtils.teardownUser(testUser.getId());
TestUtils.endSession(true);
}
-
-
- /**
- * Test advanced CRUD methods.
- */
- public void testAdvancedUserCRUD() throws Exception {
-
- UserManager mgr = RollerFactory.getRoller().getUserManager();
- List users = null;
-
- // some users to test with
- UserData testUser1 = new UserData();
- testUser1.setUserName("testUser1");
- testUser1.setPassword("password");
- testUser1.setFullName("Test User");
- testUser1.setEmailAddress("TestUser@dev.null");
- testUser1.setLocale("en_US");
- testUser1.setTimeZone("America/Los_Angeles");
- testUser1.setDateCreated(new java.util.Date());
- testUser1.setEnabled(Boolean.TRUE);
-
- UserData testUser2 = new UserData();
- testUser2.setUserName("testUser2");
- testUser2.setPassword("password");
- testUser2.setFullName("Test User");
- testUser2.setEmailAddress("TestUser@dev.null");
- testUser2.setLocale("en_US");
- testUser2.setTimeZone("America/Los_Angeles");
- testUser2.setDateCreated(new java.util.Date());
- testUser2.setEnabled(Boolean.TRUE);
-
- Collection newUsers = new ArrayList();
- newUsers.add(testUser1);
- newUsers.add(testUser2);
-
- // add users (collection)
- mgr.addUsers(newUsers);
- TestUtils.endSession(true);
-
- // make sure users were added
- users = null;
- users = mgr.getUsers();
- assertNotNull(users);
- assertEquals(2, users.size());
-
- // store users (collection)
- testUser1.setFullName("blahblah");
- testUser2.setFullName("foofoo");
- mgr.storeUsers(newUsers);
- TestUtils.endSession(true);
-
- // make sure users were stored
- users = null;
- users = mgr.getUsers();
- assertNotNull(users);
- assertEquals(2, users.size());
- assertTrue(((UserData)users.get(0)).getFullName().equals("blahblah") ||
- ((UserData)users.get(1)).getFullName().equals("blahblah"));
-
- // remove users (collection)
- TestUtils.teardownUser(testUser1.getId());
- TestUtils.teardownUser(testUser2.getId());
- TestUtils.endSession(true);
- }
-
+
/**
* Test ability to remove a user with a full set of data.
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java?rev=394759&r1=394758&r2=394759&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java Mon Apr 17 12:44:20 2006
@@ -191,78 +191,6 @@
/**
- * Test advanced CRUD methods.
- */
- public void testAdvancedWeblogCRUD() throws Exception {
-
- UserManager mgr = RollerFactory.getRoller().getUserManager();
- List weblogs = null;
-
- // some weblogs to test with
- WebsiteData testWeblog1 = new WebsiteData();
- testWeblog1.setName("Test Weblog 1");
- testWeblog1.setDescription("Test Weblog 1");
- testWeblog1.setHandle("testweblog1");
- testWeblog1.setEmailAddress("testweblog1@dev.null");
- testWeblog1.setEditorPage("editor-text.jsp");
- testWeblog1.setBlacklist("");
- testWeblog1.setEmailFromAddress("");
- testWeblog1.setEditorTheme("basic");
- testWeblog1.setLocale("en_US");
- testWeblog1.setTimeZone("America/Los_Angeles");
- testWeblog1.setDateCreated(new java.util.Date());
- testWeblog1.setCreator(testUser);
-
- WebsiteData testWeblog2 = new WebsiteData();
- testWeblog2.setName("Test Weblog 2");
- testWeblog2.setDescription("Test Weblog 2");
- testWeblog2.setHandle("testweblog2");
- testWeblog2.setEmailAddress("testweblog2@dev.null");
- testWeblog2.setEditorPage("editor-text.jsp");
- testWeblog2.setBlacklist("");
- testWeblog2.setEmailFromAddress("");
- testWeblog2.setEditorTheme("basic");
- testWeblog2.setLocale("en_US");
- testWeblog2.setTimeZone("America/Los_Angeles");
- testWeblog2.setDateCreated(new java.util.Date());
- testWeblog2.setCreator(testUser);
-
- Collection newWeblogs = new ArrayList();
- newWeblogs.add(testWeblog1);
- newWeblogs.add(testWeblog2);
-
- // add weblogs (collection)
- mgr.addWebsites(newWeblogs);
- TestUtils.endSession(true);
-
- // make sure weblogs were added
- weblogs = null;
- weblogs = mgr.getWebsites(null, null, null);
- assertNotNull(weblogs);
- assertEquals(2, weblogs.size());
-
- // store weblogs (collection)
- testWeblog1.setName("blahblah");
- testWeblog2.setName("foofoo");
- mgr.storeWebsites(newWeblogs);
- TestUtils.endSession(true);
-
- // make sure weblogs were stored
- weblogs = null;
- weblogs = mgr.getWebsites(null, null, null);
- assertNotNull(weblogs);
- assertEquals(2, weblogs.size());
- assertTrue(((WebsiteData)weblogs.get(0)).getName().equals("blahblah") ||
- ((WebsiteData)weblogs.get(1)).getName().equals("blahblah"));
-
- // remove weblogs (collection)
- TestUtils.teardownWeblog(testWeblog1.getId());
- TestUtils.teardownWeblog(testWeblog2.getId());
- TestUtils.endSession(true);
- }
-
-
- /**
* Test that we can safely remove a fully loaded weblog.
* That means a weblog with entries, categories, bookmarks, pings, etc.
*/