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 rc...@apache.org on 2020/08/10 02:47:51 UTC
[james-project] 21/23: [Refactoring] Drop scala warnings
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1b38871043843719f237fcacda9cb0ed1fca54fb
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Tue Jul 28 13:21:01 2020 +0200
[Refactoring] Drop scala warnings
---
.../json/src/main/scala/org/apache/james/event/json/DTOs.scala | 4 ++--
.../main/scala/org/apache/james/event/json/EventSerializer.scala | 4 ++--
pom.xml | 8 +++++++-
.../apache/james/server/blob/deduplication/GCPropertiesTest.scala | 2 +-
.../james/jmap/rfc8621/contract/SessionRoutesContract.scala | 2 +-
.../org/apache/james/jmap/http/BasicAuthenticationStrategy.scala | 8 +++++---
.../src/main/scala/org/apache/james/jmap/json/Serializer.scala | 3 +++
.../test/scala/org/apache/james/jmap/http/SessionRoutesTest.scala | 2 +-
.../james/task/eventsourcing/EventSourcingTaskManager.scala | 2 +-
9 files changed, 23 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 97318f8..22e52e8 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
@@ -116,8 +116,8 @@ object DTOs {
def fromJavaFlags(flags: JavaMailFlags): Flags = {
Flags(
- flags.getSystemFlags.map(javaFlagToSystemFlag),
- flags.getUserFlags.map(UserFlag))
+ flags.getSystemFlags.toIndexedSeq.map(javaFlagToSystemFlag),
+ flags.getUserFlags.toIndexedSeq.map(UserFlag))
}
private def javaFlagToSystemFlag(flag: JavaMailFlags.Flag): SystemFlag = flag match {
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 4c7a2a2..a75c75c 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
@@ -74,7 +74,7 @@ private object DTO {
user,
path.toJava,
mailboxId,
- new JavaTreeMap[MessageUid, JavaMessageMetaData](added.mapValues(_.toJava).toMap.asJava),
+ new JavaTreeMap[MessageUid, JavaMessageMetaData](added.view.mapValues(_.toJava).toMap.asJava),
eventId)
}
@@ -85,7 +85,7 @@ private object DTO {
user,
path.toJava,
mailboxId,
- expunged.mapValues(_.toJava).toMap.asJava,
+ expunged.view.mapValues(_.toJava).toMap.asJava,
eventId)
}
diff --git a/pom.xml b/pom.xml
index 75851f8..4d148b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2777,7 +2777,13 @@
</execution>
</executions>
<configuration>
- <addArgs>-Xlog-implicits</addArgs>
+ <args>
+ <arg>-Xlog-implicits</arg>
+ <arg>-feature</arg>
+ <arg>-unchecked</arg>
+ <arg>-deprecation</arg>
+ <arg>-explaintypes</arg>
+ </args>
</configuration>
</plugin>
<plugin>
diff --git a/server/blob/blob-gc/src/test/scala/org/apache/james/server/blob/deduplication/GCPropertiesTest.scala b/server/blob/blob-gc/src/test/scala/org/apache/james/server/blob/deduplication/GCPropertiesTest.scala
index d2ca107..0cff5df 100644
--- a/server/blob/blob-gc/src/test/scala/org/apache/james/server/blob/deduplication/GCPropertiesTest.scala
+++ b/server/blob/blob-gc/src/test/scala/org/apache/james/server/blob/deduplication/GCPropertiesTest.scala
@@ -34,7 +34,7 @@ object Generators {
// 1% of the time, the generation id is incremented by 2
// i.e. (0, 0, 0, 2, 3, 3, 4, 5, 5, 5, 5)
def nextGenerationsGen(previousGeneration: Generation): Gen[Generation] =
- Gen.frequency((80, Gen.const(0l)), (19, Gen.const(1l)), (1, Gen.const(2l))).map(previousGeneration.next)
+ Gen.frequency((80, Gen.const(0L)), (19, Gen.const(1L)), (1, Gen.const(2L))).map(previousGeneration.next)
val externalIDGen: Gen[ExternalID] = Gen.uuid.map(uuid => ExternalID(uuid.toString))
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
index eaf2089..274d660 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
@@ -116,7 +116,7 @@ trait SessionRoutesContract {
@Test
@Tag(CategoryTags.BASIC_FEATURE)
- def getShouldReturnCorrectSession() {
+ def getShouldReturnCorrectSession(): Unit = {
val sessionJson: String = `given`()
.when()
.header(ACCEPT.toString, ACCEPT_RFC8621_VERSION_HEADER)
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/BasicAuthenticationStrategy.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/BasicAuthenticationStrategy.scala
index 52d9127..0f2d2ca 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/BasicAuthenticationStrategy.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/BasicAuthenticationStrategy.scala
@@ -26,13 +26,15 @@ import eu.timepit.refined.auto._
import eu.timepit.refined.refineV
import eu.timepit.refined.string.MatchesRegex
import javax.inject.Inject
+
import org.apache.james.core.Username
import org.apache.james.jmap.http.UserCredential._
import org.apache.james.mailbox.{MailboxManager, MailboxSession}
import org.apache.james.user.api.UsersRepository
import org.slf4j.LoggerFactory
+
import reactor.core.publisher.Mono
-import reactor.core.scala.publisher.SFlux
+import reactor.core.scala.publisher.{SFlux, SMono}
import reactor.netty.http.server.HttpServerRequest
import scala.compat.java8.StreamConverters._
@@ -91,13 +93,13 @@ class BasicAuthenticationStrategy @Inject()(val usersRepository: UsersRepository
val mailboxManager: MailboxManager) extends AuthenticationStrategy {
override def createMailboxSession(httpRequest: HttpServerRequest): Mono[MailboxSession] = {
- SFlux.fromStream(() => authHeaders(httpRequest).toScala[Stream])
+ SMono.defer(() => SFlux.fromIterable(authHeaders(httpRequest).toScala[Iterable])
.map(parseUserCredentials)
.handle(publishNext)
.filter(isValid)
.map(_.username)
.map(mailboxManager.createSystemSession)
- .singleOrEmpty()
+ .singleOrEmpty())
.asJava()
}
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/Serializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/Serializer.scala
index 614c6fa..1e3f5f5 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/Serializer.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/Serializer.scala
@@ -23,6 +23,7 @@ import java.io.InputStream
import java.net.URL
import javax.inject.Inject
+
import org.apache.james.core.{Domain, Username}
import org.apache.james.jmap.mail.{DelegatedNamespace, Ids, IsSubscribed, Mailbox, MailboxGetRequest, MailboxGetResponse, MailboxNamespace, MailboxRights, MayAddItems, MayCreateChild, MayDelete, MayReadItems, MayRemoveItems, MayRename, MaySetKeywords, MaySetSeen, MaySubmit, NotFound, PersonalNamespace, Properties, Quota, QuotaId, QuotaRoot, Quotas, Right, Rights, SortOrder, TotalEmails, TotalThreads, UnreadEmails, UnreadThreads, Value}
import org.apache.james.jmap.model
@@ -31,10 +32,12 @@ import org.apache.james.jmap.model.Invocation.{Arguments, MethodCallId, MethodNa
import org.apache.james.jmap.model.{Account, Invocation, Session, _}
import org.apache.james.mailbox.Role
import org.apache.james.mailbox.model.{MailboxACL, MailboxId}
+
import play.api.libs.functional.syntax._
import play.api.libs.json._
import scala.collection.{Seq => LegacySeq}
+import scala.language.implicitConversions
import scala.util.Try
class Serializer @Inject() (mailboxIdFactory: MailboxId.Factory) {
diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionRoutesTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionRoutesTest.scala
index 47e89ee..d1f4a77 100644
--- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionRoutesTest.scala
+++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionRoutesTest.scala
@@ -89,7 +89,7 @@ class SessionRoutesTest extends AnyFlatSpec with BeforeAndAfter with Matchers {
"get" should "return OK status" in {
RestAssured.when()
.get
- .then
+ .`then`
.statusCode(HttpStatus.SC_OK)
.contentType(ContentType.JSON)
}
diff --git a/server/task/task-memory/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala b/server/task/task-memory/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala
index d9e6fa6..340eed6 100644
--- a/server/task/task-memory/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala
+++ b/server/task/task-memory/src/main/scala/org/apache/james/task/eventsourcing/EventSourcingTaskManager.scala
@@ -112,7 +112,7 @@ class EventSourcingTaskManager @Inject @VisibleForTesting private[eventsourcing]
case _ => false
}
.next()
- .then(details)
+ .`then`(details)
Flux.merge(findEvent, details)
.subscribeOn(Schedulers.elastic)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org