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 <raphael.ouaz...@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-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
