You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/11/15 02:41:38 UTC
[james-project] 29/30: [Refactoring] Remove some unused methods in
mailbox-store
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 08a36f0743b7416952ed5e20d2256e980b67a16b
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Nov 13 09:21:35 2019 +0700
[Refactoring] Remove some unused methods in mailbox-store
---
.../cassandra/CassandraMailboxManagerProvider.java | 2 +-
.../cassandra/mail/CassandraMapperProvider.java | 6 -----
.../james/mailbox/jpa/mail/JPAMapperProvider.java | 6 -----
.../inmemory/InMemoryMessageManagerTestSystem.java | 28 ----------------------
.../inmemory/mail/InMemoryMapperProvider.java | 6 -----
.../manager/InMemoryIntegrationResources.java | 2 +-
.../src/main/resources/META-INF/spring/quota.xml | 1 -
.../james/mailbox/store/FakeAuthenticator.java | 4 ----
.../james/mailbox/store/StoreMessageIdManager.java | 8 -------
.../james/mailbox/store/StoreMessageManager.java | 11 ---------
.../model/MailboxIdDeserialisationException.java | 3 ---
.../mail/model/impl/SimpleMailboxMessage.java | 12 ----------
.../store/mail/model/impl/SimpleMessage.java | 6 -----
.../mailbox/store/quota/FixedMaxQuotaManager.java | 4 ----
.../james/mailbox/store/quota/QuotaComponents.java | 11 ++-------
.../store/streaming/LimitingFileInputStream.java | 13 ----------
.../apache/james/mailbox/store/MessageBuilder.java | 1 -
.../mailbox/store/MessageManagerTestSystem.java | 1 -
.../mailbox/store/SimpleMailboxMembership.java | 5 ----
.../mailbox/store/mail/model/MapperProvider.java | 2 --
.../cassandra/host/CassandraHostSystem.java | 2 +-
.../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 2 +-
22 files changed, 6 insertions(+), 130 deletions(-)
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java
index 79b703d..fbf3791 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java
@@ -86,7 +86,7 @@ public class CassandraMailboxManagerProvider {
StoreQuotaManager storeQuotaManager = new StoreQuotaManager(currentQuotaUpdater, maxQuotaManager);
QuotaRootResolver quotaRootResolver = new DefaultUserQuotaRootResolver(sessionProvider, mapperFactory);
ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaUpdater, quotaRootResolver, eventBus, storeQuotaManager);
- QuotaComponents quotaComponents = new QuotaComponents(maxQuotaManager, storeQuotaManager, quotaRootResolver, quotaUpdater);
+ QuotaComponents quotaComponents = new QuotaComponents(maxQuotaManager, storeQuotaManager, quotaRootResolver);
MessageSearchIndex index = new SimpleMessageSearchIndex(mapperFactory, mapperFactory, new DefaultTextExtractor());
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java
index a45094a..d1934fd 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java
@@ -33,7 +33,6 @@ import org.apache.james.mailbox.cassandra.ids.CassandraMessageId.Factory;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.Mailbox;
import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.store.mail.AnnotationMapper;
import org.apache.james.mailbox.store.mail.AttachmentMapper;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.MessageIdMapper;
@@ -102,11 +101,6 @@ public class CassandraMapperProvider implements MapperProvider {
}
@Override
- public AnnotationMapper createAnnotationMapper() throws MailboxException {
- return mapperFactory.getAnnotationMapper(mailboxSession);
- }
-
- @Override
public List<Capabilities> getSupportedCapabilities() {
return ImmutableList.copyOf(Capabilities.values());
}
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
index 0d4b58f..775dfc1 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
@@ -34,7 +34,6 @@ import org.apache.james.mailbox.model.Mailbox;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.mail.AnnotationMapper;
import org.apache.james.mailbox.store.mail.AttachmentMapper;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.MessageIdMapper;
@@ -76,11 +75,6 @@ public class JPAMapperProvider implements MapperProvider {
}
@Override
- public AnnotationMapper createAnnotationMapper() throws MailboxException {
- return new TransactionalAnnotationMapper(new JPAAnnotationMapper(jpaTestCluster.getEntityManagerFactory()));
- }
-
- @Override
public MailboxId generateId() {
return JPAId.of(Math.abs(ThreadLocalRandom.current().nextInt()));
}
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
index 80a704f..a6cbe0d 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMessageManagerTestSystem.java
@@ -18,18 +18,12 @@
****************************************************************/
package org.apache.james.mailbox.inmemory;
-import java.util.Optional;
-
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.Mailbox;
-import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxMetaData;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.search.MailboxQuery;
-import org.apache.james.mailbox.model.search.Wildcard;
import org.apache.james.mailbox.store.MessageManagerTestSystem;
public class InMemoryMessageManagerTestSystem extends MessageManagerTestSystem {
@@ -49,26 +43,4 @@ public class InMemoryMessageManagerTestSystem extends MessageManagerTestSystem {
MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
return new Mailbox(mailboxPath, UID_VALIDITY, messageManager.getId());
}
-
- @Override
- public void deleteMailbox(final MailboxId mailboxId, MailboxSession session) {
- try {
- Optional<MailboxMetaData> mailbox = retrieveMailbox(mailboxId, session);
- if (mailbox.isPresent()) {
- mailboxManager.deleteMailbox(mailbox.get().getPath(), session);
- }
- } catch (MailboxException e) {
- throw new RuntimeException(e);
- }
- }
-
- private Optional<MailboxMetaData> retrieveMailbox(final MailboxId mailboxId, MailboxSession mailboxSession) throws MailboxException {
- MailboxQuery userMailboxesQuery = MailboxQuery.privateMailboxesBuilder(mailboxSession)
- .expression(Wildcard.INSTANCE)
- .build();
- return mailboxManager.search(userMailboxesQuery, mailboxSession)
- .stream()
- .filter(mailboxMetaData -> mailboxMetaData.getId().equals(mailboxId))
- .findFirst();
- }
}
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
index 3162d91..765751c 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
@@ -31,7 +31,6 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.InMemoryMessageId;
import org.apache.james.mailbox.model.Mailbox;
import org.apache.james.mailbox.model.MessageId;
-import org.apache.james.mailbox.store.mail.AnnotationMapper;
import org.apache.james.mailbox.store.mail.AttachmentMapper;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.MessageIdMapper;
@@ -92,11 +91,6 @@ public class InMemoryMapperProvider implements MapperProvider {
public boolean supportPartialAttachmentFetch() {
return false;
}
-
- @Override
- public AnnotationMapper createAnnotationMapper() throws MailboxException {
- return inMemoryMailboxSessionMapperFactory.createAnnotationMapper(MAILBOX_SESSION);
- }
@Override
public MessageId generateMessageId() {
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
index 4d03fec..29c4ae3 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
@@ -303,7 +303,7 @@ public class InMemoryIntegrationResources implements IntegrationResources<StoreM
InMemoryCurrentQuotaManager currentQuotaManager = new InMemoryCurrentQuotaManager(new CurrentQuotaCalculator(mailboxSessionMapperFactory, quotaRootResolver), sessionProvider);
QuotaManager quotaManager = this.quotaManager.get().apply(new BaseQuotaComponentsStage(maxQuotaManager, currentQuotaManager));
ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, eventBus, quotaManager);
- QuotaComponents quotaComponents = new QuotaComponents(maxQuotaManager, quotaManager, quotaRootResolver, listeningCurrentQuotaUpdater);
+ QuotaComponents quotaComponents = new QuotaComponents(maxQuotaManager, quotaManager, quotaRootResolver);
MailboxManagerPreInstanciationStage preInstanciationStage = new MailboxManagerPreInstanciationStage(mailboxSessionMapperFactory, sessionProvider);
MessageSearchIndex index = searchIndexFactory.get().apply(preInstanciationStage);
diff --git a/mailbox/spring/src/main/resources/META-INF/spring/quota.xml b/mailbox/spring/src/main/resources/META-INF/spring/quota.xml
index c9e1ae7..3ac5094 100644
--- a/mailbox/spring/src/main/resources/META-INF/spring/quota.xml
+++ b/mailbox/spring/src/main/resources/META-INF/spring/quota.xml
@@ -62,7 +62,6 @@
<constructor-arg index="0" ref="maxQuotaManager"/>
<constructor-arg index="1" ref="quotaManager"/>
<constructor-arg index="2" ref="quotaRootResolver"/>
- <constructor-arg index="3" ref="quotaUpdater"/>
</bean>
</beans>
\ No newline at end of file
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
index d58fdfc..79224c5 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
@@ -37,8 +37,4 @@ public class FakeAuthenticator implements Authenticator {
public void addUser(String user, String password) {
users.put(user, password);
}
-
- public void clear() {
- users.clear();
- }
}
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
index 20a5b0f..c440924 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
@@ -20,7 +20,6 @@
package org.apache.james.mailbox.store;
import java.util.Collection;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,7 +29,6 @@ import java.util.function.Predicate;
import javax.inject.Inject;
import javax.mail.Flags;
-import javax.mail.internet.SharedInputStream;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
@@ -47,7 +45,6 @@ import org.apache.james.mailbox.model.DeleteResult;
import org.apache.james.mailbox.model.Mailbox;
import org.apache.james.mailbox.model.MailboxACL.Right;
import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MessageAttachment;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.MessageMetaData;
import org.apache.james.mailbox.model.MessageMoves;
@@ -64,7 +61,6 @@ import org.apache.james.mailbox.store.mail.model.FlagsFactory;
import org.apache.james.mailbox.store.mail.model.FlagsFilter;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.apache.james.mailbox.store.quota.QuotaChecker;
import org.slf4j.Logger;
@@ -320,10 +316,6 @@ public class StoreMessageIdManager implements MessageIdManager {
.block();
}
}
-
- protected MailboxMessage createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder, List<MessageAttachment> attachments, MailboxId mailboxId) {
- return new SimpleMailboxMessage(messageIdFactory.generate(), internalDate, size, bodyStartOctet, content, flags, propertyBuilder, mailboxId, attachments);
- }
private void dispatchFlagsChange(MailboxSession mailboxSession, MailboxId mailboxId, UpdatedFlags updatedFlags) throws MailboxException {
if (updatedFlags.flagsChanged()) {
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index e52b2b7..e46ebce 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -185,17 +185,6 @@ public class StoreMessageManager implements MessageManager {
this.preDeletionHooks = preDeletionHooks;
}
- protected Factory getMessageIdFactory() {
- return messageIdFactory;
- }
-
- /**
- * Return the {@link MailboxPathLocker}
- */
- protected MailboxPathLocker getLocker() {
- return locker;
- }
-
/**
* Return the underlying {@link Mailbox}
*/
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserialisationException.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserialisationException.java
index 8deea45..556011b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserialisationException.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserialisationException.java
@@ -23,9 +23,6 @@ import org.apache.james.mailbox.exception.MailboxException;
public class MailboxIdDeserialisationException extends MailboxException {
- public MailboxIdDeserialisationException() {
- }
-
public MailboxIdDeserialisationException(String message) {
super(message);
}
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
index 34b3b5c..4adfb49 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
@@ -38,8 +38,6 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MessageAttachment;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.store.mail.model.DelegatingMailboxMessage;
-import org.apache.james.mailbox.store.mail.model.FlagsFactory;
-import org.apache.james.mailbox.store.mail.model.FlagsFilter;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import com.google.common.base.MoreObjects;
@@ -297,16 +295,6 @@ public class SimpleMailboxMessage extends DelegatingMailboxMessage {
userFlags = flags.getUserFlags();
}
- public SimpleMailboxMessage filterFlags(FlagsFilter filter) throws MailboxException {
- Flags flags = FlagsFactory
- .builder()
- .flags(createFlags())
- .addUserFlags(createUserFlags())
- .filteringFlags(filter)
- .build();
- return from(this).flags(flags).build();
- }
-
@Override
public int hashCode() {
return Objects.hashCode(uid);
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
index 4141cdc..69d3d85 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
@@ -30,8 +30,6 @@ import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.mail.model.Property;
-import com.google.common.collect.ImmutableList;
-
public class SimpleMessage implements Message {
private final MessageId messageId;
@@ -58,10 +56,6 @@ public class SimpleMessage implements Message {
this.attachments = attachments;
}
- public SimpleMessage(MessageId messageId, SharedInputStream content, long size, Date internalDate, String subType, String mediaType, int bodyStartOctet, Long textualLineCount, List<Property> properties) {
- this(messageId, content, size, internalDate, subType, mediaType, bodyStartOctet, textualLineCount, properties, ImmutableList.<MessageAttachment>of());
- }
-
@Override
public MessageId getMessageId() {
return messageId;
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java
index 0cab231..63847a9 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/FixedMaxQuotaManager.java
@@ -108,10 +108,6 @@ public class FixedMaxQuotaManager implements MaxQuotaManager {
return Optional.empty();
}
- public Optional<QuotaCount> getMaxMessage() {
- return Optional.empty();
- }
-
@Override
public void removeDomainMaxMessage(Domain domain) throws UnsupportedOperationException {
throw new UnsupportedOperationException("Can not modify domain specific upper limit for FixedMaxQuotaManager");
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaComponents.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaComponents.java
index 340b153..4d39c30 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaComponents.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaComponents.java
@@ -32,21 +32,18 @@ public class QuotaComponents {
return new QuotaComponents(
new NoMaxQuotaManager(),
new NoQuotaManager(),
- new DefaultUserQuotaRootResolver(sessionProvider, mailboxSessionMapperFactory),
- new NoQuotaUpdater());
+ new DefaultUserQuotaRootResolver(sessionProvider, mailboxSessionMapperFactory));
}
private final MaxQuotaManager maxQuotaManager;
private final QuotaManager quotaManager;
private final QuotaRootResolver quotaRootResolver;
- private final QuotaUpdater quotaUpdater;
@Inject
- public QuotaComponents(MaxQuotaManager maxQuotaManager, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, QuotaUpdater quotaUpdater) {
+ public QuotaComponents(MaxQuotaManager maxQuotaManager, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver) {
this.maxQuotaManager = maxQuotaManager;
this.quotaManager = quotaManager;
this.quotaRootResolver = quotaRootResolver;
- this.quotaUpdater = quotaUpdater;
}
public MaxQuotaManager getMaxQuotaManager() {
@@ -60,8 +57,4 @@ public class QuotaComponents {
public QuotaRootResolver getQuotaRootResolver() {
return quotaRootResolver;
}
-
- public QuotaUpdater getQuotaUpdater() {
- return quotaUpdater;
- }
}
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java
index ff2243e..1c7b738 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java
@@ -19,7 +19,6 @@
package org.apache.james.mailbox.store.streaming;
import java.io.File;
-import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -39,18 +38,6 @@ public class LimitingFileInputStream extends FileInputStream {
this.limit = limit;
}
- public LimitingFileInputStream(FileDescriptor fdObj, long limit) {
- super(fdObj);
- this.limit = limit;
-
- }
-
- public LimitingFileInputStream(String name, long limit) throws FileNotFoundException {
- super(name);
- this.limit = limit;
-
- }
-
@Override
public int read() throws IOException {
if (pos >= limit) {
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java
index 9476326..3d45777 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java
@@ -39,7 +39,6 @@ public class MessageBuilder {
public Flags flags = new Flags();
public byte[] body = {};
public final Map<String, String> headers = new HashMap<>();
- public int lineNumber = 0;
public MailboxMessage build() throws Exception {
return build(new DefaultMessageId());
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageManagerTestSystem.java
index d8cb9a2..5b655ec 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageManagerTestSystem.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageManagerTestSystem.java
@@ -40,5 +40,4 @@ public abstract class MessageManagerTestSystem {
public abstract Mailbox createMailbox(MailboxPath mailboxPath, MailboxSession session) throws MailboxException;
- public abstract void deleteMailbox(MailboxId mailboxId, MailboxSession session);
}
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
index 322f87a..a0118ee 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
@@ -27,7 +27,6 @@ import java.io.SequenceInputStream;
import java.io.Writer;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -136,10 +135,6 @@ public class SimpleMailboxMembership implements MailboxMessage {
return seen;
}
- public void unsetRecent() {
- recent = false;
- }
-
@Override
public long getHeaderOctets() {
return size - body.length;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java
index 6e2ab1b..6e5c670 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java
@@ -55,8 +55,6 @@ public interface MapperProvider {
AttachmentMapper createAttachmentMapper() throws MailboxException;
- AnnotationMapper createAnnotationMapper() throws MailboxException;
-
MailboxId generateId();
MessageUid generateMessageUid();
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
index 993f7ed..bee7d68 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
@@ -107,7 +107,7 @@ public class CassandraHostSystem extends JamesImapHostSystem {
CassandraCurrentQuotaManager currentQuotaManager = new CassandraCurrentQuotaManager(session);
StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, perUserMaxQuotaManager);
ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, eventBus, quotaManager);
- QuotaComponents quotaComponents = new QuotaComponents(perUserMaxQuotaManager, quotaManager, quotaRootResolver, quotaUpdater);
+ QuotaComponents quotaComponents = new QuotaComponents(perUserMaxQuotaManager, quotaManager, quotaRootResolver);
MessageSearchIndex index = new SimpleMessageSearchIndex(mapperFactory, mapperFactory, new DefaultTextExtractor());
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
index 2f4b58b..80541b4 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
@@ -112,7 +112,7 @@ public class JPAHostSystem extends JamesImapHostSystem {
maxQuotaManager = new JPAPerUserMaxQuotaManager(new JPAPerUserMaxQuotaDAO(entityManagerFactory));
StoreQuotaManager storeQuotaManager = new StoreQuotaManager(currentQuotaManager, maxQuotaManager);
ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver, eventBus, storeQuotaManager);
- QuotaComponents quotaComponents = new QuotaComponents(maxQuotaManager, storeQuotaManager, quotaRootResolver, quotaUpdater);
+ QuotaComponents quotaComponents = new QuotaComponents(maxQuotaManager, storeQuotaManager, quotaRootResolver);
MessageSearchIndex index = new SimpleMessageSearchIndex(mapperFactory, mapperFactory, new DefaultTextExtractor());
mailboxManager = new OpenJPAMailboxManager(mapperFactory, sessionProvider, messageParser, new DefaultMessageId.Factory(),
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org