Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import java.time.LocalDate
import java.time.format.DateTimeFormatter
import scala.concurrent.{ExecutionContext, Future}

import scala.language.implicitConversions

/** Bulk API for Elasticsearch clients.
*/
trait BulkApi extends BulkTypes with ElasticClientHelpers {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ trait ElasticClientHelpers {

val pattern = "^[a-zA-Z0-9._\\-@]+$".r

if (!pattern.matches(trimmed)) {
if (!pattern.pattern.matcher(trimmed).matches()) {
return Some(
ElasticError(
message =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,8 @@ package object schema {

}

val aliases = esAliases.aliases.map(entry => entry._1 -> implicitly[Value[_]](entry._2.node))

// 4. Final construction of the Table
Table(
name = name,
Expand All @@ -463,7 +465,7 @@ package object schema {
mappings = esMappings.options,
settings = esSettings.options,
processors = processors.toSeq,
aliases = esAliases.aliases.map(entry => entry._1 -> entry._2.node)
aliases = aliases
).update()
}
}
Expand Down