Lots of small Play 2.9/Scala 2.13/Java 15+ deprecation fixes

EHRI · Oct 15, 2024 · 61f0a9b · 61f0a9b
1 parent e5e2cce
commit 61f0a9b
Show file tree

Hide file tree

Showing 131 changed files with 347 additions and 305 deletions.
diff --git a/build.sbt b/build.sbt
@@ -151,7 +151,6 @@ val commonSettings = Seq(
   // tests. Additionally, set the path to the test config
   // file as an env var.
   Test / javaOptions ++= Seq(
-    "-XX:+CMSClassUnloadingEnabled",
     s"-Dconfig.file=${(LocalRootProject / baseDirectory).value / "conf" / "test.conf"}",
     s"-Dlogger.file=${(LocalRootProject / baseDirectory).value / "conf" / "logback-play-dev.xml"}"
   ),
@@ -163,6 +162,7 @@ val commonSettings = Seq(
     "-unchecked",
     "-deprecation",
     "-Wconf:cat=unused-imports&site=.*views.html.*:s", // Silence import warnings in Play html files
+    "-Wconf:cat=unused-imports&site=.*views.txt.*:s", // Silence import warnings in Play txt files
   ),
 
   resolvers ++= additionalResolvers,
@@ -346,7 +346,7 @@ lazy val xslt = Project(appName + "-xslt", file("modules/xslt"))
     "org.slf4j" % "slf4j-api" % "2.0.13",
 
     // We need JSON here...
-    "com.typesafe.play" %% "play-json" % "2.10.0",
+    "com.typesafe.play" %% "play-json" % "2.10.6",
 
     // Saxon for XSLT transformation
     "net.sf.saxon" % "Saxon-HE" % "10.2",

diff --git a/modules/admin/app/controllers/admin/AdminAssets.scala b/modules/admin/app/controllers/admin/AdminAssets.scala
@@ -1,11 +1,12 @@
 package controllers.admin
 
 import play.api.http.HttpErrorHandler
-import javax.inject.{Inject, Singleton}
 
+import javax.inject.{Inject, Singleton}
 import controllers.AssetsMetadata
+import play.api.Environment
 
 @Singleton
-case class AdminAssets @Inject()(errorHandler: HttpErrorHandler, meta: AssetsMetadata) extends controllers.AssetsBuilder(errorHandler, meta)
+case class AdminAssets @Inject()(errorHandler: HttpErrorHandler, meta: AssetsMetadata, env: Environment) extends controllers.AssetsBuilder(errorHandler, meta, env)
 
 
diff --git a/modules/admin/app/models/IngestParams.scala b/modules/admin/app/models/IngestParams.scala
@@ -38,7 +38,7 @@ object PayloadHandle {
 
   implicit val _writes: Writes[PayloadHandle] = Writes {
     case FilePayload(f) => Json.toJson(f.map(_.toAbsolutePath.toString))
-    case UrlMapPayload(urls) => Json.toJson(urls.mapValues(_.toString))
+    case UrlMapPayload(urls) => Json.toJson(urls.view.mapValues(_.toString).toMap)
   }
 }
 

diff --git a/modules/admin/app/services/datasets/SqlImportDatasetService.scala b/modules/admin/app/services/datasets/SqlImportDatasetService.scala
@@ -97,16 +97,16 @@ case class SqlImportDatasetService @Inject()(db: Database, actorSystem: ActorSys
     db.withTransaction { implicit conn =>
       val inserts = info.map { item =>
         Seq[NamedParameter](
-          Symbol("repo_id") -> repoId,
-          Symbol("id") -> item.id,
-          Symbol("name") -> item.name,
-          Symbol("type") -> item.src,
-          Symbol("content_type") -> item.contentType,
-          Symbol("item_id") -> item.fonds.filter(_.trim.nonEmpty),
-          Symbol("nest") -> item.nest,
-          Symbol("sync") -> item.sync,
-          Symbol("status") -> item.status,
-          Symbol("comments") -> item.notes
+          "repo_id" -> repoId,
+          "id" -> item.id,
+          "name" -> item.name,
+          "type" -> item.src,
+          "content_type" -> item.contentType,
+          "item_id" -> item.fonds.filter(_.trim.nonEmpty),
+          "nest" -> item.nest,
+          "sync" -> item.sync,
+          "status" -> item.status,
+          "comments" -> item.notes
         )
       }
       val q = """INSERT INTO import_dataset (repo_id, id, name, type, content_type, item_id, sync, status, comments)

diff --git a/modules/admin/app/services/harvesting/WSOaiPmhClient.scala b/modules/admin/app/services/harvesting/WSOaiPmhClient.scala
@@ -178,7 +178,7 @@ case class WSOaiPmhClient @Inject()(ws: WSClient, cache: AsyncCacheApi)(implicit
         .map { r =>
           checkError(r)
           val xml = r.xml
-          val idents = (xml \ verb \ "header").seq.map { node =>
+          val idents = (xml \ verb \ "header").map { node =>
             val del = (node \@ "status") == "deleted"
             val name = (node \ "identifier").text
             name -> del

diff --git a/modules/admin/app/services/ingest/WSIngestService.scala b/modules/admin/app/services/ingest/WSIngestService.scala
@@ -137,7 +137,7 @@ case class WSIngestService @Inject()(
     // host and we really shouldn't do this!
     val propFile: Option[Path] = data.params.properties match {
       case FileProperties(f) => f.map { propTmp =>
-        import scala.collection.JavaConverters._
+        import scala.jdk.CollectionConverters._
         val readTmp = Files.createTempFile(s"ingest", ".properties")
         propTmp.moveTo(readTmp, replace = true)
         val perms = Set(

diff --git a/modules/admin/app/views/admin/authoritativeSet/create.scala.html b/modules/admin/app/views/admin/authoritativeSet/create.scala.html
@@ -1,12 +1,11 @@
 @(f: Form[AuthoritativeSetF], vf: Form[Seq[String]], fieldHints: forms.FormFieldHints, usersAndGroups: UsersAndGroups, action: Call)(implicit userOpt: Option[UserProfile], req: RequestHeader, conf: AppConfig, messages: Messages, md: MarkdownRenderer, prefs: SessionPrefs, flash: Flash)
 
-@** @implicitField = @{ views.html.helper.FieldConstructor(formHelpers.fieldTemplate.f) }*@
 @implicitField = @{views.admin.Helpers.fieldConstructorWithHints(Some(fieldHints))}
 
 @views.html.admin.layout.rightSidebarWithType(Messages("authoritativeSet.create"), EntityType.AuthoritativeSet, scripts = formHelpers.formJs(f)) {
 	@helper.form(action = action) {
         @formHelpers.csrfToken()
-        @formHelpers.lineInput(f(""), Entity.IDENTIFIER, 'autocomplete -> "off")
+        @formHelpers.lineInput(f(""), Entity.IDENTIFIER, attrs._autocomplete -> "off")
         @views.html.admin.authoritativeSet.form(None, f, fieldHints)
         @views.html.admin.permissions.visibilityForm(vf, usersAndGroups)
 

diff --git a/modules/admin/app/views/admin/authoritativeSet/listItem.scala.html b/modules/admin/app/views/admin/authoritativeSet/listItem.scala.html
@@ -14,7 +14,7 @@
     }
 
     @views.html.common.childCount(item) { count =>
-        @views.html.admin.helpers.linkToWithBody(item, fragment = s"#${item.id}-child-item-search", attributes = Seq('class -> "child-items-inline-load collapsed")) {
+        @views.html.admin.helpers.linkToWithBody(item, fragment = s"#${item.id}-child-item-search", attributes = Seq(attrs._class -> "child-items-inline-load collapsed")) {
             <i class="fa fa-fw fa-plus-square-o" aria-hidden="true"></i>
             @Messages("authoritativeSet.childCount", count)
         }

diff --git a/modules/admin/app/views/admin/common/pathRemapForm.scala.html b/modules/admin/app/views/admin/common/pathRemapForm.scala.html
@@ -3,7 +3,7 @@
 @formHelpers.csrfToken()
 @views.html.formHelpers.globalErrors(form)
 
-@helper.inputText(form("path-prefix"), 'class -> "form-control", '_label -> Messages("admin.utils.renameItems.pathPrefix"))
+@helper.inputText(form("path-prefix"), attrs._class -> "form-control", attrs._label -> Messages("admin.utils.renameItems.pathPrefix"))
 
 @html
 

diff --git a/modules/admin/app/views/admin/concept/broader.scala.html b/modules/admin/app/views/admin/concept/broader.scala.html
@@ -41,7 +41,7 @@
 	@helper.form(action = action) {
         @formHelpers.csrfToken()
         @defining("cvocConcept") { implicit fieldPrefix =>
-            @formHelpers.choiceInput(f(""), "broaderTerms", item.broaderTerms.map(t => t.id -> t.toStringLang).toList, 'multiple -> true, '_select2 -> false)
+            @formHelpers.choiceInput(f(""), "broaderTerms", item.broaderTerms.map(t => t.id -> t.toStringLang).toList, attrs._multiple -> true, attrs._select2 -> false)
         }
 
         @formHelpers.submitButtonWithLogMessageInput(Messages("cvocConcept.update.submit"), cancel = views.admin.Helpers.linkToOpt(item))

diff --git a/modules/admin/app/views/admin/concept/descriptionForm.scala.html b/modules/admin/app/views/admin/concept/descriptionForm.scala.html
@@ -10,8 +10,8 @@
 @views.html.admin.common.descriptionForm(desc, cls = "concept-description-form inline-element") {
     <a class="close remove-inline-element" title="@Messages("item.field.remove")" aria-label="@Messages("item.field.remove")" tabindex="-1" href="#">&times;</a>
     <div class="concept-description-form-elements">
-        @choiceInput(desc, LANG_CODE, views.Helpers.languagePairList, '_blank -> true)
-        @choiceInput(desc, IDENTIFIER, views.Helpers.scriptPairList, '_blank -> true)
+        @choiceInput(desc, LANG_CODE, views.Helpers.languagePairList, attrs._blank -> true)
+        @choiceInput(desc, IDENTIFIER, views.Helpers.scriptPairList, attrs._blank -> true)
         @formHelpers.lineInput(desc, PREFLABEL)
         @formHelpers.inlineNameSet(desc, ALTLABEL)
         @formHelpers.inlineNameSet(desc, HIDDENLABEL)

diff --git a/modules/admin/app/views/admin/concept/form.scala.html b/modules/admin/app/views/admin/concept/form.scala.html
@@ -5,7 +5,7 @@
 
 @implicitField = @{ views.html.helper.FieldConstructor(formHelpers.fieldTemplate.f) }
 
-@lineInput(f(""), Entity.IDENTIFIER, 'autocomplete -> "off")
+@lineInput(f(""), Entity.IDENTIFIER, attrs._autocomplete -> "off")
 
 @defining("cvocConcept") { implicit prefix =>
     @defining(Some(fieldHints)) { implicit implicitFieldHints =>

diff --git a/modules/admin/app/views/admin/country/create.scala.html b/modules/admin/app/views/admin/country/create.scala.html
@@ -5,7 +5,7 @@
 @views.html.admin.layout.rightSidebarWithType(Messages("country.create"), EntityType.Country, scripts = formHelpers.formJs(f)) {
     @helper.form(action = action) {
         @formHelpers.csrfToken()
-        @formHelpers.lineInput(f(""), Entity.IDENTIFIER, 'autocomplete -> "off")
+        @formHelpers.lineInput(f(""), Entity.IDENTIFIER, attrs._autocomplete -> "off")
         @views.html.admin.country.form(None, f, fieldHints)
         @views.html.admin.permissions.visibilityForm(vf, usersAndGroups)
 

diff --git a/modules/admin/app/views/admin/country/list.scala.html b/modules/admin/app/views/admin/country/list.scala.html
@@ -19,7 +19,7 @@ <h5>
 } {
     @views.html.admin.common.sidebarActions { user =>
         @views.html.admin.common.sidebarAction(user.hasPermission(ContentTypes.Country, PermissionType.Create)) {
-            <a href="@controllers.countries.routes.Countries.create">
+            <a href="@controllers.countries.routes.Countries.create()">
 				<i class="fa fa-fw fa-plus-square-o"></i>
 				@Messages("country.create")
 			</a>

diff --git a/modules/admin/app/views/admin/country/search.scala.html b/modules/admin/app/views/admin/country/search.scala.html
@@ -7,7 +7,7 @@
     }
     @views.html.admin.common.sidebarActions { user =>
         @views.html.admin.common.sidebarAction(user.hasPermission(ContentTypes.Country, PermissionType.Create)) {
-            <a href="@controllers.countries.routes.Countries.create">@Messages("country.create")</a>
+            <a href="@controllers.countries.routes.Countries.create()">@Messages("country.create")</a>
         }
     }
     @common.search.facetList(result.facetClasses, action)

diff --git a/modules/admin/app/views/admin/country/searchItem.scala.html b/modules/admin/app/views/admin/country/searchItem.scala.html
@@ -9,7 +9,7 @@
         </div>
     }
     @views.html.common.childCount(item) { count =>
-        @views.html.admin.helpers.linkToWithBody(item, fragment = s"#${item.id}-child-item-search", attributes = Seq('class -> "child-items-inline-load collapsed")) {
+        @views.html.admin.helpers.linkToWithBody(item, fragment = s"#${item.id}-child-item-search", attributes = Seq(attrs._class -> "child-items-inline-load collapsed")) {
             <i class="fa fa-fw fa-plus-square-o" aria-hidden="true"></i>
             @Messages("country.childCount", count)
         }

diff --git a/modules/admin/app/views/admin/deleteChildren.scala.html b/modules/admin/app/views/admin/deleteChildren.scala.html
@@ -24,7 +24,7 @@
                 <p class="alert alert-warning">
                 @Messages("item.deleteChildren.confirmPhrase", Html(Messages("item.deleteChildren.confirm", children.total)))
                 </p>
-                    @formHelpers.lineInput(f(""), ANSWER, 'autocomplete -> "off")
+                    @formHelpers.lineInput(f(""), ANSWER, attrs._autocomplete -> "off")
                 </div>
 
                 @formHelpers.submitButtonWithLogMessageInput(

diff --git a/modules/admin/app/views/admin/documentaryUnit/create.scala.html b/modules/admin/app/views/admin/documentaryUnit/create.scala.html
@@ -23,7 +23,7 @@
     @helper.form(action = action) {
         @formHelpers.csrfToken()
         @defining(Some(fieldHints)) { implicit implicitFieldHints =>
-            @formHelpers.lineInput(f(""), Entity.IDENTIFIER, 'autocomplete -> "off")
+            @formHelpers.lineInput(f(""), Entity.IDENTIFIER, attrs._autocomplete -> "off")
         }
         @views.html.admin.documentaryUnit.form(f, fieldHints)
 

diff --git a/modules/admin/app/views/admin/documentaryUnit/descriptionForm.scala.html b/modules/admin/app/views/admin/documentaryUnit/descriptionForm.scala.html
@@ -9,9 +9,9 @@
 @implicitField = @{ views.html.helper.FieldConstructor(formHelpers.fieldTemplate.f) }
 
 @views.html.admin.common.descriptionForm(desc) {
-    @choiceInput(desc, LANG_CODE, views.Helpers.languagePairList, '_blank -> true)
+    @choiceInput(desc, LANG_CODE, views.Helpers.languagePairList, attrs._blank -> true)
     @defining("description") { implicit fieldPrefix =>
-        @lineInput(desc, IDENTIFIER, 'autocomplete -> "off")
+        @lineInput(desc, IDENTIFIER, attrs._autocomplete -> "off")
     }
 
     @descriptionFormSection(IDENTITY_AREA) {
@@ -24,7 +24,7 @@
 
             @inlineDateSet(desc, DATES)
             @hiddenInputSet(desc(UNIT_DATES))
-            @enumChoiceInput(desc, LEVEL_OF_DESCRIPTION, LevelOfDescription, '_blank -> true)
+            @enumChoiceInput(desc, LEVEL_OF_DESCRIPTION, LevelOfDescription, attrs._blank -> true)
             @hiddenInputSet(desc(PHYSICAL_LOCATION))
             @textInput(desc, EXTENT_MEDIUM)
         }
@@ -51,8 +51,8 @@
         @defining(desc(CONDITIONS_AREA)) { desc =>
             @textInput(desc, ACCESS_COND)
             @textInput(desc, REPROD_COND)
-            @choiceInput(desc, LANG_MATERIALS, views.Helpers.languagePairList, 'multiple -> true, 'size -> 1)
-            @choiceInput(desc, SCRIPT_MATERIALS, views.Helpers.scriptPairList, 'multiple -> true, 'size -> 1)
+            @choiceInput(desc, LANG_MATERIALS, views.Helpers.languagePairList, attrs._multiple -> true, attrs._size -> 1)
+            @choiceInput(desc, SCRIPT_MATERIALS, views.Helpers.scriptPairList, attrs._multiple -> true, attrs._size -> 1)
             @textInput(desc, PHYSICAL_CHARS)
             @inlineTextSet(desc, FINDING_AIDS, rows = 4)
         }

diff --git a/modules/admin/app/views/admin/documentaryUnit/form.scala.html b/modules/admin/app/views/admin/documentaryUnit/form.scala.html
@@ -16,13 +16,13 @@
 
         @formHelpers.descriptionFormSection(ADMINISTRATION_AREA) {
             @defining(PUB_STATUS) { implicit fieldPrefix =>
-                @formHelpers.enumChoiceInput(f(""), PUB_STATUS, PublicationStatus, '_blank -> true)
+                @formHelpers.enumChoiceInput(f(""), PUB_STATUS, PublicationStatus, attrs._blank -> true)
             }
             @defining(COPYRIGHT) { implicit fieldPrefix =>
-                @formHelpers.enumChoiceInput(f(""), COPYRIGHT, CopyrightStatus, '_blank -> true)
+                @formHelpers.enumChoiceInput(f(""), COPYRIGHT, CopyrightStatus, attrs._blank -> true)
             }
             @defining(SCOPE) { implicit fieldPrefix =>
-                @formHelpers.enumChoiceInput(f(""), SCOPE, Scope, '_blank -> true)
+                @formHelpers.enumChoiceInput(f(""), SCOPE, Scope, attrs._blank -> true)
             }
         }
     }

diff --git a/modules/admin/app/views/admin/documentaryUnit/inlineListItem.scala.html b/modules/admin/app/views/admin/documentaryUnit/inlineListItem.scala.html
@@ -7,7 +7,7 @@ <h5>@views.html.admin.helpers.linkTo(item)</h5>
     </ul>
 }
 @views.html.common.childCount(item) { count =>
-    @views.html.helpers.link(controllers.units.routes.DocumentaryUnits.get(item.id), 'class -> "child-items-inline-load collapsed") {
+    @views.html.helpers.link(controllers.units.routes.DocumentaryUnits.get(item.id), attrs._class -> "child-items-inline-load collapsed") {
         <i class="fa fa-fw fa-plus-square-o" aria-hidden="true"></i>
         @Messages("documentaryUnit.childCount", count)
     }

diff --git a/modules/admin/app/views/admin/documentaryUnit/rename.scala.html b/modules/admin/app/views/admin/documentaryUnit/rename.scala.html
@@ -29,7 +29,7 @@
             </div>
         }
         @formHelpers.csrfToken()
-        @formHelpers.lineInput(f(""), Entity.IDENTIFIER, '_label -> Messages("item.rename.identifier"), 'autofocus -> "autofocus")
+        @formHelpers.lineInput(f(""), Entity.IDENTIFIER, attrs._label -> Messages("item.rename.identifier"), attrs._autofocus -> "autofocus")
 
         @formHelpers.submitButtonWithLogMessageInput(Messages("item.rename.submit"), cancel = views.admin.Helpers.linkToOpt(item))
 	}

diff --git a/modules/admin/app/views/admin/documentaryUnit/searchItemBody.scala.html b/modules/admin/app/views/admin/documentaryUnit/searchItemBody.scala.html
@@ -37,7 +37,7 @@
 }
 
 @views.html.common.childCount(item) { count =>
-    @views.html.admin.helpers.linkToWithBody(item, fragment = s"#${item.id}-child-item-search", attributes = Seq('class -> "child-items-inline-load collapsed")) {
+    @views.html.admin.helpers.linkToWithBody(item, fragment = s"#${item.id}-child-item-search", attributes = Seq(attrs._class -> "child-items-inline-load collapsed")) {
         <i class="fa fa-fw fa-plus-square-o" aria-hidden="true"></i>
         @Messages("documentaryUnit.childCount", count)
     }

diff --git a/modules/admin/app/views/admin/group/form.scala.html b/modules/admin/app/views/admin/group/form.scala.html
@@ -3,7 +3,7 @@
 @implicitField = @{ views.html.helper.FieldConstructor(formHelpers.fieldTemplate.f) }
 
 @defining("group") { implicit prefix =>
-    @formHelpers.lineInput(f(""), Entity.IDENTIFIER, 'autocomplete -> "off")
+    @formHelpers.lineInput(f(""), Entity.IDENTIFIER, attrs._autocomplete -> "off")
     @formHelpers.lineInput(f(""), GroupF.NAME)
     @formHelpers.textInput(f(""), GroupF.DESCRIPTION)
 }
diff --git a/modules/admin/app/views/admin/group/search.scala.html b/modules/admin/app/views/admin/group/search.scala.html
@@ -7,7 +7,7 @@
     }
     @views.html.admin.common.sidebarActions { user =>
         @views.html.admin.common.sidebarAction(user.hasPermission(ContentTypes.Group, PermissionType.Create)) {
-            <a href="@controllers.groups.routes.Groups.create">
+            <a href="@controllers.groups.routes.Groups.create()">
                 <i class="fa fa-fw fa-plus-square-o"></i>
                 @Messages("group.create")
             </a>

diff --git a/modules/admin/app/views/admin/group/show.scala.html b/modules/admin/app/views/admin/group/show.scala.html
@@ -74,7 +74,7 @@ <h4>
 
     @views.html.admin.common.sidebarActions { user =>
         @views.html.admin.common.sidebarAction(user.hasPermission(ContentTypes.Group, PermissionType.Create)) {
-            <a href="@controllers.groups.routes.Groups.create">@Messages("group.create")</a>
+            <a href="@controllers.groups.routes.Groups.create()">@Messages("group.create")</a>
         }
         @views.html.admin.common.sidebarAction(user.hasPermission(ContentTypes.Group, PermissionType.Update)) {
             <a href="@controllers.groups.routes.Groups.update(item.id)">@Messages("group.edit")</a>

diff --git a/modules/admin/app/views/admin/helpers/linkToWithFragment.scala.html b/modules/admin/app/views/admin/helpers/linkToWithFragment.scala.html
@@ -1,5 +1,5 @@
 @(item: Model, fragment: String, htmlContent: Html = Html(""), textContent: Option[String] = None, attributes: Seq[(Symbol,String)] = Seq.empty)(implicit req: RequestHeader, messages: Messages)
 
-<a href="@{views.admin.Helpers.linkTo(item) + fragment}" @play.api.templates.PlayMagic.toHtmlArgs(attributes.toMap) >
+<a href="@views.admin.Helpers.linkTo(item)@fragment" @play.api.templates.PlayMagic.toHtmlArgs(attributes.toMap) >
     @{if(htmlContent.body.trim.isEmpty) textContent.getOrElse(item.toStringLang) else htmlContent}
 </a>
diff --git a/modules/admin/app/views/admin/historicalAgent/descriptionForm.scala.html b/modules/admin/app/views/admin/historicalAgent/descriptionForm.scala.html
@@ -7,10 +7,10 @@
 @implicitField = @{ views.html.helper.FieldConstructor(formHelpers.fieldTemplate.f) }
 
 @views.html.admin.common.descriptionForm(desc) {
-    @choiceInput(desc, LANG_CODE, views.Helpers.languagePairList, '_blank -> true)
+    @choiceInput(desc, LANG_CODE, views.Helpers.languagePairList, attrs._blank -> true)
 
     @descriptionFormSection(IDENTITY_AREA) {
-        @enumChoiceInput(desc, ENTITY_TYPE, HistoricalAgentType, '_blank -> true)
+        @enumChoiceInput(desc, ENTITY_TYPE, HistoricalAgentType, attrs._blank -> true)
         @lineInput(desc, AUTHORIZED_FORM_OF_NAME)
         @inlineNameSet(desc, PARALLEL_FORMS_OF_NAME)
         @inlineNameSet(desc, OTHER_FORMS_OF_NAME)

diff --git a/modules/admin/app/views/admin/historicalAgent/form.scala.html b/modules/admin/app/views/admin/historicalAgent/form.scala.html
@@ -7,7 +7,7 @@
 
 @defining("historicalAgent") { implicit fieldPrefix =>
     @defining(Some(fieldHints)) { implicit implicitFieldHints =>
-        @lineInput(f(""), IDENTIFIER, 'autocomplete -> "off")
+        @lineInput(f(""), IDENTIFIER, attrs._autocomplete -> "off")
 
         @helper.repeat(f("descriptions"), min = math.max(f("descriptions").indexes.length, 1)) { desc =>
             @descriptionForm(desc)

diff --git a/modules/admin/app/views/admin/ingest/ingest.scala.html b/modules/admin/app/views/admin/ingest/ingest.scala.html
@@ -96,7 +96,7 @@
 
         @common.itemDetails {
             @defining("ingest") { implicit prefix =>
-                @helper.form(action = action, 'enctype -> "multipart/form-data", 'id -> "ingest-form") {
+                @helper.form(action = action, attrs._enctype -> "multipart/form-data", attrs._id -> "ingest-form") {
                     @formHelpers.csrfToken()
                     @formHelpers.hiddenInput(form(SCOPE_TYPE).copy(value = Some(scope.isA.toString)))
                     @formHelpers.hiddenInput(form(SCOPE).copy(value = Some(scope.id)))
@@ -114,7 +114,7 @@ <h2>@Messages("ingest.header", fonds.getOrElse(scope).toStringLang)</h2>
                             @formHelpers.checkbox(f, ALLOW_UPDATE)
                             @formHelpers.checkbox(f, TOLERANT)
                             @formHelpers.checkbox(f, USE_SOURCE_ID)
-                            @formHelpers.choiceInput(f, LANG, views.Helpers.languagePairList, '_blank -> true)
+                            @formHelpers.choiceInput(f, LANG, views.Helpers.languagePairList, attrs._blank -> true)
                         </fieldset>
 
                         <fieldset>
@@ -135,8 +135,8 @@ <h2>@Messages("ingest.header", fonds.getOrElse(scope).toStringLang)</h2>
                         }
 
                         <fieldset>
-                            @formHelpers.textInput(f, LOG, 'required -> true)
-                            @formHelpers.fileInput(f, DATA_FILE, 'required -> true)
+                            @formHelpers.textInput(f, LOG, attrs._required -> true)
+                            @formHelpers.fileInput(f, DATA_FILE, attrs._required -> true)
                         </fieldset>
 
                         @formHelpers.checkbox(f, COMMIT)

diff --git a/modules/admin/app/views/admin/link/linkForm.scala.html b/modules/admin/app/views/admin/link/linkForm.scala.html
@@ -10,8 +10,8 @@
     @defining("link") { implicit fieldPrefix =>
         @defining(form("")) { desc =>
             @formHelpers.textInput(desc, DESCRIPTION)
-            @formHelpers.enumChoiceInput(desc, LINK_TYPE, LinkType, '_blank -> true)
-            @formHelpers.enumChoiceInput(desc, LINK_FIELD, LinkField, '_blank -> true)
+            @formHelpers.enumChoiceInput(desc, LINK_TYPE, LinkType, attrs._blank -> true)
+            @formHelpers.enumChoiceInput(desc, LINK_FIELD, LinkField, attrs._blank -> true)
             @formHelpers.inlineDateSet(desc, DATES)
         }
     }