Author: norman
Date: Thu Sep 23 18:14:36 2010
New Revision: 1000562

URL: http://svn.apache.org/viewvc?rev=1000562&view=rev
Log:
Add specific MapperFactory interfaces (IMAP-220)

Added:
    
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMapperFactory.java
    
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageMapperFactory.java
    
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SubscriptionMapperFactory.java
Modified:
    
james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
    
james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
    
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxManager.java
    
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageManager.java
    
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
    
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
    
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java
    
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
    
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java
    
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
    
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java

Modified: 
james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
 (original)
+++ 
james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
 Thu Sep 23 18:14:36 2010
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.store.us
 /**
  * JCR implementation of a SubscriptionManager
  */
-public class JCRSubscriptionManager extends StoreSubscriptionManager<String> 
implements JCRImapConstants {
+public class JCRSubscriptionManager extends StoreSubscriptionManager 
implements JCRImapConstants {
     
     private final Log logger = LogFactory.getLog(JCRSubscriptionManager.class);
 

Modified: 
james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
 (original)
+++ 
james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
 Thu Sep 23 18:14:36 2010
@@ -27,7 +27,7 @@ import org.apache.james.mailbox.store.us
  * JPA implementation of {...@link StoreSubscriptionManager}
  *
  */
-public class JPASubscriptionManager extends StoreSubscriptionManager<Long> {
+public class JPASubscriptionManager extends StoreSubscriptionManager {
     
     public JPASubscriptionManager(final JPAMailboxSessionMapperFactory 
mapperFactory) {
         super(mapperFactory);

Modified: 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxManager.java
 (original)
+++ 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxManager.java
 Thu Sep 23 18:14:36 2010
@@ -42,7 +42,7 @@ public class MaildirMailboxManager exten
     @Override
     protected MapperStoreMessageManager<Integer> 
createMessageManager(AtomicLong lastUid, MailboxEventDispatcher dispatcher,
             Mailbox<Integer> mailboxEntiy, MailboxSession session) throws 
MailboxException {
-        return new MaildirMessageManager(mailboxSessionMapperFactory, lastUid, 
dispatcher, mailboxEntiy);
+        return new 
MaildirMessageManager((MailboxSessionMapperFactory<Integer>)mailboxSessionMapperFactory,
 lastUid, dispatcher, mailboxEntiy);
     }
 
     @Override

Modified: 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageManager.java
 (original)
+++ 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageManager.java
 Thu Sep 23 18:14:36 2010
@@ -29,8 +29,8 @@ import javax.mail.Flags;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.maildir.mail.model.MaildirHeader;
 import org.apache.james.mailbox.maildir.mail.model.MaildirMessage;
-import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
 import org.apache.james.mailbox.store.MapperStoreMessageManager;
+import org.apache.james.mailbox.store.MessageMapperFactory;
 import org.apache.james.mailbox.store.mail.model.Header;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.MailboxMembership;
@@ -39,7 +39,7 @@ import org.apache.james.mailbox.util.Mai
 
 public class MaildirMessageManager extends MapperStoreMessageManager<Integer> {
 
-    public MaildirMessageManager(MailboxSessionMapperFactory<Integer> 
mapperFactory, AtomicLong lastUid,
+    public MaildirMessageManager(MessageMapperFactory<Integer> mapperFactory, 
AtomicLong lastUid,
             MailboxEventDispatcher dispatcher, Mailbox<Integer> mailboxEntiy)
     throws MailboxException {
         super(mapperFactory, lastUid, dispatcher, mailboxEntiy);

Modified: 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
 (original)
+++ 
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
 Thu Sep 23 18:14:36 2010
@@ -23,7 +23,7 @@ import org.apache.james.mailbox.maildir.
 import org.apache.james.mailbox.store.StoreSubscriptionManager;
 import org.apache.james.mailbox.store.user.model.Subscription;
 
-public class MaildirSubscriptionManager extends 
StoreSubscriptionManager<Integer> {
+public class MaildirSubscriptionManager extends StoreSubscriptionManager {
 
     public MaildirSubscriptionManager(MaildirMailboxSessionMapperFactory mf) {
         super(mf);

Modified: 
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
 (original)
+++ 
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
 Thu Sep 23 18:14:36 2010
@@ -40,7 +40,7 @@ public class InMemoryMailboxManager exte
 
     @Override
     protected MapperStoreMessageManager<Long> createMessageManager(AtomicLong 
lastUid, MailboxEventDispatcher dispatcher, Mailbox<Long> mailboxRow, 
MailboxSession session) throws MailboxException {
-        return new InMemoryStoreMessageManager(mailboxSessionMapperFactory, 
lastUid, dispatcher, (InMemoryMailbox)mailboxRow);
+        return new 
InMemoryStoreMessageManager((MailboxSessionMapperFactory<Long>)mailboxSessionMapperFactory,
 lastUid, dispatcher, (InMemoryMailbox)mailboxRow);
     }
 
     @Override

Modified: 
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java
 (original)
+++ 
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java
 Thu Sep 23 18:14:36 2010
@@ -29,7 +29,7 @@ import org.apache.james.mailbox.store.us
 /**
  * Stores subscriptions in memory.
  */
-public class InMemorySubscriptionManager extends 
StoreSubscriptionManager<Long> {
+public class InMemorySubscriptionManager extends StoreSubscriptionManager {
     
     public InMemorySubscriptionManager(MailboxSessionMapperFactory<Long> 
mapperFactory) {
         super(mapperFactory);
@@ -44,6 +44,7 @@ public class InMemorySubscriptionManager
      * (non-Javadoc)
      * @see 
org.apache.james.mailbox.store.transaction.TransactionalMapper#execute(org.apache.james.mailbox.store.transaction.TransactionalMapper.Transaction)
      */
+    @SuppressWarnings("unchecked")
     public void execute(Transaction transaction) throws MailboxException {
         transaction.run();
     }

Added: 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMapperFactory.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMapperFactory.java?rev=1000562&view=auto
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMapperFactory.java
 (added)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMapperFactory.java
 Thu Sep 23 18:14:36 2010
@@ -0,0 +1,34 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+package org.apache.james.mailbox.store;
+
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.store.mail.MailboxMapper;
+
+public interface MailboxMapperFactory<Id> {
+
+    /**
+     * Create a {...@link MailboxMapper} instance or return the one which 
exists for the {...@link MailboxSession} already
+     * 
+     * @param session
+     * @return mapper
+     */
+    public MailboxMapper<Id> getMailboxMapper(MailboxSession session) throws 
MailboxException;
+}

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
 Thu Sep 23 18:14:36 2010
@@ -31,18 +31,16 @@ import org.apache.james.mailbox.store.us
  * Maintain mapper instances by {...@link MailboxSession}. So only one mapper 
instance is used
  * in a {...@link MailboxSession}
  */
-public abstract class MailboxSessionMapperFactory <Id> implements RequestAware{
+public abstract class MailboxSessionMapperFactory <Id> implements 
RequestAware, MailboxMapperFactory<Id>, MessageMapperFactory<Id>, 
SubscriptionMapperFactory{
 
     protected final static String MESSAGEMAPPER ="MESSAGEMAPPER";
     protected final static String MAILBOXMAPPER ="MAILBOXMAPPER";
     protected final static String SUBSCRIPTIONMAPPER ="SUBSCRIPTIONMAPPER";
 
-    /**
-     * Create a {...@link MessageMapper} instance of return the one which 
exists for the {...@link MailboxSession} already
-     * 
-     * @param session
-     * @param mailboxId
-     * @return mapper
+
+    /*
+     * (non-Javadoc)
+     * @see 
org.apache.james.mailbox.store.MessageMapperFactory#getMessageMapper(org.apache.james.mailbox.MailboxSession)
      */
     @SuppressWarnings("unchecked")
     public MessageMapper<Id> getMessageMapper(MailboxSession session) throws 
MailboxException {
@@ -63,11 +61,10 @@ public abstract class MailboxSessionMapp
      */
     protected abstract MessageMapper<Id> createMessageMapper(MailboxSession 
session) throws MailboxException;
 
-    /**
-     * Create a {...@link MailboxMapper} instance or return the one which 
exists for the {...@link MailboxSession} already
-     * 
-     * @param session
-     * @return mapper
+
+    /*
+     * (non-Javadoc)
+     * @see 
org.apache.james.mailbox.store.MailboxMapperFactory#getMailboxMapper(org.apache.james.mailbox.MailboxSession)
      */
     @SuppressWarnings("unchecked")
     public MailboxMapper<Id> getMailboxMapper(MailboxSession session) throws 
MailboxException {

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java
 Thu Sep 23 18:14:36 2010
@@ -51,10 +51,10 @@ import org.apache.james.mailbox.util.Mai
 public abstract class MapperStoreMessageManager<Id> extends 
StoreMessageManager<Id> {
 
    
-    private MailboxSessionMapperFactory<Id> mapperFactory;
+    private MessageMapperFactory<Id> mapperFactory;
 
     
-    public MapperStoreMessageManager(MailboxSessionMapperFactory<Id> 
mapperFactory, final AtomicLong lastUid, final MailboxEventDispatcher 
dispatcher, final Mailbox<Id> mailbox) throws MailboxException {
+    public MapperStoreMessageManager(MessageMapperFactory<Id> mapperFactory, 
final AtomicLong lastUid, final MailboxEventDispatcher dispatcher, final 
Mailbox<Id> mailbox) throws MailboxException {
         super(lastUid, dispatcher, mailbox);
         this.mapperFactory = mapperFactory;
     }

Added: 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageMapperFactory.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageMapperFactory.java?rev=1000562&view=auto
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageMapperFactory.java
 (added)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageMapperFactory.java
 Thu Sep 23 18:14:36 2010
@@ -0,0 +1,36 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+package org.apache.james.mailbox.store;
+
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.store.mail.MessageMapper;
+
+public interface MessageMapperFactory<Id> {
+
+    /**
+     * Create a {...@link MessageMapper} instance of return the one which 
exists for the {...@link MailboxSession} already
+     * 
+     * @param session
+     * @param mailboxId
+     * @return mapper
+     */
+    public MessageMapper<Id> getMessageMapper(MailboxSession session) throws 
MailboxException;
+        
+}

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
 Thu Sep 23 18:14:36 2010
@@ -42,6 +42,7 @@ import org.apache.james.mailbox.MailboxP
 import org.apache.james.mailbox.MailboxQuery;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.RequestAware;
 import org.apache.james.mailbox.StandardMailboxMetaDataComparator;
 import org.apache.james.mailbox.MailboxMetaData.Selectability;
 import org.apache.james.mailbox.store.mail.MailboxMapper;
@@ -67,7 +68,7 @@ public abstract class StoreMailboxManage
     private final MailboxEventDispatcher dispatcher = new 
MailboxEventDispatcher();
     private final DelegatingMailboxListener delegatingListener = new 
DelegatingMailboxListener();   
     private final MailboxPathLock lock = new MailboxPathLock();
-    protected final MailboxSessionMapperFactory<Id> 
mailboxSessionMapperFactory;    
+    protected final MailboxMapperFactory<Id> mailboxSessionMapperFactory;    
     
     private final Authenticator authenticator;
     private final static Random RANDOM = new Random();
@@ -75,7 +76,7 @@ public abstract class StoreMailboxManage
     private Log log = LogFactory.getLog("org.apache.james.imap");
     private ConcurrentMap<Id, AtomicLong> lastUids = new ConcurrentHashMap<Id, 
AtomicLong>();
     
-    public StoreMailboxManager(MailboxSessionMapperFactory<Id> 
mailboxSessionMapperFactory, final Authenticator authenticator) {
+    public StoreMailboxManager(MailboxMapperFactory<Id> 
mailboxSessionMapperFactory, final Authenticator authenticator) {
         this.authenticator = authenticator;
         this.mailboxSessionMapperFactory = mailboxSessionMapperFactory;
         
@@ -428,7 +429,9 @@ public abstract class StoreMailboxManage
      * End processing of Request for session
      */
     public void endProcessingRequest(MailboxSession session) {
-        mailboxSessionMapperFactory.endProcessingRequest(session);
+        if (mailboxSessionMapperFactory instanceof RequestAware) {
+            
((RequestAware)mailboxSessionMapperFactory).endProcessingRequest(session);
+        }
     }
 
     /**

Modified: 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java?rev=1000562&r1=1000561&r2=1000562&view=diff
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
 (original)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
 Thu Sep 23 18:14:36 2010
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.RequestAware;
 import org.apache.james.mailbox.SubscriptionException;
 import org.apache.james.mailbox.SubscriptionManager;
 import org.apache.james.mailbox.store.transaction.Mapper;
@@ -33,13 +34,13 @@ import org.apache.james.mailbox.store.us
 /**
  * Manages subscriptions.
  */
-public abstract class StoreSubscriptionManager<Id> implements 
SubscriptionManager {
+public abstract class StoreSubscriptionManager implements SubscriptionManager {
 
     private static final int INITIAL_SIZE = 32;
     
-    protected MailboxSessionMapperFactory<Id> mapperFactory;
+    protected SubscriptionMapperFactory mapperFactory;
     
-    public StoreSubscriptionManager(final MailboxSessionMapperFactory<Id> 
mapperFactory) {
+    public StoreSubscriptionManager(final SubscriptionMapperFactory 
mapperFactory) {
         this.mapperFactory = mapperFactory;
     }
 
@@ -117,7 +118,9 @@ public abstract class StoreSubscriptionM
      * @see 
org.apache.james.mailbox.SubscriptionManager#endProcessingRequest(org.apache.james.mailbox.MailboxSession)
      */
     public void endProcessingRequest(MailboxSession session) {
-        mapperFactory.endProcessingRequest(session);
+        if (mapperFactory instanceof RequestAware) {
+            ((RequestAware)mapperFactory).endProcessingRequest(session);
+        }
     }
 
     /**

Added: 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SubscriptionMapperFactory.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SubscriptionMapperFactory.java?rev=1000562&view=auto
==============================================================================
--- 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SubscriptionMapperFactory.java
 (added)
+++ 
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SubscriptionMapperFactory.java
 Thu Sep 23 18:14:36 2010
@@ -0,0 +1,34 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+package org.apache.james.mailbox.store;
+
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.store.user.SubscriptionMapper;
+
+public interface SubscriptionMapperFactory {
+
+    /**
+     * Create a {...@link SubscriptionMapper} instance or return the one which 
exists for the {...@link MailboxSession} already
+     * 
+     * @param session
+     * @return mapper
+     */
+    public SubscriptionMapper getSubscriptionMapper(MailboxSession session) 
throws SubscriptionException;
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to