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 2020/04/24 02:59:40 UTC
[james-project] 05/17: [Refactoring] remove some useless final
modifiers
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 a324292ddb5611495522f782fedb77ce823096a5
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Apr 21 17:21:35 2020 +0200
[Refactoring] remove some useless final modifiers
---
.../cassandra/migration/MigrationTaskAdditionalInformationDTO.java | 2 +-
.../apache/james/backends/cassandra/migration/MigrationTaskDTO.java | 2 +-
.../test/java/org/apache/james/mailbox/backup/ZipAssertTest.java | 2 +-
.../mailbox/tools/indexer/ReprocessingContextInformationDTO.java | 4 ++--
mpt/app/src/main/java/org/apache/james/mpt/app/Main.java | 2 +-
.../src/main/java/org/apache/james/mpt/helper/CreateScript.java | 2 +-
.../java/org/apache/james/imap/api/display/HumanReadableText.java | 4 ++--
.../java/org/apache/james/imap/api/message/BodyFetchElement.java | 6 +++---
.../apache/james/imap/encode/main/DefaultImapEncoderFactory.java | 2 +-
.../java/org/apache/james/imap/main/DefaultImapDecoderFactory.java | 2 +-
.../src/test/java/org/apache/james/imap/decode/parser/NioUtils.java | 4 ++--
.../MappingsSourcesMigrationTaskAdditionalInformationDTO.java | 2 +-
.../apache/james/jmap/api/filtering/impl/FilteringAggregateId.java | 2 +-
.../apache/james/dlp/eventsourcing/aggregates/DLPAggregateId.java | 2 +-
.../org/apache/james/mailets/configuration/CommonProcessors.java | 2 +-
.../webadmin/vault/routes/DeletedMessagesVaultDeleteTaskDTO.java | 2 +-
16 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
index 0206b6e..aef36f5 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class MigrationTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static final AdditionalInformationDTOModule<MigrationTask.AdditionalInformation, MigrationTaskAdditionalInformationDTO> serializationModule() {
+ public static AdditionalInformationDTOModule<MigrationTask.AdditionalInformation, MigrationTaskAdditionalInformationDTO> serializationModule() {
return DTOModule.forDomainObject(MigrationTask.AdditionalInformation.class)
.convertToDTO(MigrationTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new MigrationTask.AdditionalInformation(new SchemaVersion(dto.getTargetVersion()), dto.timestamp))
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskDTO.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskDTO.java
index 155484b..86bbdf6 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskDTO.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskDTO.java
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class MigrationTaskDTO implements TaskDTO {
- public static final TaskDTOModule<MigrationTask, MigrationTaskDTO> module(MigrationTask.Factory factory) {
+ public static TaskDTOModule<MigrationTask, MigrationTaskDTO> module(MigrationTask.Factory factory) {
return DTOModule.forDomainObject(MigrationTask.class)
.convertToDTO(MigrationTaskDTO.class)
.toDomainObjectConverter(dto -> factory.create(new SchemaVersion(dto.targetVersion)))
diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
index a30da30..2bfc54c 100644
--- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
+++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/ZipAssertTest.java
@@ -143,7 +143,7 @@ class ZipAssertTest {
}
@SafeVarargs
- private final ZipFile buildZipFile(SimpleImmutableEntry<String, byte[]>... entries) throws Exception {
+ private ZipFile buildZipFile(SimpleImmutableEntry<String, byte[]>... entries) throws Exception {
try (ZipArchiveOutputStream archiveOutputStream = new ZipArchiveOutputStream(destination)) {
for (SimpleImmutableEntry<String, byte[]> entry : entries) {
ZipArchiveEntry archiveEntry = (ZipArchiveEntry) archiveOutputStream.createArchiveEntry(new File("any"), entry.getKey());
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java
index 9172e98..f711c1d 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java
@@ -70,7 +70,7 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
}
- public static final AdditionalInformationDTOModule<ReprocessingContextInformationForErrorRecoveryIndexationTask, DTO> serializationModule(MailboxId.Factory mailboxIdFactory) {
+ public static AdditionalInformationDTOModule<ReprocessingContextInformationForErrorRecoveryIndexationTask, DTO> serializationModule(MailboxId.Factory mailboxIdFactory) {
return DTOModule.forDomainObject(ReprocessingContextInformationForErrorRecoveryIndexationTask.class)
.convertToDTO(DTO.class)
.toDomainObjectConverter(dto -> new ReprocessingContextInformationForErrorRecoveryIndexationTask(
@@ -106,7 +106,7 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
}
- public static final AdditionalInformationDTOModule<ReprocessingContextInformationForFullReindexingTask, DTO> serializationModule(MailboxId.Factory mailboxIdFactory) {
+ public static AdditionalInformationDTOModule<ReprocessingContextInformationForFullReindexingTask, DTO> serializationModule(MailboxId.Factory mailboxIdFactory) {
return DTOModule.forDomainObject(ReprocessingContextInformationForFullReindexingTask.class)
.convertToDTO(DTO.class)
.toDomainObjectConverter(dto -> new ReprocessingContextInformationForFullReindexingTask(dto.successfullyReprocessedMailCount, dto.failedReprocessedMailCount, deserializeFailures(mailboxIdFactory, dto.failures), dto.getTimestamp()))
diff --git a/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java b/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java
index bdec46f..f0b1821 100644
--- a/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java
+++ b/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java
@@ -52,7 +52,7 @@ public class Main {
private static final String SHABANG_OPTION = "s";
private static final String VERBOSE_OPTION = "v";
- public static final void main(String[] args) throws Exception {
+ public static void main(String[] args) throws Exception {
Options options = buildOptions();
try {
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 f758f24..f8b6e38 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
@@ -43,7 +43,7 @@ public class CreateScript {
public static final String ANOTHER_DOMAIN = "apache.org";
- public static final void main(String[] args) throws Exception {
+ public static void main(String[] args) throws Exception {
ScriptBuilder builder = ScriptBuilder.open("localhost", 143);
expunge(builder);
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java b/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
index b5ec81c..e231dd6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
@@ -36,7 +36,7 @@ public class HumanReadableText {
public static final HumanReadableText SELECT = new HumanReadableText("org.apache.james.imap.SELECT", "completed.");
- public static final HumanReadableText unseen(long numberUnseen) {
+ public static HumanReadableText unseen(long numberUnseen) {
return new HumanReadableText("org.apache.james.imap.UNSEEN", "MailboxMessage " + numberUnseen + " is first unseen");
}
@@ -47,7 +47,7 @@ public class HumanReadableText {
public static final HumanReadableText UID_VALIDITY = new HumanReadableText("org.apache.james.imap.UID_VALIDITY", "UIDs valid");
- public static final HumanReadableText permanentFlags(Flags flags) {
+ public static HumanReadableText permanentFlags(Flags flags) {
String text;
if (flags.getSystemFlags() != null && flags.getSystemFlags().length > 0) {
text = "Limited";
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
index 9dee961..eba867a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/BodyFetchElement.java
@@ -35,15 +35,15 @@ public class BodyFetchElement {
private static final BodyFetchElement rfc822Text = new BodyFetchElement(ImapConstants.FETCH_RFC822_TEXT, SectionType.TEXT, null, null, null, null);
- public static final BodyFetchElement createRFC822() {
+ public static BodyFetchElement createRFC822() {
return rfc822;
}
- public static final BodyFetchElement createRFC822Header() {
+ public static BodyFetchElement createRFC822Header() {
return rfc822Header;
}
- public static final BodyFetchElement createRFC822Text() {
+ public static BodyFetchElement createRFC822Text() {
return rfc822Text;
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
index d5ed92f..dbc6d43 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
@@ -96,7 +96,7 @@ public class DefaultImapEncoderFactory implements ImapEncoderFactory {
* parse BODYSTRUCTURE extensions, false to fully support RFC3501
* @return not null
*/
- public static final ImapEncoder createDefaultEncoder(Localizer localizer, boolean neverAddBodyStructureExtensions) {
+ public static ImapEncoder createDefaultEncoder(Localizer localizer, boolean neverAddBodyStructureExtensions) {
return new DefaultImapEncoder(Stream.of(
new AnnotationResponseEncoder(),
new MyRightsResponseEncoder(),
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java b/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
index a6de072..8773046 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
@@ -32,7 +32,7 @@ import org.apache.james.imap.message.response.UnpooledStatusResponseFactory;
*/
public class DefaultImapDecoderFactory implements ImapDecoderFactory {
- public static final ImapDecoder createDecoder() {
+ public static ImapDecoder createDecoder() {
final UnpooledStatusResponseFactory unpooledStatusResponseFactory = new UnpooledStatusResponseFactory();
final ImapCommandParserFactory imapCommands = new ImapParserFactory(unpooledStatusResponseFactory);
return new DefaultImapDecoder(unpooledStatusResponseFactory, imapCommands);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/NioUtils.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/NioUtils.java
index b652fb1..2a7006f 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/NioUtils.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/NioUtils.java
@@ -24,14 +24,14 @@ import java.nio.charset.Charset;
public class NioUtils {
- public static final byte[] toBytes(String string, Charset charset) {
+ public static byte[] toBytes(String string, Charset charset) {
ByteBuffer buffer = charset.encode(string);
byte[] results = new byte[buffer.limit()];
buffer.get(results);
return results;
}
- public static final byte[] add(byte[] one, byte[] two) {
+ public static byte[] add(byte[] one, byte[] two) {
byte[] results = new byte[one.length + two.length];
System.arraycopy(one, 0, results, 0, one.length);
System.arraycopy(two, 0, results, one.length, two.length);
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskAdditionalInformationDTO.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskAdditionalInformationDTO.java
index 5ddf19b..3915342 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskAdditionalInformationDTO.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskAdditionalInformationDTO.java
@@ -40,7 +40,7 @@ public class MappingsSourcesMigrationTaskAdditionalInformationDTO implements Add
);
}
- public static final AdditionalInformationDTOModule<MappingsSourcesMigration.AdditionalInformation, MappingsSourcesMigrationTaskAdditionalInformationDTO> serializationModule(TaskType type) {
+ public static AdditionalInformationDTOModule<MappingsSourcesMigration.AdditionalInformation, MappingsSourcesMigrationTaskAdditionalInformationDTO> serializationModule(TaskType type) {
return DTOModule
.forDomainObject(MappingsSourcesMigration.AdditionalInformation.class)
.convertToDTO(MappingsSourcesMigrationTaskAdditionalInformationDTO.class)
diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/impl/FilteringAggregateId.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/impl/FilteringAggregateId.java
index 0a75f73..3d20912 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/impl/FilteringAggregateId.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/impl/FilteringAggregateId.java
@@ -31,7 +31,7 @@ public class FilteringAggregateId implements AggregateId {
private static final String SEPARATOR = "/";
private static final String PREFIX = "FilteringRule";
- public static final FilteringAggregateId parse(String rawString) {
+ public static FilteringAggregateId parse(String rawString) {
Preconditions.checkArgument(rawString.startsWith(PREFIX + SEPARATOR));
return new FilteringAggregateId(Username.of(rawString.substring(PREFIX.length() + SEPARATOR.length())));
}
diff --git a/server/data/data-library/src/main/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateId.java b/server/data/data-library/src/main/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateId.java
index f1e3120..732ba97 100644
--- a/server/data/data-library/src/main/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateId.java
+++ b/server/data/data-library/src/main/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateId.java
@@ -30,7 +30,7 @@ public class DLPAggregateId implements AggregateId {
private static final String SEPARATOR = "/";
private static final String PREFIX = "DLPRule";
- public static final DLPAggregateId parse(String rawString) {
+ public static DLPAggregateId parse(String rawString) {
Preconditions.checkArgument(rawString.startsWith(PREFIX + SEPARATOR));
return new DLPAggregateId(Domain.of(
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
index 10454f2..b2c09a2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -143,7 +143,7 @@ public class CommonProcessors {
.build();
}
- public static final ProcessorConfiguration.Builder rrtErrorEnabledTransport() {
+ public static ProcessorConfiguration.Builder rrtErrorEnabledTransport() {
return ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskDTO.java
index 26b414a..73aff83 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskDTO.java
@@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class DeletedMessagesVaultDeleteTaskDTO implements TaskDTO {
- public static final TaskDTOModule<DeletedMessagesVaultDeleteTask, DeletedMessagesVaultDeleteTaskDTO> module(DeletedMessagesVaultDeleteTask.Factory factory) {
+ public static TaskDTOModule<DeletedMessagesVaultDeleteTask, DeletedMessagesVaultDeleteTaskDTO> module(DeletedMessagesVaultDeleteTask.Factory factory) {
return DTOModule
.forDomainObject(DeletedMessagesVaultDeleteTask.class)
.convertToDTO(DeletedMessagesVaultDeleteTaskDTO.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org