Skip to content

Commit 6aed61a

Browse files
committed
code formatting
1 parent 643f3b3 commit 6aed61a

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

app/controllers/AnnotationController.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class AnnotationController @Inject()(
121121
annotation <- provider.provideAnnotation(id, request.identity) ~> NOT_FOUND
122122
result <- info(annotation.typ.toString, id, timestamp)(request)
123123
} yield result
124-
124+
125125
}
126126
}
127127

@@ -138,7 +138,7 @@ class AnnotationController @Inject()(
138138
js <- annotationService.publicWrites(mergedAnnotation, Some(request.identity), Some(restrictions)) ?~> "annotation.write.failed"
139139
} yield JsonOk(js, Messages("annotation.merge.success"))
140140
}
141-
141+
142142
@ApiOperation(hidden = true, value = "")
143143
def mergeWithoutType(id: String, mergedTyp: String, mergedId: String): Action[AnyContent] =
144144
sil.SecuredAction.async { implicit request =>
@@ -217,7 +217,7 @@ class AnnotationController @Inject()(
217217
annotation <- provider.provideAnnotation(id, request.identity) ~> NOT_FOUND
218218
result <- addAnnotationLayer(annotation.typ.toString, id)(request)
219219
} yield result
220-
}
220+
}
221221

222222
@ApiOperation(hidden = true, value = "")
223223
def createExplorational(organizationName: String, dataSetName: String): Action[List[AnnotationLayerParameters]] =
@@ -280,7 +280,7 @@ class AnnotationController @Inject()(
280280
json <- annotationService.publicWrites(updated, Some(request.identity)) ?~> "annotation.write.failed"
281281
} yield JsonOk(json)
282282
}
283-
283+
284284
@ApiOperation(hidden = true, value = "")
285285
def makeHybridWithoutType(id: String, fallbackLayerName: Option[String]): Action[AnyContent] =
286286
sil.SecuredAction.async { implicit request =>

app/models/annotation/AnnotationInformationProvider.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,15 @@ class AnnotationInformationProvider @Inject()(
2727
annotation <- provideAnnotation(annotationIdentifier, userOpt) ?~> "annotation.notFound"
2828
} yield annotation
2929

30-
def provideAnnotation(id: String, userOpt: Option[User])(
31-
implicit ctx: DBAccessContext): Fox[Annotation] =
30+
def provideAnnotation(id: String, userOpt: Option[User])(implicit ctx: DBAccessContext): Fox[Annotation] =
3231
for {
3332
annotationIdValidated <- ObjectId.parse(id)
3433
_annotation <- annotationDAO.findOne(annotationIdValidated) ?~> "annotation.notFound"
3534
typ = if (_annotation._task.isEmpty) AnnotationType.Explorational else AnnotationType.Task
3635
annotationIdentifier = AnnotationIdentifier(typ, annotationIdValidated)
3736
annotation <- provideAnnotation(annotationIdentifier, userOpt) ?~> "annotation.notFound"
3837
} yield annotation
39-
38+
4039
def provideAnnotation(id: String, user: User)(implicit ctx: DBAccessContext): Fox[Annotation] =
4140
provideAnnotation(id, Some(user))
4241

0 commit comments

Comments
 (0)