odfe 1.8 version upgrade (#115)

.github/workflows/CD.yml

@@ -8,7 +8,7 @@ jobs:
   Build-k-NN:
     strategy:
       matrix:
-        java: [13]
+        java: [14]
 
     name: Build and Release k-NN Plugin
     runs-on: ubuntu-latest

.github/workflows/CI.yml

@@ -9,7 +9,7 @@ jobs:
   Build-k-NN:
     strategy:
       matrix:
-        java: [13]
+        java: [14]
 
     name: Build and Test k-NN Plugin
     runs-on: ubuntu-latest

.github/workflows/test-workflow.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [13]
+        java: [14]
     # Job name
     name: Build KNN with JDK ${{ matrix.java }}
     # This job runs on Linux

README.md

@@ -10,7 +10,7 @@ To learn more, please see our [documentation](https://opendistro.github.io/for-e
 
 1. Check out the package from version control.
 2. Launch Intellij IDEA, choose **Import Project**, and select the `settings.gradle` file in the root of this package.
-3. To build from the command line, set `JAVA_HOME` to point to a JDK >= 13 before running `./gradlew`.
+3. To build from the command line, set `JAVA_HOME` to point to a JDK 14 before running `./gradlew`.
 
 ## Build
 

build.gradle

@@ -1,5 +1,5 @@
 /*
- *   Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *   Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License").
  *   You may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 
 buildscript {
     ext {
-        es_version = System.getProperty("es.version", "7.6.1")
+        es_version = System.getProperty("es.version", "7.7.0")
         es_group = "org.elasticsearch"
         distribution = 'oss-zip'
     }
@@ -38,26 +38,21 @@ buildscript {
 
 plugins {
     id 'java-library'
-    id 'nebula.ospackage' version "8.2.0" apply false
+    id 'nebula.ospackage' version "8.3.0" apply false
     id 'idea'
     id 'jacoco'
 }
 
 apply plugin: 'elasticsearch.esplugin'
 
 def usingRemoteCluster = System.properties.containsKey('tests.rest.cluster') || System.properties.containsKey('tests.cluster')
-def usingMultiNode = project.properties.containsKey('numNodes')
-// Only apply jacoco test coverage if we are running a local single node cluster
 def integTestDependOnJniLib = false
 if (!usingRemoteCluster) {
     integTestDependOnJniLib = true
-    if (!usingMultiNode) {
-        apply from: 'build-tools/knnplugin-coverage.gradle'
-    }
 }
 
 ext {
-    opendistroVersion = '1.7.0'
+    opendistroVersion = '1.8.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
     projectSubstitutions = [:]
     licenseFile = rootProject.file('LICENSE.TXT')
@@ -76,8 +71,37 @@ allprojects {
 
 
 jacoco {
-    toolVersion = "0.8.3"
+    toolVersion = "0.8.5"
+}
+
+jacocoTestReport {
+    reports {
+        xml.enabled false
+        csv.enabled false
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it)
+        }))
+    }
+}
+test.finalizedBy(project.tasks.jacocoTestReport)
+jacocoTestCoverageVerification {
+    violationRules {
+        rule {
+            limit {
+                minimum = 0.5
+            }
+
+        }
+    }
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it)
+        }))
+    }
 }
+check.dependsOn jacocoTestCoverageVerification
 
 check.dependsOn jacocoTestReport
 

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/amazon/opendistroforelasticsearch/knn/plugin/KNNPlugin.java

@@ -117,7 +117,8 @@ public List<QuerySpec<?>> getQueries() {
     public Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool,
                                                ResourceWatcherService resourceWatcherService, ScriptService scriptService,
                                                NamedXContentRegistry xContentRegistry, Environment environment,
-                                               NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry) {
+                                               NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry,
+                                               IndexNameExpressionResolver indexNameExpressionResolver) {
         KNNIndexCache.setResourceWatcherService(resourceWatcherService);
         KNNSettings.state().initialize(client, clusterService);
         KNNCircuitBreaker.getInstance().initialize(threadPool, clusterService, client);

src/main/java/com/amazon/opendistroforelasticsearch/knn/plugin/rest/RestKNNStatsHandler.java

@@ -20,6 +20,7 @@
 import com.amazon.opendistroforelasticsearch.knn.plugin.transport.KNNStatsRequest;
 
 import com.amazon.opendistroforelasticsearch.knn.plugin.stats.KNNStats;
+import com.google.common.collect.ImmutableList;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.client.node.NodeClient;
@@ -32,6 +33,7 @@
 
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -53,10 +55,6 @@ public class RestKNNStatsHandler extends BaseRestHandler {
      * @param knnStats KNNStats
      */
     public RestKNNStatsHandler(Settings settings, RestController controller, KNNStats knnStats) {
-        controller.registerHandler(RestRequest.Method.GET, KNNPlugin.KNN_BASE_URI + "/{nodeId}/stats/",this);
-        controller.registerHandler(RestRequest.Method.GET, KNNPlugin.KNN_BASE_URI + "/{nodeId}/stats/{stat}",this);
-        controller.registerHandler(RestRequest.Method.GET, KNNPlugin.KNN_BASE_URI + "/stats/",this);
-        controller.registerHandler(RestRequest.Method.GET, KNNPlugin.KNN_BASE_URI + "/stats/{stat}",this);
         this.knnStats = knnStats;
     }
 
@@ -65,6 +63,16 @@ public String getName() {
         return NAME;
     }
 
+    @Override
+    public List<Route> routes() {
+        return ImmutableList.of(
+                new Route(RestRequest.Method.GET, KNNPlugin.KNN_BASE_URI + "/{nodeId}/stats/"),
+                new Route(RestRequest.Method.GET, KNNPlugin.KNN_BASE_URI + "/{nodeId}/stats/{stat}"),
+                new Route(RestRequest.Method.GET, KNNPlugin.KNN_BASE_URI + "/stats/"),
+                new Route(RestRequest.Method.GET, KNNPlugin.KNN_BASE_URI + "/stats/{stat}")
+        );
+    }
+
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
         // From restrequest, create a knnStatsRequest
@@ -119,4 +127,4 @@ private KNNStatsRequest getRequest(RestRequest request) {
         }
         return knnStatsRequest;
     }
-}
+}