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 2019/07/29 12:03:26 UTC
[james-project] branch master updated (0044a4b -> 94aa789)
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 0044a4b Fix broken maven build
new 6f4428e JAMES-2843 Downgrade to Scala 2.12 to restore compatibility with Eclipse IDE
new 94aa789 Fix Checkstyle and Eclipse warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../eventstore/cassandra/JsonEventSerializer.java | 1 +
.../eventstore/cassandra/dto/TestEventDTO.java | 1 -
.../eventstore/cassandra/dto/TestEventDTOModules.java | 4 ++--
.../org/apache/james/json/JsonGenericSerializer.java | 2 +-
.../test/java/org/apache/JsonGenericSerializerTest.java | 8 +++++++-
json/src/test/java/org/apache/dto/TestModules.java | 2 ++
.../james/mailbox/events/ChannelPoolContract.java | 12 ++++++------
.../mailbox/events/ReactorRabbitMQChannelPoolTest.java | 1 -
.../main/scala/org/apache/james/event/json/DTOs.scala | 2 +-
.../org/apache/james/event/json/EventSerializer.scala | 10 +++++-----
.../apache/james/mailbox/store/StoreMessageManager.java | 2 +-
.../tools/indexer/ErrorRecoveryIndexationTask.java | 2 +-
.../mailbox/tools/indexer/FullReindexingTask.java | 2 +-
.../tools/indexer/SingleMailboxReindexingTask.java | 2 +-
.../tools/indexer/SingleMessageReindexingTask.java | 2 +-
.../mailbox/tools/indexer/UserReindexingTask.java | 2 +-
.../mpt/imapmailbox/external/james/DockerJamesRule.java | 4 ++++
pom.xml | 4 ++--
.../apache/james/blob/api/BucketBlobStoreContract.java | 2 +-
.../java/org/apache/james/blob/api/BucketNameTest.java | 1 -
.../apache/james/smtp/SmtpAuthorizedAddressesTest.java | 1 -
.../james/server/task/json/JsonTaskSerializer.java | 3 ++-
.../org/apache/james/server/task/json/TestTask.java | 4 ----
.../james/server/task/json/dto/TestTaskDTOModules.java | 2 +-
.../task/eventsourcing/EventSourcingTaskManager.scala | 2 +-
.../task/eventsourcing/RecentTasksProjection.scala | 2 +-
.../task/eventsourcing/ScalaEventSourcingSystem.scala | 2 +-
.../apache/james/task/eventsourcing/TaskAggregate.scala | 2 +-
.../org/apache/james/task/MemoryTaskManagerTest.java | 17 -----------------
.../eventsourcing/EventSourcingTaskManagerTest.java | 1 +
30 files changed, 46 insertions(+), 56 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/02: Fix Checkstyle and Eclipse warnings
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 94aa78983578988ea250d8ee8dc16c61dd36b7d7
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Mon Jul 22 12:25:01 2019 +0200
Fix Checkstyle and Eclipse warnings
---
.../eventstore/cassandra/JsonEventSerializer.java | 1 +
.../eventstore/cassandra/dto/TestEventDTO.java | 1 -
.../eventstore/cassandra/dto/TestEventDTOModules.java | 4 ++--
.../org/apache/james/json/JsonGenericSerializer.java | 2 +-
.../test/java/org/apache/JsonGenericSerializerTest.java | 8 +++++++-
json/src/test/java/org/apache/dto/TestModules.java | 2 ++
.../james/mailbox/events/ChannelPoolContract.java | 12 ++++++------
.../mailbox/events/ReactorRabbitMQChannelPoolTest.java | 1 -
.../apache/james/mailbox/store/StoreMessageManager.java | 2 +-
.../tools/indexer/ErrorRecoveryIndexationTask.java | 2 +-
.../mailbox/tools/indexer/FullReindexingTask.java | 2 +-
.../tools/indexer/SingleMailboxReindexingTask.java | 2 +-
.../tools/indexer/SingleMessageReindexingTask.java | 2 +-
.../mailbox/tools/indexer/UserReindexingTask.java | 2 +-
.../mpt/imapmailbox/external/james/DockerJamesRule.java | 4 ++++
.../apache/james/blob/api/BucketBlobStoreContract.java | 2 +-
.../java/org/apache/james/blob/api/BucketNameTest.java | 1 -
.../apache/james/smtp/SmtpAuthorizedAddressesTest.java | 1 -
.../james/server/task/json/JsonTaskSerializer.java | 3 ++-
.../org/apache/james/server/task/json/TestTask.java | 4 ----
.../james/server/task/json/dto/TestTaskDTOModules.java | 2 +-
.../org/apache/james/task/MemoryTaskManagerTest.java | 17 -----------------
.../eventsourcing/EventSourcingTaskManagerTest.java | 1 +
23 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java b/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java
index acf5976..3f85116 100644
--- a/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java
+++ b/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.java
@@ -48,6 +48,7 @@ public class JsonEventSerializer {
private JsonGenericSerializer<Event, EventDTO> jsonGenericSerializer;
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Inject
public JsonEventSerializer(Set<EventDTOModule> modules) {
jsonGenericSerializer = new JsonGenericSerializer(modules);
diff --git a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTO.java b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTO.java
index d01cd32..6274387 100644
--- a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTO.java
+++ b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTO.java
@@ -19,7 +19,6 @@
package org.apache.james.eventsourcing.eventstore.cassandra.dto;
-import org.apache.james.eventsourcing.Event;
import org.apache.james.eventsourcing.EventId;
import org.apache.james.eventsourcing.TestAggregateId;
import org.apache.james.eventsourcing.TestEvent;
diff --git a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTOModules.java b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTOModules.java
index 966cbed..dc51583 100644
--- a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTOModules.java
+++ b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTOModules.java
@@ -24,7 +24,7 @@ import org.apache.james.eventsourcing.TestEvent;
public interface TestEventDTOModules {
- EventDTOModule TEST_TYPE = EventDTOModule
+ EventDTOModule<?, ?> TEST_TYPE = EventDTOModule
.forEvent(TestEvent.class)
.convertToDTO(TestEventDTO.class)
.toDomainObjectConverter(TestEventDTO::toEvent)
@@ -36,7 +36,7 @@ public interface TestEventDTOModules {
.typeName("TestType")
.withFactory(EventDTOModule::new);
- EventDTOModule OTHER_TEST_TYPE =
+ EventDTOModule<?, ?> OTHER_TEST_TYPE =
EventDTOModule
.forEvent(OtherEvent.class)
.convertToDTO(OtherTestEventDTO.class)
diff --git a/json/src/main/java/org/apache/james/json/JsonGenericSerializer.java b/json/src/main/java/org/apache/james/json/JsonGenericSerializer.java
index aaba17e..3075beb 100644
--- a/json/src/main/java/org/apache/james/json/JsonGenericSerializer.java
+++ b/json/src/main/java/org/apache/james/json/JsonGenericSerializer.java
@@ -60,7 +60,7 @@ public class JsonGenericSerializer<T, U extends DTO> {
private final ObjectMapper objectMapper;
@SafeVarargs
- public static <T, U extends DTO> JsonGenericSerializer of(DTOModule<T, U>... modules) {
+ public static <T, U extends DTO> JsonGenericSerializer<T, U> of(DTOModule<T, U>... modules) {
return new JsonGenericSerializer<>(ImmutableSet.copyOf(modules));
}
diff --git a/json/src/test/java/org/apache/JsonGenericSerializerTest.java b/json/src/test/java/org/apache/JsonGenericSerializerTest.java
index 6334a74..8205553 100644
--- a/json/src/test/java/org/apache/JsonGenericSerializerTest.java
+++ b/json/src/test/java/org/apache/JsonGenericSerializerTest.java
@@ -48,6 +48,7 @@ class JsonGenericSerializerTest {
private static final String FIRST_JSON = "{\"type\":\"first\",\"id\":1,\"time\":\"2016-04-03T02:01+07:00[Asia/Vientiane]\",\"payload\":\"first payload\"}";
private static final String SECOND_JSON = "{\"type\":\"second\",\"id\":\"4a2c853f-7ffc-4ce3-9410-a47e85b3b741\",\"payload\":\"second payload\"}";
+ @SuppressWarnings("unchecked")
@Test
void shouldDeserializeKnownType() throws Exception {
assertThat(JsonGenericSerializer.of(TestModules.FIRST_TYPE)
@@ -55,6 +56,7 @@ class JsonGenericSerializerTest {
.isEqualTo(FIRST);
}
+ @SuppressWarnings("unchecked")
@Test
void shouldThrowWhenDeserializeEventWithMissingType() {
assertThatThrownBy(() -> JsonGenericSerializer.of(TestModules.FIRST_TYPE)
@@ -62,6 +64,7 @@ class JsonGenericSerializerTest {
.isInstanceOf(JsonGenericSerializer.InvalidTypeException.class);
}
+ @SuppressWarnings("unchecked")
@Test
void shouldThrowWhenDeserializeEventWithDuplicatedTypes() {
assertThatThrownBy(() -> JsonGenericSerializer.of(
@@ -81,6 +84,7 @@ class JsonGenericSerializerTest {
@ParameterizedTest
@MethodSource
void serializeShouldHandleAllKnownTypes(BaseType domainObject, String serializedJson) throws Exception {
+ @SuppressWarnings("unchecked")
JsonGenericSerializer<BaseType, DTO> serializer = JsonGenericSerializer.of(
TestModules.FIRST_TYPE,
TestModules.SECOND_TYPE);
@@ -96,7 +100,8 @@ class JsonGenericSerializerTest {
@ParameterizedTest
@MethodSource
void deserializeShouldHandleAllKnownTypes(BaseType domainObject, String serializedJson) throws Exception {
- JsonGenericSerializer serializer = JsonGenericSerializer.of(
+ @SuppressWarnings("unchecked")
+ JsonGenericSerializer<BaseType, DTO> serializer = JsonGenericSerializer.of(
TestModules.FIRST_TYPE,
TestModules.SECOND_TYPE);
@@ -115,6 +120,7 @@ class JsonGenericSerializerTest {
);
}
+ @SuppressWarnings("unchecked")
@Test
void shouldSerializeKnownType() throws Exception {
assertThatJson(JsonGenericSerializer.of(TestModules.FIRST_TYPE)
diff --git a/json/src/test/java/org/apache/dto/TestModules.java b/json/src/test/java/org/apache/dto/TestModules.java
index 6810997..45c5418 100644
--- a/json/src/test/java/org/apache/dto/TestModules.java
+++ b/json/src/test/java/org/apache/dto/TestModules.java
@@ -23,6 +23,7 @@ import org.apache.james.json.DTOModule;
public interface TestModules {
+ @SuppressWarnings("rawtypes")
TestModule FIRST_TYPE = DTOModule
.forDomainObject(FirstDomainObject.class)
.convertToDTO(FirstDTO.class)
@@ -35,6 +36,7 @@ public interface TestModules {
.typeName("first")
.withFactory(TestModule::new);
+ @SuppressWarnings("rawtypes")
TestModule SECOND_TYPE = DTOModule
.forDomainObject(SecondDomainObject.class)
.convertToDTO(SecondDTO.class)
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ChannelPoolContract.java b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ChannelPoolContract.java
index 15ba9c4..8843f28 100644
--- a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ChannelPoolContract.java
+++ b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ChannelPoolContract.java
@@ -50,8 +50,8 @@ interface ChannelPoolContract {
@Test
default void channelPoolShouldReleaseChannelWhenReturnedToThePool() {
ChannelPool channelPool = getChannelPool(2);
- Mono<? extends Channel> channelMono = channelPool.getChannelMono();
- Channel channel1 = borrowChannel(channelPool);
+ channelPool.getChannelMono();
+ borrowChannel(channelPool);
Channel channel2 = borrowChannel(channelPool);
returnToThePool(channelPool, channel2);
@@ -64,8 +64,8 @@ interface ChannelPoolContract {
@Test
default void channelPoolShouldWaitTillTheNextReleaseWhenAllChannelsAreTaken() {
ChannelPool channelPool = getChannelPool(2);
- Mono<? extends Channel> channelMono = channelPool.getChannelMono();
- Channel channel1 = borrowChannel(channelPool);
+ channelPool.getChannelMono();
+ borrowChannel(channelPool);
Channel channel2 = borrowChannel(channelPool);
Mono.delay(Duration.ofSeconds(2))
@@ -81,8 +81,8 @@ interface ChannelPoolContract {
default void channelPoolShouldThrowAfterTimeoutWhenAllChannelsAreTaken() {
ChannelPool channelPool = getChannelPool(2);
Mono<? extends Channel> channelMono = channelPool.getChannelMono();
- Channel channel1 = borrowChannel(channelPool);
- Channel channel2 = borrowChannel(channelPool);
+ borrowChannel(channelPool);
+ borrowChannel(channelPool);
assertThatThrownBy(channelMono::block)
.isInstanceOf(NoSuchElementException.class)
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPoolTest.java b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPoolTest.java
index 0295f5f..3ee78f7 100644
--- a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPoolTest.java
+++ b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPoolTest.java
@@ -35,7 +35,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import com.github.fge.lambdas.Throwing;
import com.rabbitmq.client.Channel;
import reactor.core.publisher.Mono;
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index 3cf9e06..e8c3a80 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -356,7 +356,7 @@ public class StoreMessageManager implements MessageManager {
// component and not the parser itself
// https://issues.apache.org/jira/browse/IMAP-122
final MimeTokenStream parser = getParser(bIn);
- final HeaderImpl header = readHeader(parser);
+ readHeader(parser);
final MaximalBodyDescriptor descriptor = (MaximalBodyDescriptor) parser.getBodyDescriptor();
final MediaType mediaType = getMediaType(descriptor);
final PropertyBuilder propertyBuilder = getPropertyBuilder(descriptor, mediaType.mediaType, mediaType.subType);
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
index 08d6d4e..a7dc60e 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
@@ -43,7 +43,7 @@ import com.google.common.collect.Multimap;
public class ErrorRecoveryIndexationTask implements Task {
private static final String PREVIOUS_FAILURES_INDEXING = "ErrorRecoveryIndexation";
- public static final Function<ErrorRecoveryIndexationTask.Factory, TaskDTOModule> MODULE = (factory) ->
+ public static final Function<ErrorRecoveryIndexationTask.Factory, TaskDTOModule<ErrorRecoveryIndexationTask, ErrorRecoveryIndexationTaskDTO>> MODULE = (factory) ->
DTOModule
.forDomainObject(ErrorRecoveryIndexationTask.class)
.convertToDTO(ErrorRecoveryIndexationTask.ErrorRecoveryIndexationTaskDTO.class)
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
index 0d455a0..c6a8491 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
@@ -41,7 +41,7 @@ public class FullReindexingTask implements Task {
private final ReprocessingContextInformation additionalInformation;
private final ReprocessingContext reprocessingContext;
- public static final Function<FullReindexingTask.Factory, TaskDTOModule> MODULE = (factory) ->
+ public static final Function<FullReindexingTask.Factory, TaskDTOModule<FullReindexingTask, FullReindexingTaskDTO>> MODULE = (factory) ->
DTOModule
.forDomainObject(FullReindexingTask.class)
.convertToDTO(FullReindexingTask.FullReindexingTaskDTO.class)
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
index 17b3910..e76f2f8 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
@@ -62,7 +62,7 @@ public class SingleMailboxReindexingTask implements Task {
public static final String MAILBOX_RE_INDEXING = "mailboxReIndexing";
- public static final Function<Factory, TaskDTOModule> MODULE = (factory) ->
+ public static final Function<Factory, TaskDTOModule<SingleMailboxReindexingTask, SingleMailboxReindexingTaskDTO>> MODULE = (factory) ->
DTOModule
.forDomainObject(SingleMailboxReindexingTask.class)
.convertToDTO(SingleMailboxReindexingTaskDTO.class)
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
index ccf9c4b..83b1be2 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
@@ -42,7 +42,7 @@ public class SingleMessageReindexingTask implements Task {
public static final String MESSAGE_RE_INDEXING = "messageReIndexing";
- public static final Function<SingleMessageReindexingTask.Factory, TaskDTOModule> MODULE = (factory) ->
+ public static final Function<SingleMessageReindexingTask.Factory, TaskDTOModule<SingleMessageReindexingTask, SingleMessageReindexingTask.SingleMessageReindexingTaskDTO>> MODULE = (factory) ->
DTOModule
.forDomainObject(SingleMessageReindexingTask.class)
.convertToDTO(SingleMessageReindexingTask.SingleMessageReindexingTaskDTO.class)
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
index 7d22aa5..af8b329 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
@@ -38,7 +38,7 @@ public class UserReindexingTask implements Task {
public static final String USER_RE_INDEXING = "userReIndexing";
- public static final Function<UserReindexingTask.Factory, TaskDTOModule> MODULE = (factory) ->
+ public static final Function<UserReindexingTask.Factory, TaskDTOModule<UserReindexingTask, UserReindexingTask.UserReindexingTaskDTO>> MODULE = (factory) ->
DTOModule
.forDomainObject(UserReindexingTask.class)
.convertToDTO(UserReindexingTask.UserReindexingTaskDTO.class)
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerJamesRule.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerJamesRule.java
index f7f586c..fc23bfb 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerJamesRule.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/DockerJamesRule.java
@@ -51,8 +51,12 @@ public class DockerJamesRule implements TestRule {
switch (frame.getType()) {
case STDOUT:
LOGGER.info(frame.getUtf8String());
+ break;
case STDERR:
LOGGER.error(frame.getUtf8String());
+ break;
+ case END:
+ break; //Ignore
}
});
}
diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketBlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketBlobStoreContract.java
index a36feb2..5a62c14 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketBlobStoreContract.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketBlobStoreContract.java
@@ -59,7 +59,7 @@ public interface BucketBlobStoreContract {
}
@Test
- default void deleteBucketShouldBeIdempotent(){
+ default void deleteBucketShouldBeIdempotent() {
BlobStore store = testee();
store.save(CUSTOM, SHORT_BYTEARRAY).block();
diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketNameTest.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketNameTest.java
index 179dcbf..f287749 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketNameTest.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketNameTest.java
@@ -19,7 +19,6 @@
package org.apache.james.blob.api;
-import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.jupiter.api.Test;
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
index a59f7a8..82ef848 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -45,7 +45,6 @@ import org.apache.james.utils.SMTPMessageSender;
import org.apache.james.utils.SMTPSendingException;
import org.apache.james.utils.SmtpSendingStep;
import org.junit.After;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
diff --git a/server/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskSerializer.java b/server/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskSerializer.java
index 3f616c2..df38f6d 100644
--- a/server/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskSerializer.java
+++ b/server/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskSerializer.java
@@ -48,8 +48,9 @@ public class JsonTaskSerializer {
private JsonGenericSerializer<Task, TaskDTO> jsonGenericSerializer;
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Inject
- public JsonTaskSerializer(@SuppressWarnings("rawtypes") Set<TaskDTOModule> modules) {
+ public JsonTaskSerializer(Set<TaskDTOModule> modules) {
jsonGenericSerializer = new JsonGenericSerializer(modules);
}
diff --git a/server/task-json/src/test/java/org/apache/james/server/task/json/TestTask.java b/server/task-json/src/test/java/org/apache/james/server/task/json/TestTask.java
index f83ea0b..d551282 100644
--- a/server/task-json/src/test/java/org/apache/james/server/task/json/TestTask.java
+++ b/server/task-json/src/test/java/org/apache/james/server/task/json/TestTask.java
@@ -16,15 +16,11 @@
* ***************************************************************/
package org.apache.james.server.task.json;
-import java.util.Map;
import java.util.Optional;
import org.apache.james.task.Task;
import org.apache.james.task.TaskExecutionDetails;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.collect.ImmutableMap;
-
public class TestTask implements Task {
private final long parameter;
diff --git a/server/task-json/src/test/java/org/apache/james/server/task/json/dto/TestTaskDTOModules.java b/server/task-json/src/test/java/org/apache/james/server/task/json/dto/TestTaskDTOModules.java
index 18ace22..0159598 100644
--- a/server/task-json/src/test/java/org/apache/james/server/task/json/dto/TestTaskDTOModules.java
+++ b/server/task-json/src/test/java/org/apache/james/server/task/json/dto/TestTaskDTOModules.java
@@ -23,7 +23,7 @@ import org.apache.james.server.task.json.TestTask;
public interface TestTaskDTOModules {
- TaskDTOModule TEST_TYPE = TaskDTOModule
+ TaskDTOModule<TestTask, TestTaskDTO> TEST_TYPE = TaskDTOModule
.forTask(TestTask.class)
.convertToDTO(TestTaskDTO.class)
.toDomainObjectConverter(TestTaskDTO::toTask)
diff --git a/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerTest.java b/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerTest.java
index 219a440..50cdf51 100644
--- a/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerTest.java
+++ b/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerTest.java
@@ -19,26 +19,9 @@
package org.apache.james.task;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.awaitility.Duration.ONE_HUNDRED_MILLISECONDS;
-import static org.awaitility.Duration.ONE_SECOND;
-
-import java.util.List;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.assertj.core.api.SoftAssertions;
-import org.awaitility.Awaitility;
-import org.awaitility.Duration;
-import org.awaitility.core.ConditionFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.RegisterExtension;
@ExtendWith(CountDownLatchExtension.class)
class MemoryTaskManagerTest implements TaskManagerContract {
diff --git a/server/task/src/test/java/org/apache/james/task/eventsourcing/EventSourcingTaskManagerTest.java b/server/task/src/test/java/org/apache/james/task/eventsourcing/EventSourcingTaskManagerTest.java
index 16b2b0b..2890ca1 100644
--- a/server/task/src/test/java/org/apache/james/task/eventsourcing/EventSourcingTaskManagerTest.java
+++ b/server/task/src/test/java/org/apache/james/task/eventsourcing/EventSourcingTaskManagerTest.java
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
class EventSourcingTaskManagerTest implements TaskManagerContract {
private EventSourcingTaskManager taskManager;
+
@BeforeEach
void setUp() {
EventStore eventStore = new InMemoryEventStore();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/02: JAMES-2843 Downgrade to Scala 2.12 to
restore compatibility with Eclipse IDE
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6f4428edf374aee34b2789dc2a7fa5d137678d90
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Mon Jul 22 12:12:44 2019 +0200
JAMES-2843 Downgrade to Scala 2.12 to restore compatibility with Eclipse IDE
---
.../json/src/main/scala/org/apache/james/event/json/DTOs.scala | 2 +-
.../scala/org/apache/james/event/json/EventSerializer.scala | 10 +++++-----
pom.xml | 4 ++--
.../james/task/eventsourcing/EventSourcingTaskManager.scala | 2 +-
.../james/task/eventsourcing/RecentTasksProjection.scala | 2 +-
.../james/task/eventsourcing/ScalaEventSourcingSystem.scala | 2 +-
.../org/apache/james/task/eventsourcing/TaskAggregate.scala | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala
index 2b12b4c..ec8bea4 100644
--- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala
+++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/DTOs.scala
@@ -30,7 +30,7 @@ import org.apache.james.mailbox.acl.{ACLDiff => JavaACLDiff}
import org.apache.james.mailbox.model.{MailboxACL, MessageId, MailboxPath => JavaMailboxPath, MessageMetaData => JavaMessageMetaData, Quota => JavaQuota, UpdatedFlags => JavaUpdatedFlags}
import org.apache.james.mailbox.{FlagsBuilder, MessageUid}
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
object DTOs {
diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
index 9331b9a..1837036 100644
--- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
+++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
@@ -36,7 +36,7 @@ import org.apache.james.mailbox.events.{Event => JavaEvent, MessageMoveEvent =>
import org.apache.james.mailbox.model.{MailboxId, MessageId, MessageMoves, QuotaRoot, MailboxACL => JavaMailboxACL, MessageMetaData => JavaMessageMetaData, Quota => JavaQuota}
import play.api.libs.json._
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
private sealed trait Event {
def toJava: JavaEvent
@@ -73,7 +73,7 @@ private object DTO {
user,
path.toJava,
mailboxId,
- new JavaTreeMap[MessageUid, JavaMessageMetaData](added.view.mapValues(_.toJava).toMap.asJava),
+ new JavaTreeMap[MessageUid, JavaMessageMetaData](added.mapValues(_.toJava).toMap.asJava),
eventId)
}
@@ -84,7 +84,7 @@ private object DTO {
user,
path.toJava,
mailboxId,
- expunged.view.mapValues(_.toJava).toMap.asJava,
+ expunged.mapValues(_.toJava).toMap.asJava,
eventId)
}
@@ -161,7 +161,7 @@ private object ScalaConverter {
user = event.getUser,
path = MailboxPath.fromJava(event.getMailboxPath),
mailboxId = event.getMailboxId,
- added = event.getAdded.asScala.view.mapValues(DTOs.MessageMetaData.fromJava).toMap)
+ added = event.getAdded.asScala.mapValues(DTOs.MessageMetaData.fromJava).toMap)
private def toScala(event: JavaExpunged): DTO.Expunged = DTO.Expunged(
eventId = event.getEventId,
@@ -169,7 +169,7 @@ private object ScalaConverter {
user = event.getUser,
path = MailboxPath.fromJava(event.getMailboxPath),
mailboxId = event.getMailboxId,
- expunged = event.getExpunged.asScala.view.mapValues(DTOs.MessageMetaData.fromJava).toMap)
+ expunged = event.getExpunged.asScala.mapValues(DTOs.MessageMetaData.fromJava).toMap)
private def toScala(event: JavaMessageMoveEvent): DTO.MessageMoveEvent = DTO.MessageMoveEvent(
eventId = event.getEventId,
diff --git a/pom.xml b/pom.xml
index 97c16f1..09c7162 100644
--- a/pom.xml
+++ b/pom.xml
@@ -661,8 +661,8 @@
<jackson1.version>1.9.2</jackson1.version>
<logback.version>1.2.3</logback.version>
- <scala.base>2.13</scala.base>
- <scala.version>${scala.base}.0</scala.version>
+ <scala.base>2.12</scala.base>
+ <scala.version>${scala.base}.8</scala.version>
</properties>
diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala
index f10c614..9d6a3fa 100644
--- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala
+++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala
@@ -46,7 +46,7 @@ class EventSourcingTaskManager @Inject @VisibleForTesting private[eventsourcing]
case _ =>
}
- import scala.jdk.CollectionConverters._
+ import scala.collection.JavaConverters._
private val loadHistory: AggregateId => History = eventStore.getEventsOfAggregate _
private val eventSourcingSystem = ScalaEventSourcingSystem(
diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/RecentTasksProjection.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/RecentTasksProjection.scala
index 9f3b85c..fced087 100644
--- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/RecentTasksProjection.scala
+++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/RecentTasksProjection.scala
@@ -25,7 +25,7 @@ import org.apache.james.task.TaskId
class RecentTasksProjection() {
- import scala.jdk.CollectionConverters._
+ import scala.collection.JavaConverters._
private val tasks = new ConcurrentLinkedDeque[TaskId]
diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/ScalaEventSourcingSystem.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/ScalaEventSourcingSystem.scala
index 2271854..16178b3 100644
--- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/ScalaEventSourcingSystem.scala
+++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/ScalaEventSourcingSystem.scala
@@ -22,7 +22,7 @@ import org.apache.james.eventsourcing.eventstore.EventStore
import org.apache.james.eventsourcing.{CommandHandler, EventSourcingSystem, Subscriber}
object ScalaEventSourcingSystem {
- import scala.jdk.CollectionConverters._
+ import scala.collection.JavaConverters._
def apply(handlers: Set[CommandHandler[_]], subscribers: Set[Subscriber], eventStore: EventStore): EventSourcingSystem =
new EventSourcingSystem(handlers.asJava, subscribers.asJava, eventStore)
}
diff --git a/server/task/src/main/scala/org/apache/james/task/eventsourcing/TaskAggregate.scala b/server/task/src/main/scala/org/apache/james/task/eventsourcing/TaskAggregate.scala
index 6b27c5f..5fd5875 100644
--- a/server/task/src/main/scala/org/apache/james/task/eventsourcing/TaskAggregate.scala
+++ b/server/task/src/main/scala/org/apache/james/task/eventsourcing/TaskAggregate.scala
@@ -26,7 +26,7 @@ import org.apache.james.task.Task
import org.apache.james.task.Task.Result
import org.apache.james.task.TaskManager.Status
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
class TaskAggregate private(val aggregateId: TaskAggregateId, private val history: History) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org