Skip to content

Commit 92e8c1e

Browse files
committed
to fix scala 2.12 compatibility
1 parent 9a2f172 commit 92e8c1e

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,18 +1517,18 @@ ThisBuild / resolvers ++= Seq(
15171517

15181518
// For Elasticsearch 6
15191519
// Using Jest client
1520-
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es6-jest-client" % 0.14.0
1520+
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es6-jest-client" % 0.14.1
15211521
// Or using Rest High Level client
1522-
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es6-rest-client" % 0.14.0
1522+
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es6-rest-client" % 0.14.1
15231523

15241524
// For Elasticsearch 7
1525-
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es7-rest-client" % 0.14.0
1525+
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es7-rest-client" % 0.14.1
15261526

15271527
// For Elasticsearch 8
1528-
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es8-java-client" % 0.14.0
1528+
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es8-java-client" % 0.14.1
15291529

15301530
// For Elasticsearch 9
1531-
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es9-java-client" % 0.14.0
1531+
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es9-java-client" % 0.14.1
15321532
```
15331533

15341534
### **Quick Example**

core/src/main/scala/app/softnetwork/elastic/client/file/package.scala

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ package object file {
646646
val elements = arrayNode.elements().asScala.toList
647647
val hasNestedArrays = elements.exists(hasArrayField)
648648
val hasNestedObjects = elements.exists(hasObjectField)
649-
val maxDepth = elements.map(calculateDepth).maxOption.getOrElse(0)
649+
val maxDepth = elements.map(calculateDepth).reduceOption(_ max _).getOrElse(0)
650650

651651
JsonArrayMetadata(
652652
elementCount = elements.size,
@@ -662,7 +662,7 @@ package object file {
662662
private def hasArrayField(node: JsonNode): Boolean = {
663663
if (node.isArray) return true
664664
if (node.isObject) {
665-
node.fields().asScala.exists(entry => hasArrayField(entry.getValue))
665+
node.properties().asScala.exists(entry => hasArrayField(entry.getValue))
666666
} else {
667667
false
668668
}
@@ -679,9 +679,14 @@ package object file {
679679

680680
private def calculateDepth(node: JsonNode): Int = {
681681
if (node.isArray) {
682-
1 + node.elements().asScala.map(calculateDepth).maxOption.getOrElse(0)
682+
1 + node.elements().asScala.map(calculateDepth).reduceOption(_ max _).getOrElse(0)
683683
} else if (node.isObject) {
684-
1 + node.fields().asScala.map(e => calculateDepth(e.getValue)).maxOption.getOrElse(0)
684+
1 + node
685+
.properties()
686+
.asScala
687+
.map(e => calculateDepth(e.getValue))
688+
.reduceOption(_ max _)
689+
.getOrElse(0)
685690
} else {
686691
0
687692
}

0 commit comments

Comments
 (0)