From 6bad2fb63e4cf8c5a4b47d8f19021ad59592d2f5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 26 Oct 2023 19:20:16 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.7.15 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 94db025ae..e3e24511a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.14" +version = "3.7.15" maxColumn = 120 align.preset = most align.multiline = false From b88124837b4632490181bbe02aa345a0292a9808 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 26 Oct 2023 19:20:41 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.15 Executed command: scalafmt --non-interactive --- .../elasticsearch/IndexPatternValidator.scala | 57 ++++++++++--------- .../zio/elasticsearch/MultiIndex.scala | 1 - 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/library/src/main/scala-3/zio/elasticsearch/IndexPatternValidator.scala b/modules/library/src/main/scala-3/zio/elasticsearch/IndexPatternValidator.scala index fa55ff1f0..1b04c9b21 100644 --- a/modules/library/src/main/scala-3/zio/elasticsearch/IndexPatternValidator.scala +++ b/modules/library/src/main/scala-3/zio/elasticsearch/IndexPatternValidator.scala @@ -21,34 +21,35 @@ import org.apache.commons.lang3.StringUtils.{equalsAny, startsWithAny} import zio.Chunk import zio.prelude.{AssertionError, Validator} -object IndexPatternValidator extends Validator[String]( pattern => { - def containsAny(string: String, params: Chunk[String]): Boolean = - params.exists(StringUtils.contains(string, _)) +object IndexPatternValidator + extends Validator[String](pattern => { + def containsAny(string: String, params: Chunk[String]): Boolean = + params.exists(StringUtils.contains(string, _)) - def isValid(pattern: String): Boolean = - pattern.toLowerCase == pattern && - !startsWithAny(pattern, "+") && - pattern.nonEmpty && - !containsAny(string = pattern, params = Chunk("?", "\"", "<", ">", "|", " ", ",", "#", ":")) && - !equalsAny(pattern, ".", "..") && - pattern.getBytes().length <= 255 + def isValid(pattern: String): Boolean = + pattern.toLowerCase == pattern && + !startsWithAny(pattern, "+") && + pattern.nonEmpty && + !containsAny(string = pattern, params = Chunk("?", "\"", "<", ">", "|", " ", ",", "#", ":")) && + !equalsAny(pattern, ".", "..") && + pattern.getBytes().length <= 255 - if (isValid(pattern)) { - Right(()) - } else { - Left( - AssertionError.Failure( - s""" - | - Must be lower case only - | - Cannot include \\, /, ?, ", <, >, |, ` `(space character), `,`(comma), #. - | - Cannot include ":"(since 7.0). - | - Cannot be empty - | - Cannot start with +. - | - Cannot be `.` or `..`. - | - Cannot be longer than 255 bytes (note it is bytes, so multi-byte characters will count towards the 255 limit faster). - | - Patterns starting with . are deprecated, except for hidden indices and internal indices managed by plugins. - |""".stripMargin + if (isValid(pattern)) { + Right(()) + } else { + Left( + AssertionError.Failure( + s""" + | - Must be lower case only + | - Cannot include \\, /, ?, ", <, >, |, ` `(space character), `,`(comma), #. + | - Cannot include ":"(since 7.0). + | - Cannot be empty + | - Cannot start with +. + | - Cannot be `.` or `..`. + | - Cannot be longer than 255 bytes (note it is bytes, so multi-byte characters will count towards the 255 limit faster). + | - Patterns starting with . are deprecated, except for hidden indices and internal indices managed by plugins. + |""".stripMargin + ) ) - ) - } - }) + } + }) diff --git a/modules/library/src/main/scala-3/zio/elasticsearch/MultiIndex.scala b/modules/library/src/main/scala-3/zio/elasticsearch/MultiIndex.scala index 24bbaef97..3bd41278c 100644 --- a/modules/library/src/main/scala-3/zio/elasticsearch/MultiIndex.scala +++ b/modules/library/src/main/scala-3/zio/elasticsearch/MultiIndex.scala @@ -63,4 +63,3 @@ object MultiIndex { def patterns(pattern: IndexPattern, patterns: IndexPattern*): MultiIndex = MultiIndex(Chunk.fromIterable(pattern.toString +: patterns.map(IndexPattern.unwrap))) } - From 9c9a5db8884fb315c43338f4ed02773a33f20da8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 26 Oct 2023 19:20:41 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.7.15' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..d8c742e15 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.15 +b88124837b4632490181bbe02aa345a0292a9808