Skip to content

Commit 4c70892

Browse files
authored
Merge pull request #31 from SOFTNETWORK-APP/fix/ddl_dml_scala2_12
Fix compilation bugs with scala 2.12
2 parents a102a29 + 8a5d692 commit 4c70892

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

core/src/main/scala/app/softnetwork/elastic/client/BulkApi.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ import java.time.LocalDate
3131
import java.time.format.DateTimeFormatter
3232
import scala.concurrent.{ExecutionContext, Future}
3333

34+
import scala.language.implicitConversions
35+
3436
/** Bulk API for Elasticsearch clients.
3537
*/
3638
trait BulkApi extends BulkTypes with ElasticClientHelpers {

core/src/main/scala/app/softnetwork/elastic/client/ElasticClientHelpers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ trait ElasticClientHelpers {
239239

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

242-
if (!pattern.matches(trimmed)) {
242+
if (!pattern.pattern.matcher(trimmed).matches()) {
243243
return Some(
244244
ElasticError(
245245
message =

sql/src/main/scala/app/softnetwork/elastic/schema/package.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,8 @@ package object schema {
454454

455455
}
456456

457+
val aliases = esAliases.aliases.map(entry => entry._1 -> implicitly[Value[_]](entry._2.node))
458+
457459
// 4. Final construction of the Table
458460
Table(
459461
name = name,
@@ -463,7 +465,7 @@ package object schema {
463465
mappings = esMappings.options,
464466
settings = esSettings.options,
465467
processors = processors.toSeq,
466-
aliases = esAliases.aliases.map(entry => entry._1 -> entry._2.node)
468+
aliases = aliases
467469
).update()
468470
}
469471
}

0 commit comments

Comments
 (0)