OAK-11289: remove remaining elastiknn references in test

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java

@@ -40,13 +40,24 @@ public class ElasticConnectionRule extends ExternalResource {
 
     private static final Logger LOG = LoggerFactory.getLogger(ElasticConnectionRule.class);
 
+    // Set this connection string as
+    // <scheme>://<hostname>:<port>?key_id=<>,key_secret=<>
+    // key_id and key_secret are optional in case the ES server
+    // needs authentication
+    // Do not set this if docker is running and you want to run the tests on docker instead.
+    private static final String ELASTIC_CONNECTION_STRING = System.getProperty("elasticConnectionString");
+
     private final String indexPrefix;
     private static boolean useDocker = false;
 
     private final String elasticConnectionString;
 
     private ElasticConnectionModel elasticConnectionModel;
 
+    public ElasticConnectionRule() {
+        this(ELASTIC_CONNECTION_STRING);
+    }
+
     public ElasticConnectionRule(String elasticConnectionString) {
         this(elasticConnectionString,
                 "elastic_test_" +

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticDynamicBoostTest.java

@@ -28,8 +28,7 @@
 public class ElasticDynamicBoostTest extends DynamicBoostCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticDynamicBoostTest() {
         this.indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticExcerptTest.java

@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.jackrabbit.oak.plugins.index.elastic;
 
 import org.apache.jackrabbit.oak.api.*;
@@ -28,8 +27,7 @@
 public class ElasticExcerptTest extends ExcerptTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule(
-            ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticExcerptTest() {
         indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFacetTest.java

@@ -27,8 +27,7 @@
 public class ElasticFacetTest extends FacetCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING, "elastic_test_");
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     protected Repository createJcrRepository() {
         indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAnalyzerTest.java

@@ -33,8 +33,7 @@
 public class ElasticFullTextAnalyzerTest extends FullTextAnalyzerCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticFullTextAnalyzerTest() {
         this.indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextIndexTest.java

@@ -23,8 +23,7 @@
 public class ElasticFullTextIndexTest extends FullTextIndexCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticFullTextIndexTest() {
         this.indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFunctionIndexCommonTest.java

@@ -37,8 +37,7 @@
 
 public class ElasticFunctionIndexCommonTest extends FunctionIndexCommonTest {
     @ClassRule
-    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule(
-            ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticFunctionIndexCommonTest() {
         indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAggregation2Test.java

@@ -43,8 +43,7 @@
 public class ElasticIndexAggregation2Test extends IndexAggregation2CommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule(
-            ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
 
     private final ElasticTestRepositoryBuilder builder;

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAggregationTest.java

@@ -26,8 +26,7 @@
 public class ElasticIndexAggregationTest extends IndexAggregationCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule(
-            ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticIndexAggregationTest() {
         this.indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAndTraversalQueriesSimilarResultsCommonTest.java

@@ -25,8 +25,7 @@
 public class ElasticIndexAndTraversalQueriesSimilarResultsCommonTest extends IndexAndTraversalQueriesSimilarResultsCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticIndexAndTraversalQueriesSimilarResultsCommonTest() {
         indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexDescendantSpellcheckCommonTest.java

@@ -28,8 +28,7 @@
 public class ElasticIndexDescendantSpellcheckCommonTest extends IndexDescendantSpellcheckCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     @Override
     protected Repository createJcrRepository() {

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexDescendantSuggestionCommonTest.java

@@ -26,8 +26,7 @@
 public class ElasticIndexDescendantSuggestionCommonTest extends IndexDescendantSuggestionCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     @Override
     protected Repository createJcrRepository() {

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexExclusionQueryCommonTest.java

@@ -25,8 +25,7 @@
 public class ElasticIndexExclusionQueryCommonTest extends IndexExclusionQueryCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule(
-            ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     @Override
     protected ContentRepository createRepository() {

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexImproperUsageCommonTest.java

@@ -25,8 +25,7 @@
 public class ElasticIndexImproperUsageCommonTest extends IndexImproperUsageCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     @Override
     protected ContentRepository createRepository() {

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexPathRestrictionCommonTest.java

@@ -34,19 +34,16 @@
 import org.junit.Rule;
 import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.slf4j.event.Level;
 
 import java.util.Collection;
 import java.util.Collections;
 
-@RunWith(Parameterized.class)
 public class ElasticIndexPathRestrictionCommonTest extends IndexPathRestrictionCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     // Default refresh is 1 minute - so we need to lower that otherwise test would need to wait at least 1 minute
     // before it can get the estimated doc count from the remote ES index

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexPlannerCommonTest.java

@@ -71,8 +71,7 @@
 public class ElasticIndexPlannerCommonTest extends IndexPlannerCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     // Default refresh is 1 minute - so we need to lower that otherwise test would need to wait at least 1 minute
     // before it can get the estimated doc count from the remote ES index

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderServiceTest.java

@@ -62,7 +62,7 @@ public class ElasticIndexProviderServiceTest {
     public final OsgiContext context = new OsgiContext();
 
     @ClassRule
-    public static ElasticConnectionRule elasticRule = new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     private final ElasticIndexProviderService service = new ElasticIndexProviderService();
 

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexQueryCommonTest.java

@@ -32,8 +32,7 @@
 public class ElasticIndexQueryCommonTest extends IndexQueryCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticIndexQueryCommonTest() {
         indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexQuerySQL2OptimisationCommonTest.java

@@ -33,16 +33,13 @@
 public class ElasticIndexQuerySQL2OptimisationCommonTest extends IndexQuerySQL2OptimisationCommonTest {
 
     protected TestRepository repositoryOptionsUtil;
-    private final ElasticConnection esConnection;
     private final ElasticIndexTracker indexTracker;
 
-
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticIndexQuerySQL2OptimisationCommonTest() {
-        this.esConnection = elasticRule.useDocker() ? elasticRule.getElasticConnectionForDocker() :
+        ElasticConnection esConnection = elasticRule.useDocker() ? elasticRule.getElasticConnectionForDocker() :
                 elasticRule.getElasticConnectionFromString();
         this.indexTracker = new ElasticIndexTracker(esConnection, new ElasticMetricHandler(StatisticsProvider.NOOP));
         this.editorProvider = new ElasticIndexEditorProvider(indexTracker, esConnection,

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexSuggestionCommonTest.java

@@ -33,8 +33,7 @@
 public class ElasticIndexSuggestionCommonTest extends IndexSuggestionCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     protected Repository createJcrRepository() {
         indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticOrderByTest.java

@@ -23,8 +23,7 @@
 public class ElasticOrderByTest extends OrderByCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticOrderByTest() {
         indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexCommonTest.java

@@ -23,8 +23,7 @@
 public class ElasticPropertyIndexCommonTest extends PropertyIndexCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     public ElasticPropertyIndexCommonTest() {
         indexOptions = new ElasticIndexOptions();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReindexTest.java

@@ -63,8 +63,7 @@ public class ElasticReindexTest {
     protected int DEFAULT_ASYNC_INDEXING_TIME_IN_SECONDS = 5;
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     private Session adminSession;
     private QueryManager qe;

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticSpellcheckCommonTest.java

@@ -36,8 +36,7 @@
 public class ElasticSpellcheckCommonTest extends SpellcheckCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     @After
     public void cleanup() {

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticStrictPathRestrictionEnableCommonTest.java

@@ -25,8 +25,7 @@
 public class ElasticStrictPathRestrictionEnableCommonTest extends StrictPathRestrictionEnableCommonTest {
 
     @ClassRule
-    public static final ElasticConnectionRule elasticRule =
-            new ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+    public static final ElasticConnectionRule elasticRule = new ElasticConnectionRule();
 
     @Override
     protected ContentRepository createRepository() {

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java

@@ -35,6 +35,7 @@
 
 public class ElasticTestServer implements AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(ElasticTestServer.class);
+    private static final String ELASTIC_DOCKER_IMAGE_VERSION = System.getProperty("elasticDockerImageVersion");
 
     private static final ElasticTestServer SERVER = new ElasticTestServer();
     private static volatile ElasticsearchContainer CONTAINER;
@@ -62,10 +63,7 @@ public static synchronized ElasticsearchContainer getESTestServer() {
     }
 
     private synchronized void setup() {
-        String esDockerImageVersion = ElasticTestUtils.ELASTIC_DOCKER_IMAGE_VERSION;
-        if (esDockerImageVersion == null) {
-            esDockerImageVersion = Version.VERSION.toString();
-        }
+        String esDockerImageVersion = ELASTIC_DOCKER_IMAGE_VERSION != null ? ELASTIC_DOCKER_IMAGE_VERSION : Version.VERSION.toString();
         LOG.info("Elasticsearch test Docker image version: {}.", esDockerImageVersion);
         checkIfDockerClientAvailable();
         Network network = Network.newNetwork();

oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestUtils.java

@@ -20,17 +20,6 @@
 
 public final class ElasticTestUtils {
 
-    // Set this connection string as
-    // <scheme>://<hostname>:<port>?key_id=<>,key_secret=<>
-    // key_id and key_secret are optional in case the ES server
-    // needs authentication
-    // Do not set this if docker is running and you want to run the tests on docker instead.
-    public static final String ELASTIC_CONNECTION_STRING = System.getProperty("elasticConnectionString");
-
-    public static final String ELASTIC_DOCKER_IMAGE_VERSION = System.getProperty("elasticDockerImageVersion");
-    public static final String ELASTIC_KNN_PLUGIN_URI_KEY = "elasticKnnPluginUri";
-    public static final String ELASTIC_KNN_PLUGIN_URI = System.getProperty(ELASTIC_KNN_PLUGIN_URI_KEY);
-
     public static String randomString(int size) {
         return randomString(new Random(42), size);
     }