diff --git a/core/src/main/scala/app/softnetwork/elastic/client/BulkApi.scala b/core/src/main/scala/app/softnetwork/elastic/client/BulkApi.scala index c396d50a..6973c95e 100644 --- a/core/src/main/scala/app/softnetwork/elastic/client/BulkApi.scala +++ b/core/src/main/scala/app/softnetwork/elastic/client/BulkApi.scala @@ -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 { diff --git a/core/src/main/scala/app/softnetwork/elastic/client/ElasticClientHelpers.scala b/core/src/main/scala/app/softnetwork/elastic/client/ElasticClientHelpers.scala index 23f82066..3747ecfd 100644 --- a/core/src/main/scala/app/softnetwork/elastic/client/ElasticClientHelpers.scala +++ b/core/src/main/scala/app/softnetwork/elastic/client/ElasticClientHelpers.scala @@ -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 = diff --git a/sql/src/main/scala/app/softnetwork/elastic/schema/package.scala b/sql/src/main/scala/app/softnetwork/elastic/schema/package.scala index 897b8392..304bda0c 100644 --- a/sql/src/main/scala/app/softnetwork/elastic/schema/package.scala +++ b/sql/src/main/scala/app/softnetwork/elastic/schema/package.scala @@ -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, @@ -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() } }