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 ro...@apache.org on 2018/01/10 10:14:40 UTC
[40/53] [abbrv] james-project git commit: JAMES-2277 respect naming
conventions
JAMES-2277 respect naming conventions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/52c18ef6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/52c18ef6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/52c18ef6
Branch: refs/heads/master
Commit: 52c18ef6f6c9be9d0de58fb2ef5547959caa10aa
Parents: 6de8823
Author: Matthieu Baechler <ma...@apache.org>
Authored: Tue Dec 26 19:02:07 2017 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Jan 10 10:45:40 2018 +0100
----------------------------------------------------------------------
.../migration/CassandraMigrationService.java | 10 +-
.../caching/CacheLoaderFromUnderlying.java | 4 +-
.../caching/guava/GuavaCacheWrapper.java | 18 +-
.../guava/GuavaMailboxMetadataCache.java | 4 +-
.../AttachmentMessageIdCreationTest.java | 4 +-
.../apache/james/mailbox/hbase/HBaseUtils.java | 6 +-
.../james/mailbox/hbase/HBaseUtilsTest.java | 6 +-
.../mailbox/jpa/mail/JPAMapperProvider.java | 14 +-
.../mailbox/kafka/KafkaMessageConsumer.java | 10 +-
.../james/mailbox/kafka/KafkaPublisher.java | 12 +-
.../model/impl/SimpleMailboxMessageTest.java | 22 +-
.../registrations/MailboxRegistrationTest.java | 6 +-
.../apache/james/ai/classic/SqlResources.java | 26 +-
.../mail/MessageDispositionNotification.java | 140 +++
.../mailet/base/mail/MultipartReport.java | 77 ++
.../mail/message_disposition_notification.java | 140 ---
.../mailet/base/mail/multipart_report.java | 77 --
.../HasMailAttributeWithValueRegex.java | 6 +-
.../james/transport/matchers/NESSpamCheck.java | 4 +-
.../MailAttributesToMimeHeadersTest.java | 12 +-
.../matchers/AbstractHasMailAttributeTest.java | 4 +-
.../james/transport/matchers/SenderIsTest.java | 2 +-
.../james/mpt/api/ProtocolInteractor.java | 14 +-
.../apache/james/mpt/helper/CreateScript.java | 2 +-
.../apache/james/mpt/helper/ScriptBuilder.java | 6 +-
.../protocol/FileProtocolSessionBuilder.java | 22 +-
.../james/mpt/protocol/ProtocolSession.java | 22 +-
.../mpt/protocol/ProtocolSessionBuilder.java | 8 +-
.../GenericSimpleScriptedTestProtocol.java | 14 +-
.../mpt/TestFileProtocolSessionBuilder.java | 10 +-
.../suite/base/BasicImapCommands.java | 28 +-
.../imapmailbox/cyrus/host/CyrusHostSystem.java | 14 +-
.../cyrus/host/GrantRightsOnCyrusHost.java | 4 +-
.../host/MailboxMessageAppenderOnCyrusHost.java | 30 +-
.../api/handler/CommandDispatcher.java | 26 +-
.../protocols/api/handler/CommandHandler.java | 4 +-
.../protocols/api/handler/ConnectHandler.java | 4 +-
.../protocols/api/handler/LineHandler.java | 4 +-
.../apache/james/imap/api/message/IdRange.java | 42 +-
.../imap/decode/ImapRequestLineReader.java | 6 +-
.../imap/decode/parser/ImapParserFactory.java | 90 +-
.../imap/decode/parser/ListCommandParser.java | 4 +-
.../imap/decode/parser/SearchCommandParser.java | 4 +-
.../message/response/StatusResponseTest.java | 2 +-
.../processor/GetAnnotationProcessorTest.java | 24 +-
.../processor/SetAnnotationProcessorTest.java | 14 +-
.../smtp/core/AbstractHookableCmdHandler.java | 16 +-
.../smtp/core/esmtp/AuthCmdHandler.java | 4 +-
.../james/util/retry/DoublingRetrySchedule.java | 22 +-
.../james/util/retry/ExceptionRetryHandler.java | 29 +-
.../util/retry/naming/RetryingContext.java | 80 +-
.../org/apache/james/util/sql/SqlResources.java | 26 +-
.../util/retry/ExceptionRetryHandlerTest.java | 24 +-
.../naming/NamingExceptionRetryHandlerTest.java | 18 +-
.../mailrepository/jdbc/JDBCMailRepository.java | 14 +-
.../user/jdbc/AbstractJdbcUsersRepository.java | 66 +-
.../james/user/ldap/ReadOnlyLDAPUser.java | 18 +-
.../repository/file/AbstractFileRepository.java | 48 +-
.../file/ClassLoaderObjectInputStream.java | 6 +-
.../repository/file/ExtensionFileFilter.java | 8 +-
.../rrt/lib/RecipientRewriteTableUtil.java | 10 +-
.../domainlist/lib/AbstractDomainListTest.java | 18 +-
.../mock/MockMailRepositoryStore.java | 8 +-
.../user/lib/UsersRepositoryManagementTest.java | 66 +-
.../user/lib/mock/InMemoryUsersRepository.java | 34 +-
.../dnsservice/dnsjava/DNSJavaService.java | 6 +-
.../crypto/SMIMESignIntegrationTest.java | 2 +-
.../james/transport/mailets/RemoteDelivery.java | 20 +-
.../transport/mailets/jsieve/RejectAction.java | 24 +-
...ddressesArrayToMailAddressListConverter.java | 60 ++
.../mailets/remote/delivery/Bouncer.java | 146 +++
.../mailets/remote/delivery/Converter7Bit.java | 65 ++
.../mailets/remote/delivery/Delay.java | 112 +++
.../remote/delivery/DelaysAndMaxRetry.java | 160 ++++
.../remote/delivery/DeliveryRetriesHelper.java | 50 +
.../remote/delivery/DeliveryRunnable.java | 181 ++++
.../mailets/remote/delivery/DnsHelper.java | 49 +
.../delivery/EnhancedMessagingException.java | 167 ++++
.../remote/delivery/ExecutionResult.java | 93 ++
.../remote/delivery/HeloNameProvider.java | 53 ++
.../delivery/InternetAddressConverter.java | 39 +
.../mailets/remote/delivery/MailDelivrer.java | 273 ++++++
.../remote/delivery/MailDelivrerToHost.java | 136 +++
.../remote/delivery/MessageComposer.java | 141 +++
.../delivery/RemoteDeliveryConfiguration.java | 320 +++++++
.../delivery/RemoteDeliverySocketFactory.java | 138 +++
.../mailets/remote/delivery/Repeat.java | 38 +
...ddressesArrayToMailAddressListConverter.java | 60 --
.../mailets/remoteDelivery/Bouncer.java | 146 ---
.../mailets/remoteDelivery/Converter7Bit.java | 65 --
.../transport/mailets/remoteDelivery/Delay.java | 112 ---
.../remoteDelivery/DelaysAndMaxRetry.java | 160 ----
.../remoteDelivery/DeliveryRetriesHelper.java | 50 -
.../remoteDelivery/DeliveryRunnable.java | 181 ----
.../mailets/remoteDelivery/DnsHelper.java | 49 -
.../EnhancedMessagingException.java | 167 ----
.../mailets/remoteDelivery/ExecutionResult.java | 93 --
.../remoteDelivery/HeloNameProvider.java | 53 --
.../InternetAddressConverter.java | 39 -
.../mailets/remoteDelivery/MailDelivrer.java | 273 ------
.../remoteDelivery/MailDelivrerToHost.java | 136 ---
.../mailets/remoteDelivery/MessageComposer.java | 141 ---
.../RemoteDeliveryConfiguration.java | 320 -------
.../RemoteDeliverySocketFactory.java | 138 ---
.../mailets/remoteDelivery/Repeat.java | 38 -
...ssesArrayToMailAddressListConverterTest.java | 67 ++
.../mailets/remote/delivery/BouncerTest.java | 456 +++++++++
.../mailets/remote/delivery/DelayTest.java | 124 +++
.../remote/delivery/DelaysAndMaxRetryTest.java | 145 +++
.../delivery/DeliveryRetryHelperTest.java | 84 ++
.../remote/delivery/DeliveryRunnableTest.java | 251 +++++
.../remote/delivery/HeloNameProviderTest.java | 80 ++
.../delivery/InternetAddressConverterTest.java | 63 ++
.../remote/delivery/MailDelivrerTest.java | 446 +++++++++
.../RemoteDeliveryConfigurationTest.java | 940 +++++++++++++++++++
.../delivery/RemoteDeliveryRunningTest.java | 80 ++
.../remote/delivery/RemoteDeliveryTest.java | 207 ++++
.../mailets/remote/delivery/RepeatTest.java | 56 ++
...ssesArrayToMailAddressListConverterTest.java | 66 --
.../mailets/remoteDelivery/BouncerTest.java | 454 ---------
.../mailets/remoteDelivery/DelayTest.java | 123 ---
.../remoteDelivery/DelaysAndMaxRetryTest.java | 143 ---
.../remoteDelivery/DeliveryRetryHelperTest.java | 83 --
.../remoteDelivery/DeliveryRunnableTest.java | 245 -----
.../remoteDelivery/HeloNameProviderTest.java | 79 --
.../InternetAddressConverterTest.java | 62 --
.../remoteDelivery/MailDelivrerTest.java | 446 ---------
.../RemoteDeliveryConfigurationTest.java | 940 -------------------
.../RemoteDeliveryRunningTest.java | 80 --
.../remoteDelivery/RemoteDeliveryTest.java | 207 ----
.../mailets/remoteDelivery/RepeatTest.java | 56 --
.../utils/SortingHierarchicalCollections.java | 14 +-
.../jmap/model/UpdateMessagePatchTest.java | 2 +-
.../james/jmap/model/mailbox/SortOrderTest.java | 14 +-
.../james/imapserver/netty/IMAPServer.java | 4 +-
.../james/lmtpserver/CoreCmdHandlerLoader.java | 66 +-
.../apache/james/pop3server/POP3ServerTest.java | 36 +-
.../james/smtpserver/CoreCmdHandlerLoader.java | 89 +-
.../james/smtpserver/SMTPTestConfiguration.java | 122 +--
.../smtpserver/SetMimeHeaderHandlerTest.java | 5 +-
.../service/CassandraMigrationService.java | 0
.../james/webadmin/WebAdminConfiguration.java | 4 +-
.../james/webadmin/utils/JsonExtractor.java | 8 +-
.../webadmin/WebAdminConfigurationTest.java | 8 +-
144 files changed, 6170 insertions(+), 6196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java
index 7ff0775..d6eeaa8 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/CassandraMigrationService.java
@@ -39,7 +39,7 @@ public class CassandraMigrationService {
private final CassandraSchemaVersionDAO schemaVersionDAO;
private final SchemaVersion latestVersion;
private final Map<SchemaVersion, Migration> allMigrationClazz;
- private final Logger LOG = LoggerFactory.getLogger(CassandraMigrationService.class);
+ private final Logger logger = LoggerFactory.getLogger(CassandraMigrationService.class);
@Inject
public CassandraMigrationService(CassandraSchemaVersionDAO schemaVersionDAO, Map<SchemaVersion, Migration> allMigrationClazz, @Named(LATEST_VERSION) SchemaVersion latestVersion) {
@@ -71,7 +71,7 @@ public class CassandraMigrationService {
private SchemaVersion validateVersionNumber(SchemaVersion versionNumber) {
if (!allMigrationClazz.containsKey(versionNumber)) {
String message = String.format("Can not migrate to %d. No migration class registered.", versionNumber.getValue());
- LOG.error(message);
+ logger.error(message);
throw new NotImplementedException(message);
}
return versionNumber;
@@ -89,11 +89,11 @@ public class CassandraMigrationService {
return Migration.Result.COMPLETED;
}
- LOG.info("Migrating to version {} ", newVersion);
+ logger.info("Migrating to version {} ", newVersion);
return allMigrationClazz.get(version).run()
.onComplete(() -> schemaVersionDAO.updateVersion(newVersion),
- () -> LOG.info("Migrating to version {} done", newVersion))
- .onFailure(() -> LOG.warn(failureMessage(newVersion)),
+ () -> logger.info("Migrating to version {} done", newVersion))
+ .onFailure(() -> logger.warn(failureMessage(newVersion)),
() -> throwMigrationException(newVersion));
};
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheLoaderFromUnderlying.java
----------------------------------------------------------------------
diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheLoaderFromUnderlying.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheLoaderFromUnderlying.java
index 63cd0a6..9322ed5 100644
--- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheLoaderFromUnderlying.java
+++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheLoaderFromUnderlying.java
@@ -1,5 +1,5 @@
package org.apache.james.mailbox.caching;
-public interface CacheLoaderFromUnderlying<Key, Value, Underlying, Except extends Throwable> {
- Value load(Key key, Underlying underlying) throws Except;
+public interface CacheLoaderFromUnderlying<KeyT, ValueT, UnderlyingT, ExceptT extends Throwable> {
+ ValueT load(KeyT key, UnderlyingT underlying) throws ExceptT;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java
----------------------------------------------------------------------
diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java
index 4390b2e..1eeaab8 100644
--- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java
+++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaCacheWrapper.java
@@ -4,19 +4,19 @@ import org.apache.james.mailbox.caching.CacheLoaderFromUnderlying;
import com.google.common.cache.Cache;
-public abstract class GuavaCacheWrapper<Key, Value, Underlying, KeyRepresentation, Except extends Throwable>
- implements CacheLoaderFromUnderlying<Key, Value, Underlying, Except> {
+public abstract class GuavaCacheWrapper<KeyT, ValueT, UnderlyingT, KeyRepresentationT, ExceptT extends Throwable>
+ implements CacheLoaderFromUnderlying<KeyT, ValueT, UnderlyingT, ExceptT> {
- private final Cache<KeyRepresentation, Value> cache;
-// private final CacheLoaderFromUnderlying<Key, Value, Underlying, Except> loader;
+ private final Cache<KeyRepresentationT, ValueT> cache;
+// private final CacheLoaderFromUnderlying<Key, Value, Underlying, Except> loader;
- public GuavaCacheWrapper(Cache<KeyRepresentation, Value> cache/*, CacheLoaderFromUnderlying<Key, Value, Underlying, Except> loader*/) {
+ public GuavaCacheWrapper(Cache<KeyRepresentationT, ValueT> cache/*, CacheLoaderFromUnderlying<Key, Value, Underlying, Except> loader*/) {
this.cache = cache;
// this.loader = loader;
}
- public Value get(Key key, Underlying underlying) throws Except {
- Value value = cache.getIfPresent(getKeyRepresentation(key));
+ public ValueT get(KeyT key, UnderlyingT underlying) throws ExceptT {
+ ValueT value = cache.getIfPresent(getKeyRepresentation(key));
if (value != null) {
return value;
} else {
@@ -29,12 +29,12 @@ public abstract class GuavaCacheWrapper<Key, Value, Underlying, KeyRepresentatio
}
- public void invalidate(Key key) {
+ public void invalidate(KeyT key) {
if (key != null) { //needed?
cache.invalidate(getKeyRepresentation(key));
}
}
- public abstract KeyRepresentation getKeyRepresentation(Key key);
+ public abstract KeyRepresentationT getKeyRepresentation(KeyT key);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java
----------------------------------------------------------------------
diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java
index 412f540..a69d694 100644
--- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java
+++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java
@@ -69,9 +69,9 @@ public class GuavaMailboxMetadataCache extends AbstractGuavaCache implements Mai
}
- abstract class MetadataCacheWrapper<Value> extends GuavaCacheWrapper<Mailbox, Value, MessageMapper, MailboxId, MailboxException> {
+ abstract class MetadataCacheWrapper<ValueT> extends GuavaCacheWrapper<Mailbox, ValueT, MessageMapper, MailboxId, MailboxException> {
- public MetadataCacheWrapper(Cache<MailboxId, Value> cache) {
+ public MetadataCacheWrapper(Cache<MailboxId, ValueT> cache) {
super(cache);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java
index b4ec37e..da4c0bf 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java
@@ -170,14 +170,14 @@ public class AttachmentMessageIdCreationTest {
MessageUid messageUid = MessageUid.of(1);
CassandraId mailboxId = CassandraId.timeBased();
String content = "Subject: Any subject \n\nThis is the body\n.\n";
- int BODY_START = 22;
+ int bodyStart = 22;
return SimpleMailboxMessage.builder()
.messageId(messageId)
.mailboxId(mailboxId)
.uid(messageUid)
.internalDate(new Date())
- .bodyStartOctet(BODY_START)
+ .bodyStartOctet(bodyStart)
.size(content.length())
.content(new SharedByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)))
.flags(new Flags())
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
index d096798..9c24b92 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
@@ -101,7 +101,7 @@ public class HBaseUtils {
Bytes.toString(rawMailbox.get(MAILBOX_NAME)));
HBaseMailbox mailbox = new HBaseMailbox(path, Bytes.toLong(rawMailbox.get(MAILBOX_UIDVALIDITY)));
- mailbox.setMailboxId(HBaseIdFromRowKey(result.getRow()));
+ mailbox.setMailboxId(hBaseIdFromRowKey(result.getRow()));
mailbox.setHighestModSeq(Bytes.toLong(rawMailbox.get(MAILBOX_HIGHEST_MODSEQ)));
mailbox.setLastUid(Bytes.toLong(rawMailbox.get(MAILBOX_LASTUID)));
mailbox.setMessageCount(Bytes.toLong(rawMailbox.get(MAILBOX_MESSAGE_COUNT)));
@@ -113,7 +113,7 @@ public class HBaseUtils {
* @param rowkey
* @return UUID calculated from the byte array
*/
- public static HBaseId HBaseIdFromRowKey(byte[] rowkey) {
+ public static HBaseId hBaseIdFromRowKey(byte[] rowkey) {
return HBaseId.of(new UUID(Bytes.toLong(rowkey, 0), Bytes.toLong(rowkey, 8)));
}
@@ -320,7 +320,7 @@ public class HBaseUtils {
}
i++;
}
- HBaseId uuid = HBaseIdFromRowKey(result.getRow());
+ HBaseId uuid = hBaseIdFromRowKey(result.getRow());
uid = MessageUid.of(Long.MAX_VALUE - Bytes.toLong(result.getRow(), 16));
PropertyBuilder props = new PropertyBuilder(propList);
props.setMediaType(mediaType);
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
index 40458d6..cab2d61 100644
--- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
+++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
@@ -37,8 +37,8 @@ import static org.apache.james.mailbox.hbase.HBaseNames.MARKER_MISSING;
import static org.apache.james.mailbox.hbase.HBaseNames.MARKER_PRESENT;
import static org.apache.james.mailbox.hbase.HBaseNames.MESSAGES_META_CF;
import static org.apache.james.mailbox.hbase.HBaseNames.SUBSCRIPTION_CF;
-import static org.apache.james.mailbox.hbase.HBaseUtils.HBaseIdFromRowKey;
import static org.apache.james.mailbox.hbase.HBaseUtils.flagsToPut;
+import static org.apache.james.mailbox.hbase.HBaseUtils.hBaseIdFromRowKey;
import static org.apache.james.mailbox.hbase.HBaseUtils.toPut;
import static org.apache.james.mailbox.hbase.PropertyConvertor.getProperty;
import static org.apache.james.mailbox.hbase.PropertyConvertor.getValue;
@@ -82,10 +82,10 @@ public class HBaseUtilsTest {
byte[] result = mailbox.getMailboxId().toBytes();
assertArrayEquals(expResult, result);
- HBaseId newUUID = HBaseIdFromRowKey(result);
+ HBaseId newUUID = hBaseIdFromRowKey(result);
assertEquals(uuid, newUUID);
- newUUID = HBaseIdFromRowKey(expResult);
+ newUUID = hBaseIdFromRowKey(expResult);
assertEquals(uuid, newUUID);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
----------------------------------------------------------------------
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 19ce386..dca5583 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
@@ -47,20 +47,20 @@ import com.google.common.collect.ImmutableList;
public class JPAMapperProvider implements MapperProvider {
- private final JpaTestCluster JPA_TEST_CLUSTER;
+ private final JpaTestCluster jpaTestCluster;
- public JPAMapperProvider(JpaTestCluster JPA_TEST_CLUSTER) {
- this.JPA_TEST_CLUSTER = JPA_TEST_CLUSTER;
+ public JPAMapperProvider(JpaTestCluster jpaTestCluster) {
+ this.jpaTestCluster = jpaTestCluster;
}
@Override
public MailboxMapper createMailboxMapper() throws MailboxException {
- return new TransactionalMailboxMapper(new JPAMailboxMapper(JPA_TEST_CLUSTER.getEntityManagerFactory()));
+ return new TransactionalMailboxMapper(new JPAMailboxMapper(jpaTestCluster.getEntityManagerFactory()));
}
@Override
public MessageMapper createMessageMapper() throws MailboxException {
- EntityManagerFactory entityManagerFactory = JPA_TEST_CLUSTER.getEntityManagerFactory();
+ EntityManagerFactory entityManagerFactory = jpaTestCluster.getEntityManagerFactory();
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
JPAMessageMapper messageMapper = new JPAMessageMapper(new MockMailboxSession("benwa"),
@@ -78,7 +78,7 @@ public class JPAMapperProvider implements MapperProvider {
@Override
public AnnotationMapper createAnnotationMapper() throws MailboxException {
- return new TransactionalAnnotationMapper(new JPAAnnotationMapper(JPA_TEST_CLUSTER.getEntityManagerFactory()));
+ return new TransactionalAnnotationMapper(new JPAAnnotationMapper(jpaTestCluster.getEntityManagerFactory()));
}
@Override
@@ -93,7 +93,7 @@ public class JPAMapperProvider implements MapperProvider {
@Override
public void clearMapper() throws MailboxException {
- JPA_TEST_CLUSTER.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES);
+ jpaTestCluster.clear(JPAMailboxFixture.MAILBOX_TABLE_NAMES);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
----------------------------------------------------------------------
diff --git a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
index 4c8bf83..e2e42c3 100644
--- a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
+++ b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
@@ -44,15 +44,15 @@ public class KafkaMessageConsumer implements MessageConsumer {
private class Consumer implements Runnable {
- private final KafkaStream<byte[], byte[]> m_stream;
+ private final KafkaStream<byte[], byte[]> stream;
- public Consumer(KafkaStream<byte[], byte[]> a_stream) {
- m_stream = a_stream;
+ public Consumer(KafkaStream<byte[], byte[]> stream) {
+ this.stream = stream;
}
public void run() {
- for (MessageAndMetadata<byte[], byte[]> aM_stream : m_stream) {
- messageReceiver.receiveSerializedEvent(aM_stream.message());
+ for (MessageAndMetadata<byte[], byte[]> message : stream) {
+ messageReceiver.receiveSerializedEvent(message.message());
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java
----------------------------------------------------------------------
diff --git a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java
index 4363e12..f304705 100644
--- a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java
+++ b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java
@@ -38,13 +38,13 @@ public class KafkaPublisher implements Publisher {
private static final Logger LOG = LoggerFactory.getLogger(KafkaPublisher.class);
private Producer<String, byte[]> producer;
- private final int kafka_port;
- private final String kafka_ip;
+ private final int kafkaPort;
+ private final String kafkaIp;
private boolean producerLaunched;
- public KafkaPublisher(String kafkaHostIpString, int kafka_port) {
- this.kafka_ip = kafkaHostIpString;
- this.kafka_port = kafka_port;
+ public KafkaPublisher(String kafkaHostIpString, int kafkaPort) {
+ this.kafkaIp = kafkaHostIpString;
+ this.kafkaPort = kafkaPort;
producerLaunched = false;
}
@@ -53,7 +53,7 @@ public class KafkaPublisher implements Publisher {
public void init() {
if (!producerLaunched) {
Properties props = new Properties();
- props.put("metadata.broker.list", kafka_ip + ":" + kafka_port);
+ props.put("metadata.broker.list", kafkaIp + ":" + kafkaPort);
props.put("serializer.class", "kafka.serializer.DefaultEncoder");
props.put("request.required.acks", "1");
ProducerConfig config = new ProducerConfig(props);
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java
index 251b2f7..15b8c88 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessageTest.java
@@ -56,8 +56,8 @@ public class SimpleMailboxMessageTest {
public static final int BODY_START_OCTET = 0;
public static final MessageId MESSAGE_ID = new TestMessageId.Factory().generate();
public static final int SIZE = 1000;
- private SimpleMailboxMessage MESSAGE;
- private SimpleMailboxMessage MESSAGE_SPECIAL_CHAR;
+ private SimpleMailboxMessage message;
+ private SimpleMailboxMessage messageSpecialChar;
@Rule
public ExpectedException expectedException = ExpectedException.none();
@@ -67,19 +67,19 @@ public class SimpleMailboxMessageTest {
@Before
public void setUp() {
- MESSAGE = buildMessage(MESSAGE_CONTENT);
- MESSAGE_SPECIAL_CHAR = buildMessage(MESSAGE_CONTENT_SPECIAL_CHAR);
+ this.message = buildMessage(MESSAGE_CONTENT);
+ this.messageSpecialChar = buildMessage(MESSAGE_CONTENT_SPECIAL_CHAR);
}
@Test
public void testSize() {
- assertThat(MESSAGE.getFullContentOctets()).isEqualTo(MESSAGE_CONTENT.length());
+ assertThat(message.getFullContentOctets()).isEqualTo(MESSAGE_CONTENT.length());
}
@Test
public void testInputStreamSize() throws IOException {
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
- byteArrayOutputStream.write(MESSAGE.getFullContent());
+ byteArrayOutputStream.write(message.getFullContent());
assertThat(byteArrayOutputStream.size()).isEqualTo(MESSAGE_CONTENT.getBytes(MESSAGE_CHARSET).length);
}
}
@@ -87,21 +87,21 @@ public class SimpleMailboxMessageTest {
@Test
public void testInputStreamSizeSpecialCharacters() throws IOException {
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
- byteArrayOutputStream.write(MESSAGE_SPECIAL_CHAR.getFullContent());
+ byteArrayOutputStream.write(messageSpecialChar.getFullContent());
assertThat(byteArrayOutputStream.size()).isEqualTo(MESSAGE_CONTENT_SPECIAL_CHAR.getBytes(MESSAGE_CHARSET).length);
}
}
@Test
public void testFullContent() throws IOException {
- assertThat(new String(IOUtils.toByteArray(MESSAGE.getFullContent()), MESSAGE_CHARSET)).isEqualTo(MESSAGE_CONTENT);
- assertThat(new String(IOUtils.toByteArray(MESSAGE_SPECIAL_CHAR.getFullContent()), MESSAGE_CHARSET)).isEqualTo(MESSAGE_CONTENT_SPECIAL_CHAR);
+ assertThat(new String(IOUtils.toByteArray(message.getFullContent()), MESSAGE_CHARSET)).isEqualTo(MESSAGE_CONTENT);
+ assertThat(new String(IOUtils.toByteArray(messageSpecialChar.getFullContent()), MESSAGE_CHARSET)).isEqualTo(MESSAGE_CONTENT_SPECIAL_CHAR);
}
@Test
public void simpleMessageShouldReturnTheSameUserFlagsThatThoseProvided() {
- MESSAGE.setFlags(new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("mozzarela", "parmesan", "coppa", "limonchello").build());
- assertThat(MESSAGE.createUserFlags()).containsOnly("mozzarela", "parmesan", "coppa", "limonchello");
+ message.setFlags(new FlagsBuilder().add(Flags.Flag.DELETED, Flags.Flag.SEEN).add("mozzarela", "parmesan", "coppa", "limonchello").build());
+ assertThat(message.createUserFlags()).containsOnly("mozzarela", "parmesan", "coppa", "limonchello");
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java
index 3829c3d..3d8c240 100644
--- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java
+++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java
@@ -72,7 +72,7 @@ public class MailboxRegistrationTest {
@Test
- public void AddedEventsShouldNotBeReported() {
+ public void addedEventsShouldNotBeReported() {
TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>();
treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId()));
MailboxListener.Event event = eventFactory.added(session, treeMap, MAILBOX, ImmutableMap.<MessageUid, MailboxMessage>of());
@@ -81,7 +81,7 @@ public class MailboxRegistrationTest {
}
@Test
- public void ExpungedEventsShouldBeReported() {
+ public void expungedEventsShouldBeReported() {
TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>();
treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId()));
MailboxListener.Event event = eventFactory.expunged(session, treeMap, MAILBOX);
@@ -90,7 +90,7 @@ public class MailboxRegistrationTest {
}
@Test
- public void FlagsEventsShouldBeReported() {
+ public void flagsEventsShouldBeReported() {
MailboxListener.Event event = eventFactory.flagsUpdated(session,
Lists.newArrayList(UID),
MAILBOX,
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java
----------------------------------------------------------------------
diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java
index d50e4fc..d227ad4 100644
--- a/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java
+++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java
@@ -46,10 +46,10 @@ import org.w3c.dom.NodeList;
*/
class SqlResources {
/** A map of statement types to SQL statements */
- private final Map<String, String> m_sql = new HashMap<>();
+ private final Map<String, String> sql = new HashMap<>();
/** A map of engine specific options */
- private final Map<String, String> m_dbOptions = new HashMap<>();
+ private final Map<String, String> dbOptions = new HashMap<>();
/** A set of all used String values */
private static final Map<String, String> stringTable = java.util.Collections.synchronizedMap(new HashMap<String, String>());
@@ -143,10 +143,10 @@ class SqlResources {
Element dbOptionsElement = (Element) (sqlDoc.getElementsByTagName("dbOptions").item(0));
if (dbOptionsElement != null) {
// First populate the map with default values
- populateDbOptions("", dbOptionsElement, m_dbOptions);
+ populateDbOptions("", dbOptionsElement, dbOptions);
// Now update the map with specific product values
if (dbProduct != null) {
- populateDbOptions(dbProduct, dbOptionsElement, m_dbOptions);
+ populateDbOptions(dbProduct, dbOptionsElement, dbOptions);
}
}
@@ -248,8 +248,8 @@ class SqlResources {
}
// Copy in default strings, then overwrite product-specific ones.
- m_sql.putAll(defaultSqlStatements);
- m_sql.putAll(dbProductSqlStatements);
+ sql.putAll(defaultSqlStatements);
+ sql.putAll(dbProductSqlStatements);
}
/**
@@ -326,18 +326,18 @@ class SqlResources {
* @return the substituted string
*/
private String substituteSubString(String input, String find, String replace) {
- int find_length = find.length();
- int replace_length = replace.length();
+ int findLength = find.length();
+ int replaceLength = replace.length();
StringBuilder output = new StringBuilder(input);
int index = input.indexOf(find);
int outputOffset = 0;
while (index > -1) {
- output.replace(index + outputOffset, index + outputOffset + find_length, replace);
- outputOffset = outputOffset + (replace_length - find_length);
+ output.replace(index + outputOffset, index + outputOffset + findLength, replace);
+ outputOffset = outputOffset + (replaceLength - findLength);
- index = input.indexOf(find, index + find_length);
+ index = input.indexOf(find, index + findLength);
}
return output.toString();
@@ -352,7 +352,7 @@ class SqlResources {
* @return the requested resource
*/
public String getSqlString(String name) {
- return m_sql.get(name);
+ return sql.get(name);
}
/**
@@ -389,7 +389,7 @@ class SqlResources {
* @return the requested dbOption value
*/
public String getDbOption(String name) {
- return m_dbOptions.get(name);
+ return dbOptions.get(name);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java
new file mode 100644
index 0000000..128b757
--- /dev/null
+++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/MessageDispositionNotification.java
@@ -0,0 +1,140 @@
+/****************************************************************
+ * 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.mailet.base.mail;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+
+import javax.activation.ActivationDataFlavor;
+import javax.activation.DataSource;
+import javax.mail.MessagingException;
+import javax.mail.internet.ContentType;
+import javax.mail.internet.MimeUtility;
+import javax.mail.internet.ParseException;
+
+/**
+ * <p>Data Content Handler for...</p>
+ * <dl>
+ * <dt>MIME type name</dt><dd>message</dd>
+ * <dt>MIME subtype name</dt><dd>disposition-notification</dd>
+ * </dl>
+ */
+public class MessageDispositionNotification extends AbstractDataContentHandler {
+
+ /**
+ * Default Constructor.
+ */
+ public MessageDispositionNotification() {
+ super();
+ }
+
+ /**
+ * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor()
+ */
+ protected ActivationDataFlavor computeDataFlavor() {
+ return new ActivationDataFlavor(String.class,
+ "message/disposition-notification", "Message String");
+ }
+
+ /**
+ * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource)
+ */
+ protected Object computeContent(DataSource aDataSource)
+ throws MessagingException {
+ String encoding = getCharacterSet(aDataSource.getContentType());
+ Reader reader = null;
+ Writer writer = new StringWriter(2048);
+ String content = null;
+ try {
+ reader = new BufferedReader(new InputStreamReader(aDataSource
+ .getInputStream(), encoding), 2048);
+ while (reader.ready()) {
+ writer.write(reader.read());
+ }
+ writer.flush();
+ content = writer.toString();
+ } catch (IllegalArgumentException e) {
+ throw new MessagingException("Encoding = \"" + encoding + "\"", e);
+ } catch (IOException e) {
+ throw new MessagingException(
+ "Exception obtaining content from DataSource", e);
+ } finally {
+ try {
+ writer.close();
+ } catch (IOException e1) {
+ // No-op
+ }
+ try {
+ if (reader != null) {
+ reader.close();
+ }
+ } catch (IOException e1) {
+ // No-op
+ }
+ }
+ return content;
+ }
+
+ /**
+ * @see javax.activation.DataContentHandler#writeTo(java.lang.Object,
+ * java.lang.String, java.io.OutputStream)
+ */
+ public void writeTo(Object aPart, String aMimeType, OutputStream aStream)
+ throws IOException {
+ if (!(aPart instanceof String)) {
+ throw new IOException("Type \"" + aPart.getClass().getName()
+ + "\" is not supported.");
+ }
+
+ String encoding = getCharacterSet(getDataFlavor().getMimeType());
+ Writer writer;
+ try {
+ writer = new BufferedWriter(new OutputStreamWriter(aStream,
+ encoding), 2048);
+ } catch (IllegalArgumentException e) {
+ throw new UnsupportedEncodingException(encoding);
+ }
+ writer.write((String) aPart);
+ writer.flush();
+ }
+
+ protected String getCharacterSet(String aType) {
+ String characterSet = null;
+ try {
+ characterSet = new ContentType(aType).getParameter("charset");
+ } catch (ParseException e) {
+ // no-op
+ } finally {
+ if (null == characterSet) {
+ characterSet = "us-ascii";
+ }
+ }
+ return MimeUtility.javaCharset(characterSet);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java
new file mode 100644
index 0000000..f9979c5
--- /dev/null
+++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/MultipartReport.java
@@ -0,0 +1,77 @@
+/****************************************************************
+ * 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.mailet.base.mail;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.activation.ActivationDataFlavor;
+import javax.activation.DataSource;
+import javax.mail.MessagingException;
+
+
+/**
+ * <p>Data Content Handler for...</p>
+ * <dl>
+ * <dt>MIME type name</dt><dd>multipart</dd>
+ * <dt>MIME subtype name</dt><dd>report</dd>
+ * </dl>
+ */
+public class MultipartReport extends AbstractDataContentHandler {
+ /**
+ * Default constructor.
+ */
+ public MultipartReport() {
+ super();
+ }
+
+ /**
+ * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor()
+ */
+ protected ActivationDataFlavor computeDataFlavor() {
+ return new ActivationDataFlavor(MimeMultipartReport.class,
+ "multipart/report", "Multipart Report");
+ }
+
+ /**
+ * @see javax.activation.DataContentHandler#writeTo(java.lang.Object,
+ * java.lang.String, java.io.OutputStream)
+ */
+ public void writeTo(Object aPart, String aMimeType, OutputStream aStream)
+ throws IOException {
+ if (!(aPart instanceof MimeMultipartReport)) {
+ throw new IOException("Type \"" + aPart.getClass().getName()
+ + "\" is not supported.");
+ }
+ try {
+ ((MimeMultipartReport) aPart).writeTo(aStream);
+ } catch (MessagingException e) {
+ throw new IOException(e.getMessage());
+ }
+ }
+
+ /**
+ * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource)
+ */
+ protected Object computeContent(DataSource aDataSource)
+ throws MessagingException {
+ return new MimeMultipartReport(aDataSource);
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java
deleted file mode 100644
index adf35df..0000000
--- a/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************
- * 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.mailet.base.mail;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
-import javax.activation.ActivationDataFlavor;
-import javax.activation.DataSource;
-import javax.mail.MessagingException;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.MimeUtility;
-import javax.mail.internet.ParseException;
-
-/**
- * <p>Data Content Handler for...</p>
- * <dl>
- * <dt>MIME type name</dt><dd>message</dd>
- * <dt>MIME subtype name</dt><dd>disposition-notification</dd>
- * </dl>
- */
-public class message_disposition_notification extends AbstractDataContentHandler {
-
- /**
- * Default Constructor.
- */
- public message_disposition_notification() {
- super();
- }
-
- /**
- * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor()
- */
- protected ActivationDataFlavor computeDataFlavor() {
- return new ActivationDataFlavor(String.class,
- "message/disposition-notification", "Message String");
- }
-
- /**
- * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource)
- */
- protected Object computeContent(DataSource aDataSource)
- throws MessagingException {
- String encoding = getCharacterSet(aDataSource.getContentType());
- Reader reader = null;
- Writer writer = new StringWriter(2048);
- String content = null;
- try {
- reader = new BufferedReader(new InputStreamReader(aDataSource
- .getInputStream(), encoding), 2048);
- while (reader.ready()) {
- writer.write(reader.read());
- }
- writer.flush();
- content = writer.toString();
- } catch (IllegalArgumentException e) {
- throw new MessagingException("Encoding = \"" + encoding + "\"", e);
- } catch (IOException e) {
- throw new MessagingException(
- "Exception obtaining content from DataSource", e);
- } finally {
- try {
- writer.close();
- } catch (IOException e1) {
- // No-op
- }
- try {
- if (reader != null) {
- reader.close();
- }
- } catch (IOException e1) {
- // No-op
- }
- }
- return content;
- }
-
- /**
- * @see javax.activation.DataContentHandler#writeTo(java.lang.Object,
- * java.lang.String, java.io.OutputStream)
- */
- public void writeTo(Object aPart, String aMimeType, OutputStream aStream)
- throws IOException {
- if (!(aPart instanceof String)) {
- throw new IOException("Type \"" + aPart.getClass().getName()
- + "\" is not supported.");
- }
-
- String encoding = getCharacterSet(getDataFlavor().getMimeType());
- Writer writer;
- try {
- writer = new BufferedWriter(new OutputStreamWriter(aStream,
- encoding), 2048);
- } catch (IllegalArgumentException e) {
- throw new UnsupportedEncodingException(encoding);
- }
- writer.write((String) aPart);
- writer.flush();
- }
-
- protected String getCharacterSet(String aType) {
- String characterSet = null;
- try {
- characterSet = new ContentType(aType).getParameter("charset");
- } catch (ParseException e) {
- // no-op
- } finally {
- if (null == characterSet) {
- characterSet = "us-ascii";
- }
- }
- return MimeUtility.javaCharset(characterSet);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java
deleted file mode 100644
index 39d9c80..0000000
--- a/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************
- * 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.mailet.base.mail;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.activation.ActivationDataFlavor;
-import javax.activation.DataSource;
-import javax.mail.MessagingException;
-
-
-/**
- * <p>Data Content Handler for...</p>
- * <dl>
- * <dt>MIME type name</dt><dd>multipart</dd>
- * <dt>MIME subtype name</dt><dd>report</dd>
- * </dl>
- */
-public class multipart_report extends AbstractDataContentHandler {
- /**
- * Default constructor.
- */
- public multipart_report() {
- super();
- }
-
- /**
- * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor()
- */
- protected ActivationDataFlavor computeDataFlavor() {
- return new ActivationDataFlavor(MimeMultipartReport.class,
- "multipart/report", "Multipart Report");
- }
-
- /**
- * @see javax.activation.DataContentHandler#writeTo(java.lang.Object,
- * java.lang.String, java.io.OutputStream)
- */
- public void writeTo(Object aPart, String aMimeType, OutputStream aStream)
- throws IOException {
- if (!(aPart instanceof MimeMultipartReport)) {
- throw new IOException("Type \"" + aPart.getClass().getName()
- + "\" is not supported.");
- }
- try {
- ((MimeMultipartReport) aPart).writeTo(aStream);
- } catch (MessagingException e) {
- throw new IOException(e.getMessage());
- }
- }
-
- /**
- * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource)
- */
- protected Object computeContent(DataSource aDataSource)
- throws MessagingException {
- return new MimeMultipartReport(aDataSource);
- }
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
index cf03db7..4c8bc5d 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
@@ -66,11 +66,11 @@ public class HasMailAttributeWithValueRegex extends GenericMatcher {
int idx = condition.indexOf(',');
if (idx != -1) {
attributeName = condition.substring(0,idx).trim();
- String pattern_string = condition.substring(idx + 1, condition.length()).trim();
+ String patternString = condition.substring(idx + 1, condition.length()).trim();
try {
- pattern = Pattern.compile(pattern_string);
+ pattern = Pattern.compile(patternString);
} catch (PatternSyntaxException mpe) {
- throw new MessagingException("Malformed pattern: " + pattern_string, mpe);
+ throw new MessagingException("Malformed pattern: " + patternString, mpe);
}
} else {
throw new MessagingException("malformed condition for HasMailAttributeWithValueRegex. must be of the form: attr,regex");
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
index 090610c..7277f8f 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
@@ -35,7 +35,7 @@ import org.apache.mailet.base.RFC2822Headers;
*/
@Experimental
public class NESSpamCheck extends GenericRegexMatcher {
- protected Object[][] NESPatterns = {{RFC2822Headers.RECEIVED, "GAA.*-0600.*EST"},
+ protected Object[][] nesPatterns = {{RFC2822Headers.RECEIVED, "GAA.*-0600.*EST"},
{RFC2822Headers.RECEIVED, "XAA.*-0700.*EDT"},
{RFC2822Headers.RECEIVED, "xxxxxxxxxxxxxxxxxxxxx"},
{RFC2822Headers.RECEIVED, "untrace?able"},
@@ -96,7 +96,7 @@ public class NESSpamCheck extends GenericRegexMatcher {
public void init() throws MessagingException {
//No condition passed... just compile a bunch of regular expressions
try {
- compile(NESPatterns);
+ compile(nesPatterns);
} catch (PatternSyntaxException mp) {
throw new MessagingException("Could not initialize NES patterns", mp);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
index 690c003..9235c51 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
@@ -39,14 +39,14 @@ public class MailAttributesToMimeHeadersTest {
private Mailet mailet;
- private final String HEADER_NAME1 = "JUNIT";
- private final String HEADER_NAME2 = "JUNIT2";
+ private static final String HEADER_NAME1 = "JUNIT";
+ private static final String HEADER_NAME2 = "JUNIT2";
- private final String MAIL_ATTRIBUTE_VALUE1 = "test1";
- private final String MAIL_ATTRIBUTE_VALUE2 = "test2";
+ private static final String MAIL_ATTRIBUTE_VALUE1 = "test1";
+ private static final String MAIL_ATTRIBUTE_VALUE2 = "test2";
- private final String MAIL_ATTRIBUTE_NAME1 = "org.apache.james.test";
- private final String MAIL_ATTRIBUTE_NAME2 = "org.apache.james.test2";
+ private static final String MAIL_ATTRIBUTE_NAME1 = "org.apache.james.test";
+ private static final String MAIL_ATTRIBUTE_NAME2 = "org.apache.james.test2";
@Before
public void setup() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
index 342e154..0bcff15 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
@@ -39,9 +39,9 @@ public abstract class AbstractHasMailAttributeTest extends TestCase {
protected Matcher matcher;
- protected final String MAIL_ATTRIBUTE_NAME = "org.apache.james.test.junit";
+ protected static final String MAIL_ATTRIBUTE_NAME = "org.apache.james.test.junit";
- protected final String MAIL_ATTRIBUTE_VALUE = "true";
+ protected static final String MAIL_ATTRIBUTE_VALUE = "true";
protected String mailAttributeName = "org.apache.james";
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java
index 45f4242..e739959 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java
@@ -34,7 +34,7 @@ import org.junit.rules.ExpectedException;
public class SenderIsTest {
- private final String SENDER_NAME = "test@james.apache.org";
+ private static final String SENDER_NAME = "test@james.apache.org";
@Rule
public ExpectedException expectedException = ExpectedException.none();
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java b/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java
index 440ac59..3e2edd8 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java
@@ -29,40 +29,40 @@ public interface ProtocolInteractor {
/**
* adds a new Client request line to the test elements
*/
- void CL(String clientLine);
+ void cl(String clientLine);
/**
* adds a new Server Response line to the test elements, with the specified
* location.
*/
- void SL(String serverLine, String location);
+ void sl(String serverLine, String location);
/**
* adds a new Server Unordered Block to the test elements.
*/
- void SUB(List<String> serverLines, String location);
+ void sub(List<String> serverLines, String location);
/**
* adds a new Client request line to the test elements
*/
- void CL(int sessionNumber, String clientLine);
+ void cl(int sessionNumber, String clientLine);
/**
* Adds a continuation. To allow one thread to be used for testing.
*/
- void CONT(int sessionNumber) throws Exception;
+ void cont(int sessionNumber) throws Exception;
/**
* adds a new Server Response line to the test elements, with the specified
* location.
*/
- void SL(int sessionNumber, String serverLine,
+ void sl(int sessionNumber, String serverLine,
String location, String lastClientMessage);
/**
* adds a new Server Unordered Block to the test elements.
*/
- void SUB(int sessionNumber, List<String> serverLines,
+ void sub(int sessionNumber, List<String> serverLines,
String location, String lastClientMessage);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/core/src/main/java/org/apache/james/mpt/helper/CreateScript.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/CreateScript.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/CreateScript.java
index 1ca77ae..f758f24 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/helper/CreateScript.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/CreateScript.java
@@ -572,7 +572,7 @@ public class CreateScript {
builder.larger(12500).search();
builder.larger(15000).search();
builder.larger(20000).search();
- builder.NEW().search();
+ builder.newOperator().search();
builder.not().flagged().search();
builder.msn(3, 5).search();
builder.msnAndDown(10).search();
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java
index 6292abc..fb21446 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/helper/ScriptBuilder.java
@@ -282,8 +282,8 @@ public class ScriptBuilder {
return this;
}
- public ScriptBuilder NEW() {
- search.NEW();
+ public ScriptBuilder newOperator() {
+ search.newOperator();
return this;
}
@@ -770,7 +770,7 @@ public class ScriptBuilder {
return append("LARGER").append(size);
}
- public Search NEW() {
+ public Search newOperator() {
return append("NEW");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
index 90dda0d..666f784 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
@@ -103,41 +103,41 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder {
while ((next = reader.readLine()) != null) {
String location = fileName + ":" + lineNumber;
if (SERVER_CONTINUATION_TAG.equals(next)) {
- session.CONT(sessionNumber);
+ session.cont(sessionNumber);
} else if (next.startsWith(CLIENT_TAG)) {
String clientMsg = "";
if (next.length() > 3) {
clientMsg = next.substring(3);
}
- session.CL(sessionNumber, clientMsg);
+ session.cl(sessionNumber, clientMsg);
lastClientMsg = clientMsg;
} else if (next.startsWith(SERVER_TAG)) {
String serverMsg = "";
if (next.length() > 3) {
serverMsg = next.substring(3);
}
- session.SL(sessionNumber, serverMsg, location, lastClientMsg);
+ session.sl(sessionNumber, serverMsg, location, lastClientMsg);
} else if (next.startsWith(WAIT)) {
if (next.length() > 5) {
- session.WAIT(sessionNumber, Long.valueOf(next.substring(5)));
+ session.wait(sessionNumber, Long.valueOf(next.substring(5)));
} else {
throw new Exception("Invalid line length on WAIT instruction : " + next);
}
} else if (next.startsWith(LOG)) {
String logInstruction = next.substring(4);
if (logInstruction.startsWith(DEBUG)) {
- session.LOG(sessionNumber, ProtocolSession.LolLevel.Debug, logInstruction.substring(6));
+ session.log(sessionNumber, ProtocolSession.LolLevel.Debug, logInstruction.substring(6));
} else if (logInstruction.startsWith(INFO)) {
- session.LOG(sessionNumber, ProtocolSession.LolLevel.Info, logInstruction.substring(5));
+ session.log(sessionNumber, ProtocolSession.LolLevel.Info, logInstruction.substring(5));
} else if (logInstruction.startsWith(WARN)) {
- session.LOG(sessionNumber, ProtocolSession.LolLevel.Warn, logInstruction.substring(5));
+ session.log(sessionNumber, ProtocolSession.LolLevel.Warn, logInstruction.substring(5));
} else if (logInstruction.startsWith(ERR)) {
- session.LOG(sessionNumber, ProtocolSession.LolLevel.Err, logInstruction.substring(4));
+ session.log(sessionNumber, ProtocolSession.LolLevel.Err, logInstruction.substring(4));
} else {
throw new Exception("Unrecognized log level for " + next);
}
} else if (next.startsWith(REINIT)) {
- session.REINIT(sessionNumber);
+ session.reinit(sessionNumber);
} else if (next.startsWith(OPEN_UNORDERED_BLOCK_TAG)) {
List<String> unorderedLines = new ArrayList<>(5);
next = reader.readLine();
@@ -164,7 +164,7 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder {
}
- session.SUB(sessionNumber, unorderedLines, location, lastClientMsg);
+ session.sub(sessionNumber, unorderedLines, location, lastClientMsg);
} else if (next.startsWith(COMMENT_TAG) || next.trim().length() == 0) {
// ignore these lines.
} else if (next.startsWith(SESSION_TAG)) {
@@ -176,7 +176,7 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder {
} else if (next.startsWith(TIMER)) {
TimerCommand timerCommand = TimerCommand.from(next.substring(TIMER_COMMAND_START, TIMER_COMMAND_END));
String timerName = next.substring(TIMER_COMMAND_END + 1);
- session.TIMER(timerCommand, timerName);
+ session.timer(timerCommand, timerName);
} else {
String prefix = next;
if (next.length() > 3) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
index 0d3031f..4c80dbc 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
@@ -142,7 +142,7 @@ public class ProtocolSession implements ProtocolInteractor {
/**
* adds a new Client request line to the test elements
*/
- public void CL(String clientLine) {
+ public void cl(String clientLine) {
testElements.add(new ClientRequest(clientLine));
}
@@ -150,21 +150,21 @@ public class ProtocolSession implements ProtocolInteractor {
* adds a new Server Response line to the test elements, with the specified
* location.
*/
- public void SL(String serverLine, String location) {
+ public void sl(String serverLine, String location) {
testElements.add(new ServerResponse(serverLine, location));
}
/**
* adds a new Server Unordered Block to the test elements.
*/
- public void SUB(List<String> serverLines, String location) {
+ public void sub(List<String> serverLines, String location) {
testElements.add(new ServerUnorderedBlockResponse(serverLines, location));
}
/**
* adds a new Client request line to the test elements
*/
- public void CL(int sessionNumber, String clientLine) {
+ public void cl(int sessionNumber, String clientLine) {
this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
testElements.add(new ClientRequest(sessionNumber, clientLine));
}
@@ -172,7 +172,7 @@ public class ProtocolSession implements ProtocolInteractor {
/**
* Adds a continuation. To allow one thread to be used for testing.
*/
- public void CONT(int sessionNumber) throws Exception {
+ public void cont(int sessionNumber) throws Exception {
this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
testElements.add(new ContinuationElement(sessionNumber));
}
@@ -181,7 +181,7 @@ public class ProtocolSession implements ProtocolInteractor {
* adds a new Server Response line to the test elements, with the specified
* location.
*/
- public void SL(int sessionNumber, String serverLine, String location, String lastClientMessage) {
+ public void sl(int sessionNumber, String serverLine, String location, String lastClientMessage) {
this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
testElements.add(new ServerResponse(sessionNumber, serverLine, location, lastClientMessage));
}
@@ -189,7 +189,7 @@ public class ProtocolSession implements ProtocolInteractor {
/**
* adds a new Server Unordered Block to the test elements.
*/
- public void SUB(int sessionNumber, List<String> serverLines, String location, String lastClientMessage) {
+ public void sub(int sessionNumber, List<String> serverLines, String location, String lastClientMessage) {
this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
testElements.add(new ServerUnorderedBlockResponse(sessionNumber, serverLines, location, lastClientMessage));
}
@@ -197,22 +197,22 @@ public class ProtocolSession implements ProtocolInteractor {
/**
* adds a Wait condition
*/
- public void WAIT(int sessionNumber, long timeToWaitInMs) {
+ public void wait(int sessionNumber, long timeToWaitInMs) {
this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
testElements.add(new WaitElement(timeToWaitInMs));
}
- public void LOG(int sessionNumber, LolLevel level, String message) {
+ public void log(int sessionNumber, LolLevel level, String message) {
this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
testElements.add(new LogElement(level, message));
}
- public void REINIT(int sessionNumber) {
+ public void reinit(int sessionNumber) {
this.maxSessionNumber = Math.max(this.maxSessionNumber, sessionNumber);
testElements.add(new ReinitElement(sessionNumber));
}
- public void TIMER(TimerCommand timerCommand, String timerName) {
+ public void timer(TimerCommand timerCommand, String timerName) {
testElements.add(new TimerElement(timerCommand, timerName));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
index 11766ca..967a10b 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
@@ -185,20 +185,20 @@ public class ProtocolSessionBuilder {
line = substituteVariables(line);
String location = scriptName + ":" + lineNumber;
if (SERVER_CONTINUATION_TAG.equals(line)) {
- session.CONT(sessionNumber);
+ session.cont(sessionNumber);
} else if (line.startsWith(CLIENT_TAG)) {
String clientMsg = "";
if (line.length() > 3) {
clientMsg = line.substring(3);
}
- session.CL(sessionNumber, clientMsg);
+ session.cl(sessionNumber, clientMsg);
lastClientMsg = clientMsg;
} else if (line.startsWith(SERVER_TAG)) {
String serverMsg = "";
if (line.length() > 3) {
serverMsg = line.substring(3);
}
- session.SL(sessionNumber, serverMsg, location, lastClientMsg);
+ session.sl(sessionNumber, serverMsg, location, lastClientMsg);
} else if (line.startsWith(OPEN_UNORDERED_BLOCK_TAG)) {
List<String> unorderedLines = new ArrayList<>(5);
line = reader.readLine();
@@ -214,7 +214,7 @@ public class ProtocolSessionBuilder {
lineNumber++;
}
- session.SUB(sessionNumber, unorderedLines, location,
+ session.sub(sessionNumber, unorderedLines, location,
lastClientMsg);
} else if (line.startsWith(COMMENT_TAG)
|| line.trim().length() == 0) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
index 159113e..33b5eba 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
@@ -33,7 +33,7 @@ import org.apache.james.mpt.protocol.ProtocolSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SELF extends GenericSimpleScriptedTestProtocol<?, ?>> {
+public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SelfT extends GenericSimpleScriptedTestProtocol<?, ?>> {
private static final Logger LOGGER = LoggerFactory.getLogger(GenericSimpleScriptedTestProtocol.class);
@@ -84,21 +84,21 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SELF extend
}
@SuppressWarnings("unchecked")
- public SELF withLocale(Locale locale) {
+ public SelfT withLocale(Locale locale) {
this.locale = locale;
- return (SELF) this;
+ return (SelfT) this;
}
@SuppressWarnings("unchecked")
- public SELF withUser(String user, String password) {
+ public SelfT withUser(String user, String password) {
prepareCommands.add(new CreateUser(user, password));
- return (SELF) this;
+ return (SelfT) this;
}
@SuppressWarnings("unchecked")
- public SELF withPreparedCommand(PrepareCommand<? super T> command) {
+ public SelfT withPreparedCommand(PrepareCommand<? super T> command) {
prepareCommands.add(command);
- return (SELF) this;
+ return (SelfT) this;
}
public ProtocolSession preElements() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java b/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
index 9dddc26..4d6edcd 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
@@ -55,18 +55,18 @@ public class TestFileProtocolSessionBuilder extends MockObjectTestCase {
}
public void testShouldPreserveContentsWhenNoVariablesSet() throws Exception {
- mockSession.expects(once()).method("CL").with(eq(-1), eq(SCRIPT_WITH_VARIABLES));
+ mockSession.expects(once()).method("cl").with(eq(-1), eq(SCRIPT_WITH_VARIABLES));
addLines();
}
public void testShouldReplaceVariableWhenSet() throws Exception {
- mockSession.expects(once()).method("CL").with(eq(-1), eq(SCRIPT_WITH_FOO_REPLACED_BY_WHATEVER));
+ mockSession.expects(once()).method("cl").with(eq(-1), eq(SCRIPT_WITH_FOO_REPLACED_BY_WHATEVER));
builder.setVariable("foo", "whatever");
addLines();
}
public void testShouldReplaceAllVariablesWhenSet() throws Exception {
- mockSession.expects(once()).method("CL").with(eq(-1), eq(SCRIPT_WITH_VARIABLES_INLINED));
+ mockSession.expects(once()).method("cl").with(eq(-1), eq(SCRIPT_WITH_VARIABLES_INLINED));
builder.setVariable("bar", "bar");
builder.setVariable("foo", "foo");
builder.setVariable("not", "not");
@@ -74,14 +74,14 @@ public class TestFileProtocolSessionBuilder extends MockObjectTestCase {
}
public void testShouldReplaceVariableAtBeginningAndEnd() throws Exception {
- mockSession.expects(once()).method("CL").with(eq(-1), eq("whatever Some Other Scriptwhateverwhatever"));
+ mockSession.expects(once()).method("cl").with(eq(-1), eq("whatever Some Other Scriptwhateverwhatever"));
builder.setVariable("foo", "whatever");
builder.addProtocolLines("A Script", new StringReader(ProtocolSessionBuilder.CLIENT_TAG + " " + "${foo} Some Other Script${foo}${foo}"), session);
}
public void testShouldIgnoreNotQuiteVariables() throws Exception {
final String NEARLY = "{foo}${}${foo Some Other Script${foo}";
- mockSession.expects(once()).method("CL").with(eq(-1), eq(NEARLY));
+ mockSession.expects(once()).method("cl").with(eq(-1), eq(NEARLY));
builder.setVariable("foo", "whatever");
builder.addProtocolLines("A Script", new StringReader(ProtocolSessionBuilder.CLIENT_TAG + " " + NEARLY), session);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/52c18ef6/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
index 0c4b18d..5f48067 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
@@ -28,7 +28,7 @@ import org.apache.james.mpt.script.SimpleScriptedTestProtocol;
public class BasicImapCommands implements ImapTestConstants {
public static void welcome(GenericSimpleScriptedTestProtocol<?, ?> scriptedTestProtocol) {
- scriptedTestProtocol.preElements().SL("\\* OK IMAP4rev1 Server ready", "BaseAuthenticatedState.java:32");
+ scriptedTestProtocol.preElements().sl("\\* OK IMAP4rev1 Server ready", "BaseAuthenticatedState.java:32");
}
public static void authenticate(GenericSimpleScriptedTestProtocol<?, ?> scriptedTestProtocol) {
@@ -37,29 +37,29 @@ public class BasicImapCommands implements ImapTestConstants {
private static void addLogin(ProtocolInteractor preElements, String username, String password) {
- preElements.CL("a001 LOGIN " + username + " " + password);
- preElements.SL("a001 OK .*", "BaseAuthenticatedState.java:53");
+ preElements.cl("a001 LOGIN " + username + " " + password);
+ preElements.sl("a001 OK .*", "BaseAuthenticatedState.java:53");
}
public static void selectInbox(SimpleScriptedTestProtocol scriptedTestProtocol) {
ProtocolInteractor preElements = scriptedTestProtocol.preElements();
- preElements.CL("abcd SELECT inbox");
- preElements.SL("\\* FLAGS \\(\\\\Answered \\\\Deleted \\\\Draft \\\\Flagged \\\\Seen\\)", "BasicImapCommands");
- preElements.SL("\\* \\d+ EXISTS", "BasicImapCommands");
- preElements.SL("\\* \\d+ RECENT", "BasicImapCommands");
- preElements.SL("\\* OK \\[UIDVALIDITY \\d+\\].*", "BasicImapCommands");
- preElements.SL("\\* OK \\[PERMANENTFLAGS \\(\\\\Answered \\\\Deleted \\\\Draft \\\\Flagged \\\\\\Seen( \\\\\\*)?\\)\\].*", "BasicImapCommands");
- preElements.SL("\\* OK \\[HIGHESTMODSEQ \\d+\\].*", "BasicImapCommands");
- preElements.SL("\\* OK \\[UIDNEXT 1\\].*", "BasicImapCommands");
- preElements.SL("abcd OK \\[READ-WRITE\\] SELECT completed.", "BasicImapCommands");
+ preElements.cl("abcd SELECT inbox");
+ preElements.sl("\\* FLAGS \\(\\\\Answered \\\\Deleted \\\\Draft \\\\Flagged \\\\Seen\\)", "BasicImapCommands");
+ preElements.sl("\\* \\d+ EXISTS", "BasicImapCommands");
+ preElements.sl("\\* \\d+ RECENT", "BasicImapCommands");
+ preElements.sl("\\* OK \\[UIDVALIDITY \\d+\\].*", "BasicImapCommands");
+ preElements.sl("\\* OK \\[PERMANENTFLAGS \\(\\\\Answered \\\\Deleted \\\\Draft \\\\Flagged \\\\\\Seen( \\\\\\*)?\\)\\].*", "BasicImapCommands");
+ preElements.sl("\\* OK \\[HIGHESTMODSEQ \\d+\\].*", "BasicImapCommands");
+ preElements.sl("\\* OK \\[UIDNEXT 1\\].*", "BasicImapCommands");
+ preElements.sl("abcd OK \\[READ-WRITE\\] SELECT completed.", "BasicImapCommands");
addCloseInbox(scriptedTestProtocol.postElements());
}
private static void addCloseInbox(ProtocolInteractor postElements) {
- postElements.CL("a CLOSE");
- postElements.SL(".*", "AbstractBaseTestSelectedInbox.java:76");
+ postElements.cl("a CLOSE");
+ postElements.sl(".*", "AbstractBaseTestSelectedInbox.java:76");
}
public static void prepareMailbox(SimpleScriptedTestProtocol scriptedTestProtocol) throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org