From 18af933c20915119355e6e09b908322bad954627 Mon Sep 17 00:00:00 2001 From: Himani Arora Date: Mon, 20 Feb 2017 15:42:23 +0530 Subject: [PATCH] [Minor] Code refactored (#504) * Minor code refactoring done * minor code refactoring * Reverted a missing parantheses. --- .../persistence/cassandra/CassandraReadSideHandler.scala | 4 +++- .../javadsl/persistence/PersistentEntityActor.scala | 8 ++++---- .../internal/javadsl/persistence/ReadSideActor.scala | 2 +- .../com/lightbend/lagom/javadsl/pubsub/PubSubRef.scala | 2 +- .../lagom/scaladsl/pubsub/ClusteredPubSubSpec.scala | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/persistence-cassandra/scaladsl/src/main/scala/com/lightbend/lagom/internal/scaladsl/persistence/cassandra/CassandraReadSideHandler.scala b/persistence-cassandra/scaladsl/src/main/scala/com/lightbend/lagom/internal/scaladsl/persistence/cassandra/CassandraReadSideHandler.scala index dded948607..28c513db51 100644 --- a/persistence-cassandra/scaladsl/src/main/scala/com/lightbend/lagom/internal/scaladsl/persistence/cassandra/CassandraReadSideHandler.scala +++ b/persistence-cassandra/scaladsl/src/main/scala/com/lightbend/lagom/internal/scaladsl/persistence/cassandra/CassandraReadSideHandler.scala @@ -90,7 +90,9 @@ private[cassandra] final class CassandraAutoReadSideHandler[Event <: AggregateEv override protected def invoke(handler: Handler[Event], element: EventStreamElement[Event]): Future[immutable.Seq[BoundStatement]] = { for { - statements <- (handler.asInstanceOf[EventStreamElement[Event] => Future[immutable.Seq[BoundStatement]]].apply(element)) + statements <- handler + .asInstanceOf[EventStreamElement[Event] => Future[immutable.Seq[BoundStatement]]] + .apply(element) } yield statements :+ offsetDao.bindSaveOffset(element.offset) } diff --git a/persistence/javadsl/src/main/scala/com/lightbend/lagom/internal/javadsl/persistence/PersistentEntityActor.scala b/persistence/javadsl/src/main/scala/com/lightbend/lagom/internal/javadsl/persistence/PersistentEntityActor.scala index e6d4dfa769..8eae5a363d 100644 --- a/persistence/javadsl/src/main/scala/com/lightbend/lagom/internal/javadsl/persistence/PersistentEntityActor.scala +++ b/persistence/javadsl/src/main/scala/com/lightbend/lagom/internal/javadsl/persistence/PersistentEntityActor.scala @@ -92,16 +92,16 @@ private[lagom] class PersistentEntityActor[C, E, S]( def initEmpty(): Unit = if (!initialized) { - val inital = entity.initialBehavior(Optional.empty[S]) - entity.internalSetCurrentBehavior(inital) + val initial = entity.initialBehavior(Optional.empty[S]) + entity.internalSetCurrentBehavior(initial) initialized = true } { case SnapshotOffer(_, snapshot) => if (!initialized) { - val inital = entity.initialBehavior(Optional.ofNullable(snapshot.asInstanceOf[S])) - entity.internalSetCurrentBehavior(inital) + val initial = entity.initialBehavior(Optional.ofNullable(snapshot.asInstanceOf[S])) + entity.internalSetCurrentBehavior(initial) initialized = true } diff --git a/persistence/javadsl/src/main/scala/com/lightbend/lagom/internal/javadsl/persistence/ReadSideActor.scala b/persistence/javadsl/src/main/scala/com/lightbend/lagom/internal/javadsl/persistence/ReadSideActor.scala index c6f6633620..d4311524e5 100644 --- a/persistence/javadsl/src/main/scala/com/lightbend/lagom/internal/javadsl/persistence/ReadSideActor.scala +++ b/persistence/javadsl/src/main/scala/com/lightbend/lagom/internal/javadsl/persistence/ReadSideActor.scala @@ -70,7 +70,7 @@ private[lagom] class ReadSideActor[Event <: AggregateEvent[Event]]( case Done => val handler = processorFactory().buildHandler() - handler.prepare(tag).toScala.map(Start(_)) pipeTo self + handler.prepare(tag).toScala.map(Start) pipeTo self context become active(handler, tag) case Status.Failure(e) => diff --git a/pubsub/javadsl/src/main/scala/com/lightbend/lagom/javadsl/pubsub/PubSubRef.scala b/pubsub/javadsl/src/main/scala/com/lightbend/lagom/javadsl/pubsub/PubSubRef.scala index 3c587e6b9d..19c781c230 100644 --- a/pubsub/javadsl/src/main/scala/com/lightbend/lagom/javadsl/pubsub/PubSubRef.scala +++ b/pubsub/javadsl/src/main/scala/com/lightbend/lagom/javadsl/pubsub/PubSubRef.scala @@ -115,6 +115,6 @@ final class PubSubRef[T](val topic: TopicId[T], mediator: ActorRef, system: Acto protected def writeReplace(): AnyRef = throw new NotSerializableException(s"${getClass.getName} is not serializable. Send the entityId instead.") - override def toString(): String = s"PubSubRef($topic)" + override def toString: String = s"PubSubRef($topic)" } diff --git a/pubsub/scaladsl/src/multi-jvm/scala/com/lightbend/lagom/scaladsl/pubsub/ClusteredPubSubSpec.scala b/pubsub/scaladsl/src/multi-jvm/scala/com/lightbend/lagom/scaladsl/pubsub/ClusteredPubSubSpec.scala index 7682751f30..dfca95c861 100644 --- a/pubsub/scaladsl/src/multi-jvm/scala/com/lightbend/lagom/scaladsl/pubsub/ClusteredPubSubSpec.scala +++ b/pubsub/scaladsl/src/multi-jvm/scala/com/lightbend/lagom/scaladsl/pubsub/ClusteredPubSubSpec.scala @@ -113,7 +113,7 @@ class ClusteredPubSubSpec extends MultiNodeSpec(ClusteredPubSubConfig) enterBarrier("subscription-established-2") ref2.publisher.runWith( - Source(List("a", "b", "c", "d", "e").map(Notification(_)))) + Source(List("a", "b", "c", "d", "e").map(Notification))) } enterBarrier("after-2")