Support Elasticsearch 8.x

.github/workflows/ci.yml

@@ -38,6 +38,7 @@ jobs:
       matrix:
         java: [ "11", "17" ]
         scala: [ "2.12.18", "2.13.12", "3.3.1" ]
+        elasticsearch: ["7.x", "8.x"]
     steps:
       - name: Checkout current branch
         uses: actions/[email protected]
@@ -54,7 +55,7 @@ jobs:
       - name: Run tests
         run: ./sbt ++${{ matrix.scala }}! library/test
       - name: Run test container
-        run: docker-compose -f docker-compose.yml up -d
+        run: docker-compose -f docker/elasticsearch-${{ matrix.elasticsearch }}.yml up -d
       - name: Run integration tests
         run: ./sbt ++${{ matrix.scala }}! integration/test
 

README.md

@@ -15,7 +15,7 @@ The library depends on sttp as an HTTP client for executing requests, and other
 The following versions are supported:
 - Scala: 2.12, 2.13 and 3
 - ZIO: 2
-- Elasticsearch: 7
+- Elasticsearch: 7, 8
 - JVM 11+
 
 ## Installation

docker/elasticsearch-8.x.yml

@@ -0,0 +1,12 @@
+version: '3.8'
+
+services:
+  elasticsearch:
+    image: elasticsearch:8.12.0
+    container_name: zio-elasticsearch-8-test
+    ports:
+      - "9200:9200"
+    environment:
+      discovery.type: "single-node"
+      xpack.security.enabled: "false"
+      ES_JAVA_OPTS: "-Xms512m -Xmx512m"

docs/overview/index.md

@@ -20,5 +20,5 @@ The library depends on sttp as an HTTP client for executing requests, and other
 The following versions are supported:
 - Scala: 2.12, 2.13 and 3
 - ZIO: 2
-- Elasticsearch: 7
+- Elasticsearch: 7, 8
 - JVM 11+

modules/library/src/main/scala/zio/elasticsearch/executor/response/Hit.scala

@@ -23,8 +23,6 @@ import zio.json.{DeriveJsonDecoder, JsonDecoder, jsonField}
 private[elasticsearch] final case class Hit(
   @jsonField("_index")
   index: String,
-  @jsonField("_type")
-  `type`: String,
   @jsonField("_id")
   id: String,
   @jsonField("_score")