Author: rdonkin
Date: Tue Jan 6 12:25:43 2009
New Revision: 732097
URL: http://svn.apache.org/viewvc?rev=732097&view=rev
Log:
Renamed mappers. Original names will be reused for interfaces.
Added:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
- copied, changed from r732092,
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
- copied, changed from r732092,
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java
- copied, changed from r732065,
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/SubscriptionMapper.java
Removed:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/SubscriptionMapper.java
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/SubscriptionManager.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java?rev=732097&r1=732096&r2=732097&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
Tue Jan 6 12:25:43 2009
@@ -36,8 +36,8 @@
import org.apache.commons.logging.Log;
import org.apache.james.api.imap.AbstractLogEnabled;
-import org.apache.james.imap.jpa.mail.MailboxMapper;
-import org.apache.james.imap.jpa.mail.MessageMapper;
+import org.apache.james.imap.jpa.mail.JPAMailboxMapper;
+import org.apache.james.imap.jpa.mail.JPAMessageMapper;
import org.apache.james.imap.jpa.mail.map.openjpa.OpenJPAMailboxMapper;
import org.apache.james.imap.jpa.mail.model.Header;
import org.apache.james.imap.jpa.mail.model.Mailbox;
@@ -75,7 +75,7 @@
}
public int getMessageCount(MailboxSession mailboxSession) throws
MailboxException {
- final MessageMapper messageMapper = createMessageMapper();
+ final JPAMessageMapper messageMapper = createMessageMapper();
return (int) messageMapper.countMessagesInMailbox(mailboxId);
}
@@ -102,7 +102,7 @@
final Flags flags = mimeMessage.getFlags();
final List<Header> headers = headers(mailboxId, uid,
mimeMessage);
final Message message = new Message(mailboxId, uid,
internalDate, size, flags, body, headers);
- final MessageMapper mapper = createMessageMapper();
+ final JPAMessageMapper mapper = createMessageMapper();
mapper.begin();
mapper.save(message);
@@ -120,8 +120,8 @@
}
}
- private MessageMapper createMessageMapper() {
- final MessageMapper mapper = new
MessageMapper(entityManagerFactory.createEntityManager());
+ private JPAMessageMapper createMessageMapper() {
+ final JPAMessageMapper mapper = new
JPAMessageMapper(entityManagerFactory.createEntityManager());
return mapper;
}
@@ -154,7 +154,7 @@
}
private Mailbox reserveNextUid() throws MailboxException {
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
final Mailbox mailbox = mapper.consumeNextUid(mailboxId);
return mailbox;
}
@@ -162,7 +162,7 @@
public Iterator getMessages(final MessageRange set, FetchGroup fetchGroup,
MailboxSession mailboxSession) throws MailboxException {
UidRange range = uidRangeForMessageSet(set);
- final MessageMapper messageMapper = createMessageMapper();
+ final JPAMessageMapper messageMapper = createMessageMapper();
final List<Message> rows = new
ArrayList<Message>(messageMapper.findInMailbox(set, mailboxId));
return getMessages(fetchGroup, range, rows);
}
@@ -207,7 +207,7 @@
}
public long[] recent(boolean reset, MailboxSession mailboxSession) throws
MailboxException {
- final MessageMapper mapper = createMessageMapper();
+ final JPAMessageMapper mapper = createMessageMapper();
mapper.begin();
final List<Message> messages =
mapper.findRecentMessagesInMailbox(mailboxId);
final long[] results = new long[messages.size()];
@@ -227,7 +227,7 @@
public MessageResult getFirstUnseen(FetchGroup fetchGroup,
MailboxSession mailboxSession) throws MailboxException {
try {
- final MessageMapper messageMapper = createMessageMapper();
+ final JPAMessageMapper messageMapper = createMessageMapper();
final List<Message> messageRows =
messageMapper.findUnseenMessagesInMailboxOrderByUid(mailboxId);
final Iterator<Message> it = messageRows.iterator();
final MessageResult result;
@@ -246,7 +246,7 @@
}
public int getUnseenCount(MailboxSession mailboxSession) throws
MailboxException {
- final MessageMapper messageMapper = createMessageMapper();
+ final JPAMessageMapper messageMapper = createMessageMapper();
final int count = (int)
messageMapper.countUnseenMessagesInMailbox(mailboxId);
return count;
}
@@ -258,7 +258,7 @@
private Iterator doExpunge(final MessageRange set, FetchGroup fetchGroup)
throws MailboxException {
- final MessageMapper mapper = createMessageMapper();
+ final JPAMessageMapper mapper = createMessageMapper();
mapper.begin();
final List<Message> messages =
mapper.findMarkedForDeletionInMailbox(set, mailboxId);
final long[] uids = uids(messages);
@@ -296,7 +296,7 @@
private Iterator doSetFlags(Flags flags, boolean value, boolean replace,
final MessageRange set, FetchGroup fetchGroup,
MailboxSession mailboxSession) throws MailboxException {
- final MessageMapper mapper = createMessageMapper();
+ final JPAMessageMapper mapper = createMessageMapper();
mapper.begin();
final List<Message> messages = mapper.findInMailbox(set, mailboxId);
UidRange uidRange = uidRangeForMessageSet(set);
@@ -352,18 +352,18 @@
}
private Mailbox getMailboxRow() throws MailboxException {
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
return mapper.findMailboxById(mailboxId);
}
- private MailboxMapper createMailboxMapper() {
- final MailboxMapper mapper = new
OpenJPAMailboxMapper(entityManagerFactory.createEntityManager());
+ private JPAMailboxMapper createMailboxMapper() {
+ final JPAMailboxMapper mapper = new
OpenJPAMailboxMapper(entityManagerFactory.createEntityManager());
return mapper;
}
public Iterator search(SearchQuery query, FetchGroup fetchGroup,
MailboxSession mailboxSession) throws MailboxException {
- final MessageMapper messageMapper = createMessageMapper();
+ final JPAMessageMapper messageMapper = createMessageMapper();
final List<Message> messages = messageMapper.searchMailbox(mailboxId,
query);
final List<Message> filteredMessages = new
ArrayList<Message>(messages.size());
for (Message message:messages) {
@@ -395,7 +395,7 @@
public void copyTo(MessageRange set, JPAMailbox toMailbox, MailboxSession
session) throws MailboxException {
try {
- final MessageMapper mapper = createMessageMapper();
+ final JPAMessageMapper mapper = createMessageMapper();
mapper.begin();
List<Message> rows = mapper.findInMailbox(set, mailboxId);
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java?rev=732097&r1=732096&r2=732097&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
Tue Jan 6 12:25:43 2009
@@ -31,7 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.james.api.imap.AbstractLogEnabled;
-import org.apache.james.imap.jpa.mail.MailboxMapper;
+import org.apache.james.imap.jpa.mail.JPAMailboxMapper;
import org.apache.james.imap.jpa.mail.map.openjpa.OpenJPAMailboxMapper;
import org.apache.james.imap.jpa.mail.model.Mailbox;
import org.apache.james.imap.mailbox.ListResult;
@@ -72,7 +72,7 @@
private JPAMailbox doGetMailbox(String mailboxName) throws
MailboxException {
synchronized (mailboxes) {
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
Mailbox mailboxRow = mapper.findMailboxByName(mailboxName);
if (mailboxRow == null) {
@@ -132,7 +132,7 @@
private void doCreate(String namespaceName) throws MailboxException {
Mailbox mailbox = new Mailbox(namespaceName,
Math.abs(random.nextInt()));
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
mapper.begin();
mapper.save(mailbox);
mapper.commit();
@@ -143,7 +143,7 @@
getLog().info("deleteMailbox " + mailboxName);
synchronized (mailboxes) {
// TODO put this into a serilizable transaction
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
mapper.begin();
Mailbox mr = mapper.findMailboxByName(mailboxName);
if (mr == null) {
@@ -167,7 +167,7 @@
throw new MailboxExistsException(to);
}
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
mapper.begin();
// TODO put this into a serilizable transaction
final Mailbox mailbox = mapper.findMailboxByName(from);
@@ -233,7 +233,7 @@
HIERARCHY_DELIMITER).replace(freeWildcard, SQL_WILDCARD_CHAR)
.replace(localWildcard, SQL_WILDCARD_CHAR);
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
final List<Mailbox> mailboxes = mapper.findMailboxWithNameLike(search);
final List<ListResult> listResults = new
ArrayList<ListResult>(mailboxes.size());
for (Mailbox mailbox: mailboxes) {
@@ -255,7 +255,7 @@
public boolean mailboxExists(String mailboxName) throws MailboxException {
synchronized (mailboxes) {
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
final long count = mapper.countMailboxesWithName(mailboxName);
if (count == 0) {
mailboxes.remove(mailboxName);
@@ -271,15 +271,15 @@
}
public void deleteEverything() throws MailboxException {
- final MailboxMapper mapper = createMailboxMapper();
+ final JPAMailboxMapper mapper = createMailboxMapper();
mapper.begin();
mapper.deleteAll();
mapper.commit();
mailboxes.clear();
}
- private MailboxMapper createMailboxMapper() {
- final MailboxMapper mapper = new
OpenJPAMailboxMapper(entityManagerFactory.createEntityManager());
+ private JPAMailboxMapper createMailboxMapper() {
+ final JPAMailboxMapper mapper = new
OpenJPAMailboxMapper(entityManagerFactory.createEntityManager());
return mapper;
}
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/SubscriptionManager.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/SubscriptionManager.java?rev=732097&r1=732096&r2=732097&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/SubscriptionManager.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/SubscriptionManager.java
Tue Jan 6 12:25:43 2009
@@ -25,7 +25,7 @@
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceException;
-import org.apache.james.imap.jpa.user.SubscriptionMapper;
+import org.apache.james.imap.jpa.user.JPASubscriptionMapper;
import org.apache.james.imap.jpa.user.model.Subscription;
import org.apache.james.imap.mailbox.SubscriptionException;
@@ -44,7 +44,7 @@
public void subscribe(final String user, final String mailbox) throws
SubscriptionException {
try {
- final SubscriptionMapper mapper = new
SubscriptionMapper(factory.createEntityManager());
+ final JPASubscriptionMapper mapper = new
JPASubscriptionMapper(factory.createEntityManager());
mapper.begin();
final Subscription subscription =
mapper.findFindMailboxSubscriptionForUser(user, mailbox);
@@ -60,7 +60,7 @@
public Collection<String> subscriptions(final String user) throws
SubscriptionException {
try {
- final SubscriptionMapper mapper = new
SubscriptionMapper(factory.createEntityManager());
+ final JPASubscriptionMapper mapper = new
JPASubscriptionMapper(factory.createEntityManager());
final List<Subscription> subscriptions =
mapper.findSubscriptionsForUser(user);
final Collection<String> results = new
HashSet<String>(INITIAL_SIZE);
for (Subscription subscription:subscriptions) {
@@ -74,7 +74,7 @@
public void unsubscribe(final String user, final String mailbox) throws
SubscriptionException {
try {
- final SubscriptionMapper mapper = new
SubscriptionMapper(factory.createEntityManager());
+ final JPASubscriptionMapper mapper = new
JPASubscriptionMapper(factory.createEntityManager());
mapper.begin();
final Subscription subscription =
mapper.findFindMailboxSubscriptionForUser(user, mailbox);
Copied:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
(from r732092,
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java)
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java&r1=732092&r2=732097&rev=732097&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
Tue Jan 6 12:25:43 2009
@@ -32,9 +32,9 @@
/**
* Data access management for mailbox.
*/
-public abstract class MailboxMapper extends Mapper {
+public abstract class JPAMailboxMapper extends Mapper {
- public MailboxMapper(EntityManager entityManager) {
+ public JPAMailboxMapper(EntityManager entityManager) {
super(entityManager);
}
Copied:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
(from r732092,
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java)
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java&r1=732092&r2=732097&rev=732097&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
Tue Jan 6 12:25:43 2009
@@ -30,9 +30,9 @@
import org.apache.james.imap.mailbox.SearchQuery.Criterion;
import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
-public class MessageMapper extends Mapper {
+public class JPAMessageMapper extends Mapper {
- public MessageMapper(EntityManager entityManager) {
+ public JPAMessageMapper(EntityManager entityManager) {
super(entityManager);
}
Modified:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java?rev=732097&r1=732096&r2=732097&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java
Tue Jan 6 12:25:43 2009
@@ -21,7 +21,7 @@
import javax.persistence.EntityManager;
-import org.apache.james.imap.jpa.mail.MailboxMapper;
+import org.apache.james.imap.jpa.mail.JPAMailboxMapper;
import org.apache.james.imap.jpa.mail.model.Mailbox;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAPersistence;
@@ -29,7 +29,7 @@
/**
* Data access management for mailbox.
*/
-public class OpenJPAMailboxMapper extends MailboxMapper {
+public class OpenJPAMailboxMapper extends JPAMailboxMapper {
public OpenJPAMailboxMapper(EntityManager entityManager) {
super(entityManager);
Copied:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java
(from r732065,
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/SubscriptionMapper.java)
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/SubscriptionMapper.java&r1=732065&r2=732097&rev=732097&view=diff
==============================================================================
---
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/SubscriptionMapper.java
(original)
+++
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java
Tue Jan 6 12:25:43 2009
@@ -28,10 +28,10 @@
/**
* Maps data access logic to JPA operations.
*/
-public class SubscriptionMapper {
+public class JPASubscriptionMapper {
private final EntityManager entityManager;
- public SubscriptionMapper(final EntityManager entityManager) {
+ public JPASubscriptionMapper(final EntityManager entityManager) {
super();
this.entityManager = entityManager;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
