Elasticsearch 9.0.1 support (#513)

* Support Elasticsearch 9.0.1
Update Lucene version
Update Gradle version
Ignore config for vscode

* Adapt tests to Elasticsearch 9.0.1

* Fix formatting

* Fixes following tests failures

* build

Author: cjolif

.github/workflows/release.yml

@@ -6,53 +6,53 @@ name: Tag and publish a release
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - "v*.*.*"
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set release version Name
-      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-    - name: Set up JDK 17.0
-      uses: actions/setup-java@v1
-      with:
-        java-version: 17.0
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build
-    - name: Rename build assets
-      run: mv ./build/distributions/ltr-*.zip ./ltr-plugin-${{ env.RELEASE_VERSION }}.zip
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ env.RELEASE_VERSION }}
-        release_name: Release ${{ env.RELEASE_VERSION }}
-        draft: false
-        prerelease: false
-    - name: Upload Release Asset
-      id: upload-release-asset 
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}         
-        asset_path: ./ltr-plugin-${{ env.RELEASE_VERSION }}.zip
-        asset_name: ltr-plugin-${{ env.RELEASE_VERSION }}.zip
-        asset_content_type: application/zip
-    - name: Publish to Maven Central
-      env:
-        SONATYPE_REPO_URL: ${{ secrets.SONATYPE_REPO_URL }}
-        SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
-        SONATYPE_PASS: ${{ secrets.SONATYPE_PASS }}
-        GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
-        GPG_SIGNING_PASS: ${{ secrets.GPG_SIGNING_PASS }}
-        OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
-        OSSRH_TOKEN_PASSSWORD: ${{ secrets.OSSRH_TOKEN_PASSSWORD }}
+      - uses: actions/checkout@v2
+      - name: Set release version Name
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Set up JDK 21.0
+        uses: actions/setup-java@v1
+        with:
+          java-version: 21.0
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Rename build assets
+        run: mv ./build/distributions/ltr-*.zip ./ltr-plugin-${{ env.RELEASE_VERSION }}.zip
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_VERSION }}
+          release_name: Release ${{ env.RELEASE_VERSION }}
+          draft: false
+          prerelease: false
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./ltr-plugin-${{ env.RELEASE_VERSION }}.zip
+          asset_name: ltr-plugin-${{ env.RELEASE_VERSION }}.zip
+          asset_content_type: application/zip
+      - name: Publish to Maven Central
+        env:
+          SONATYPE_REPO_URL: ${{ secrets.SONATYPE_REPO_URL }}
+          SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+          SONATYPE_PASS: ${{ secrets.SONATYPE_PASS }}
+          GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+          GPG_SIGNING_PASS: ${{ secrets.GPG_SIGNING_PASS }}
+          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          OSSRH_TOKEN_PASSSWORD: ${{ secrets.OSSRH_TOKEN_PASSSWORD }}
 
-      run: ./gradlew publish
+        run: ./gradlew publish

.github/workflows/test.yml

@@ -5,20 +5,20 @@ name: Run CI tests with Gradle
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [master, main]
   pull_request:
-    branches: [ master, main ]
+    branches: [master, main]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 17.0
-      uses: actions/setup-java@v1
-      with:
-        java-version: 17.0
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew clean check
+      - uses: actions/checkout@v2
+      - name: Set up JDK 21.0
+        uses: actions/setup-java@v1
+        with:
+          java-version: 21.0
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew clean check

.gitignore

@@ -45,4 +45,7 @@ eclipse-build
 !/.settings/org.eclipse.jdt.core.prefs
 !/.settings/org.eclipse.jdt.ui.prefs
 
+// vscode
+.hintrc
+
 bin/*

gradle.properties

@@ -1,5 +1,5 @@
 ltrVersion = 1.5.10
-elasticsearchVersion = 8.17.3
-luceneVersion = 9.12.0
+elasticsearchVersion = 9.0.1
+luceneVersion = 10.1.0
 ow2Version = 8.0.1
 antlrVersion = 4.5.1-1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/javaRestTest/java/com/o19s/es/ltr/NodeSettingsIT.java

@@ -38,7 +38,7 @@ public class NodeSettingsIT extends BaseIntegrationTest {
     private final MemStore memStore = new MemStore();
     private final int memSize = 1024;
     private final int expireAfterRead = 100;
-    private final int expireAfterWrite = expireAfterRead*4;
+    private final int expireAfterWrite = expireAfterRead * 4;
 
     @Override
     protected Settings nodeSettings() {
@@ -55,7 +55,7 @@ public void testCacheSettings() throws IOException, InterruptedException {
         CachedFeatureStore cached = new CachedFeatureStore(memStore, caches);
         long totalAdded = 0;
         int i = 0;
-        long maxMemSize = new ByteSizeValue(memSize, ByteSizeUnit.KB).getBytes();
+        long maxMemSize = ByteSizeValue.of(memSize, ByteSizeUnit.KB).getBytes();
         do {
             CompiledLtrModel compiled = new DummyModel("test" + i++, 250);
             long lastAddedSize = compiled.ramBytesUsed();
@@ -67,14 +67,14 @@ public void testCacheSettings() throws IOException, InterruptedException {
         } while (totalAdded < maxMemSize);
         assertThat(totalAdded, greaterThan(maxMemSize));
         assertThat(caches.modelCache().weight(), greaterThan(0L));
-        Thread.sleep(expireAfterWrite*2);
+        Thread.sleep(expireAfterWrite * 2);
         caches.modelCache().refresh();
         assertEquals(0, caches.modelCache().weight());
         cached.loadModel("test0");
         // Second load for accessTime
         cached.loadModel("test0");
         assertThat(caches.modelCache().weight(), greaterThan(0L));
-        Thread.sleep(expireAfterRead*2);
+        Thread.sleep(expireAfterRead * 2);
         caches.modelCache().refresh();
         assertEquals(0, caches.modelCache().weight());
     }