[GitHub] markusthoemmes closed pull request #3512: wrap filed rev of BulkEntityResult using Option

[GitBox <gi...@apache.org>]

markusthoemmes closed pull request #3512: wrap filed rev of BulkEntityResult using Option
URL: https://github.com/apache/incubator-openwhisk/pull/3512
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/common/scala/src/main/scala/whisk/core/entity/DocInfo.scala b/common/scala/src/main/scala/whisk/core/entity/DocInfo.scala
index fa107a6bde..68b89c506f 100644
--- a/common/scala/src/main/scala/whisk/core/entity/DocInfo.scala
+++ b/common/scala/src/main/scala/whisk/core/entity/DocInfo.scala
@@ -97,11 +97,8 @@ protected[core] case class DocInfo protected[entity] (id: DocId, rev: DocRevisio
  * @param error the error, that occured on trying to put this document into CouchDB
  * @param reason the error message that correspands to the error
  */
-case class BulkEntityResult(id: String,
-                            rev: DocRevision = DocRevision.empty,
-                            error: Option[String],
-                            reason: Option[String]) {
-  def toDocInfo = DocInfo(DocId(id), rev)
+case class BulkEntityResult(id: String, rev: Option[DocRevision], error: Option[String], reason: Option[String]) {
+  def toDocInfo = DocInfo(DocId(id), rev.getOrElse(DocRevision.empty))
 }
 
 protected[core] object DocId extends ArgNormalizer[DocId] {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services