Merge pull request #140 from ahjohannessen/wip-fix-review

core: fix review feedback
EventStore · Apr 8, 2019 · d1af1ac · d1af1ac
2 parents e337b80 + 42287ff
commit d1af1ac
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 51 deletions.
diff --git a/core/src/main/scala/eventstore/core/SystemError.scala b/core/src/main/scala/eventstore/core/SystemError.scala
@@ -6,69 +6,69 @@ import scala.util.control.NoStackTrace
 
 trait SystemError extends RuntimeException with NoStackTrace with Serializable
 
-@SerialVersionUID(1L) case object OperationTimedOut extends SystemError
+case object OperationTimedOut extends SystemError
 
 sealed trait ServerError extends SystemError
 
-@SerialVersionUID(1L) case object BadRequest       extends ServerError
-@SerialVersionUID(1L) case object NotAuthenticated extends ServerError
+case object BadRequest       extends ServerError
+case object NotAuthenticated extends ServerError
 
 sealed trait OperationError extends ServerError
 
 object OperationError {
-  @SerialVersionUID(1L) case object PrepareTimeout       extends OperationError
-  @SerialVersionUID(1L) case object CommitTimeout        extends OperationError
-  @SerialVersionUID(1L) case object ForwardTimeout       extends OperationError
-  @SerialVersionUID(1L) case object WrongExpectedVersion extends OperationError
-  @SerialVersionUID(1L) case object StreamDeleted        extends OperationError
-  @SerialVersionUID(1L) case object InvalidTransaction   extends OperationError
-  @SerialVersionUID(1L) case object AccessDenied         extends OperationError
+  case object PrepareTimeout       extends OperationError
+  case object CommitTimeout        extends OperationError
+  case object ForwardTimeout       extends OperationError
+  case object WrongExpectedVersion extends OperationError
+  case object StreamDeleted        extends OperationError
+  case object InvalidTransaction   extends OperationError
+  case object AccessDenied         extends OperationError
 }
 
 sealed trait ReadEventError extends ServerError
 
 object ReadEventError {
-  @SerialVersionUID(1L) case object EventNotFound  extends ReadEventError
-  @SerialVersionUID(1L) case object StreamNotFound extends ReadEventError
-  @SerialVersionUID(1L) case object StreamDeleted  extends ReadEventError
-  @SerialVersionUID(1L) case object AccessDenied   extends ReadEventError
-  @SerialVersionUID(1L) final case class Error(message: Option[String]) extends ReadEventError {
+  case object EventNotFound  extends ReadEventError
+  case object StreamNotFound extends ReadEventError
+  case object StreamDeleted  extends ReadEventError
+  case object AccessDenied   extends ReadEventError
+  final case class Error(message: Option[String]) extends ReadEventError {
     override def toString = s"ReadEventError($message)"
   }
 }
 
 sealed trait ReadStreamEventsError extends ServerError
 
 object ReadStreamEventsError {
-  @SerialVersionUID(1L) case object StreamNotFound extends ReadStreamEventsError
-  @SerialVersionUID(1L) case object StreamDeleted  extends ReadStreamEventsError
-  @SerialVersionUID(1L) case object AccessDenied   extends ReadStreamEventsError
-  @SerialVersionUID(1L) final case class Error(message: Option[String]) extends ReadStreamEventsError {
+  case object StreamNotFound extends ReadStreamEventsError
+  case object StreamDeleted  extends ReadStreamEventsError
+  case object AccessDenied   extends ReadStreamEventsError
+  final case class Error(message: Option[String]) extends ReadStreamEventsError {
     override def toString = s"ReadStreamEventsError($message)"
   }
 }
 
 sealed trait ReadAllEventsError extends ServerError
 
 object ReadAllEventsError {
-  @SerialVersionUID(1L) case object AccessDenied extends ReadAllEventsError
-  @SerialVersionUID(1L) final case class Error(message: Option[String]) extends ReadAllEventsError {
+  case object AccessDenied extends ReadAllEventsError
+  final case class Error(message: Option[String]) extends ReadAllEventsError {
     override def toString = s"ReadAllEventsError($message)"
   }
 }
 
-@SerialVersionUID(1L) final case class NotHandled(reason: NotHandled.Reason) extends ServerError {
+final case class NotHandled(reason: NotHandled.Reason) extends ServerError {
   override def toString = s"NotHandled($reason)"
 }
 
 object NotHandled {
   sealed trait Reason
 
-  @SerialVersionUID(1L) case object NotReady                       extends Reason
-  @SerialVersionUID(1L) case object TooBusy                        extends Reason
-  @SerialVersionUID(1L) final case class NotMaster(mi: MasterInfo) extends Reason
+  case object NotReady                       extends Reason
+  case object TooBusy                        extends Reason
+  final case class NotMaster(mi: MasterInfo) extends Reason
 
-  @SerialVersionUID(1L) final case class MasterInfo(
+  final case class MasterInfo(
     tcpAddress:       InetSocketAddress,
     httpAddress:      InetSocketAddress,
     tcpSecureAddress: Option[InetSocketAddress]
@@ -82,45 +82,45 @@ object NotHandled {
 sealed trait SubscriptionDropped extends ServerError
 
 object SubscriptionDropped {
-  @SerialVersionUID(1L) case object AccessDenied                  extends SubscriptionDropped
-  @SerialVersionUID(1L) case object NotFound                      extends SubscriptionDropped
-  @SerialVersionUID(1L) case object PersistentSubscriptionDeleted extends SubscriptionDropped
-  @SerialVersionUID(1L) case object SubscriberMaxCountReached     extends SubscriptionDropped
+  case object AccessDenied                  extends SubscriptionDropped
+  case object NotFound                      extends SubscriptionDropped
+  case object PersistentSubscriptionDeleted extends SubscriptionDropped
+  case object SubscriberMaxCountReached     extends SubscriptionDropped
 }
 
 sealed trait ScavengeError extends SystemError
 
 object ScavengeError {
-  @SerialVersionUID(1L) case object InProgress   extends ScavengeError
-  @SerialVersionUID(1L) case object Unauthorized extends ScavengeError
+  case object InProgress   extends ScavengeError
+  case object Unauthorized extends ScavengeError
 }
 
 sealed trait CreatePersistentSubscriptionError extends SystemError
 
 object CreatePersistentSubscriptionError {
-  @SerialVersionUID(1L) case object AccessDenied  extends CreatePersistentSubscriptionError
-  @SerialVersionUID(1L) case object AlreadyExists extends CreatePersistentSubscriptionError
-  @SerialVersionUID(1L) final case class Error(message: Option[String]) extends CreatePersistentSubscriptionError {
+  case object AccessDenied  extends CreatePersistentSubscriptionError
+  case object AlreadyExists extends CreatePersistentSubscriptionError
+  final case class Error(message: Option[String]) extends CreatePersistentSubscriptionError {
     override def toString = s"CreatePersistentSubscriptionError($message)"
   }
 }
 
 sealed trait UpdatePersistentSubscriptionError extends SystemError
 
 object UpdatePersistentSubscriptionError {
-  @SerialVersionUID(1L) case object AccessDenied extends UpdatePersistentSubscriptionError
-  @SerialVersionUID(1L) case object DoesNotExist extends UpdatePersistentSubscriptionError
-  @SerialVersionUID(1L) final case class Error(message: Option[String]) extends UpdatePersistentSubscriptionError {
+  case object AccessDenied extends UpdatePersistentSubscriptionError
+  case object DoesNotExist extends UpdatePersistentSubscriptionError
+  final case class Error(message: Option[String]) extends UpdatePersistentSubscriptionError {
     override def toString = s"UpdatePersistentSubscriptionError($message)"
   }
 }
 
 sealed trait DeletePersistentSubscriptionError extends SystemError
 
 object DeletePersistentSubscriptionError {
-  @SerialVersionUID(1L) case object AccessDenied extends DeletePersistentSubscriptionError
-  @SerialVersionUID(1L) case object DoesNotExist extends DeletePersistentSubscriptionError
-  @SerialVersionUID(1L) final case class Error(message: Option[String]) extends DeletePersistentSubscriptionError {
+  case object AccessDenied extends DeletePersistentSubscriptionError
+  case object DoesNotExist extends DeletePersistentSubscriptionError
+  final case class Error(message: Option[String]) extends DeletePersistentSubscriptionError {
     override def toString = s"DeletePersistentSubscriptionError($message)"
   }
 }
diff --git a/core/src/main/scala/eventstore/core/operations/CreatePersistentSubscriptionInspection.scala b/core/src/main/scala/eventstore/core/operations/CreatePersistentSubscriptionInspection.scala
@@ -11,9 +11,9 @@ private[eventstore] final case class CreatePersistentSubscriptionInspection(out:
 
   def decision(error: CreatePersistentSubscriptionError) = {
     val result = error match {
-      case AccessDenied  => new AccessDeniedException(s"Read access denied for $streamId")
-      case AlreadyExists => new InvalidOperationException(s"Subscription group ${out.groupName} on stream $streamId already exists")
-      case Error(msg)    => new ServerErrorException(msg.orNull)
+      case AccessDenied  => AccessDeniedException(s"Read access denied for $streamId")
+      case AlreadyExists => InvalidOperationException(s"Subscription group ${out.groupName} on stream $streamId already exists")
+      case e: Error      => ServerErrorException(e.message.getOrElse(e.toString))
     }
     Fail(result)
   }

diff --git a/core/src/main/scala/eventstore/core/operations/DeletePersistentSubscriptionInspection.scala b/core/src/main/scala/eventstore/core/operations/DeletePersistentSubscriptionInspection.scala
@@ -11,9 +11,9 @@ private[eventstore] final case class DeletePersistentSubscriptionInspection(out:
 
   def decision(error: DeletePersistentSubscriptionError) = {
     val result = error match {
-      case AccessDenied => new AccessDeniedException(s"Write access denied for stream $streamId")
-      case DoesNotExist => new InvalidOperationException(s"Subscription group ${out.groupName} on stream $streamId does not exist")
-      case Error(msg)   => new ServerErrorException(msg.orNull)
+      case AccessDenied => AccessDeniedException(s"Write access denied for stream $streamId")
+      case DoesNotExist => InvalidOperationException(s"Subscription group ${out.groupName} on stream $streamId does not exist")
+      case e: Error     => ServerErrorException(e.message.getOrElse(e.toString))
     }
     Fail(result)
   }

diff --git a/core/src/main/scala/eventstore/core/operations/ReadAllEventsInspection.scala b/core/src/main/scala/eventstore/core/operations/ReadAllEventsInspection.scala
@@ -10,7 +10,7 @@ private[eventstore] final case class ReadAllEventsInspection(out: ReadAllEvents)
 
   def decision(error: ReadAllEventsError) = {
     error match {
-      case Error(msg)   => Fail(ServerErrorException(msg.orNull))
+      case e: Error     => Fail(ServerErrorException(e.message.getOrElse(e.toString)))
       case AccessDenied => Fail(AccessDeniedException(s"Read access denied for $streamId"))
     }
   }

diff --git a/core/src/main/scala/eventstore/core/operations/ReadEventInspection.scala b/core/src/main/scala/eventstore/core/operations/ReadEventInspection.scala
@@ -13,7 +13,7 @@ private[eventstore] final case class ReadEventInspection(out: ReadEvent)
       case EventNotFound  => EventNotFoundException(streamId, out.eventNumber)
       case StreamNotFound => StreamNotFoundException(streamId)
       case StreamDeleted  => StreamDeletedException(s"Read failed due to $streamId has been deleted")
-      case Error(msg)     => ServerErrorException(msg.orNull)
+      case e: Error       => ServerErrorException(e.message.getOrElse(e.toString))
       case AccessDenied   => AccessDeniedException(s"Read access denied for $streamId")
     }
 

diff --git a/core/src/main/scala/eventstore/core/operations/ReadStreamEventsInspection.scala b/core/src/main/scala/eventstore/core/operations/ReadStreamEventsInspection.scala
@@ -12,7 +12,7 @@ private[eventstore] final case class ReadStreamEventsInspection(out: ReadStreamE
     val result = error match {
       case StreamNotFound => StreamNotFoundException(streamId)
       case StreamDeleted  => StreamDeletedException(s"Read failed due to $streamId has been deleted")
-      case Error(msg)     => ServerErrorException(msg.orNull)
+      case e: Error       => ServerErrorException(e.message.getOrElse(e.toString))
       case AccessDenied   => AccessDeniedException(s"Read access denied for $streamId")
     }
 

diff --git a/core/src/main/scala/eventstore/core/operations/UpdatePersistentSubscriptionInspection.scala b/core/src/main/scala/eventstore/core/operations/UpdatePersistentSubscriptionInspection.scala
@@ -15,7 +15,7 @@ private[eventstore] final case class UpdatePersistentSubscriptionInspection(out:
     val result = error match {
       case AccessDenied => AccessDeniedException(s"Write access denied for stream $streamId")
       case DoesNotExist => InvalidOperationException(s"Subscription group ${out.groupName} on stream $streamId does not exist")
-      case Error(msg)   => ServerErrorException(msg.orNull)
+      case e: Error     => ServerErrorException(e.message.getOrElse(e.toString))
     }
     Fail(result)
   }