Remove Inject

Author: mayya-sharipova

x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/xpack/gpu/GPUIndexIT.java

@@ -12,7 +12,6 @@
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.gpu.GPUSupport;
-import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.vectors.ExactKnnQueryBuilder;
@@ -37,9 +36,8 @@
 public class GPUIndexIT extends ESIntegTestCase {
 
     public static class TestGPUPlugin extends GPUPlugin {
-        @Inject
-        public TestGPUPlugin(Settings settings) {
-            super(Settings.builder().put(settings).put("vectors.indexing.use_gpu", GpuMode.TRUE.name()).build());
+        public TestGPUPlugin() {
+            super(Settings.builder().put("vectors.indexing.use_gpu", GpuMode.TRUE.name()).build());
         }
 
         @Override

x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/xpack/gpu/GPUPluginInitializationUnsupportedIT.java

@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.gpu;
 
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldTypeTests;
@@ -27,15 +28,21 @@ public class GPUPluginInitializationUnsupportedIT extends ESIntegTestCase {
         TestCuVSServiceProvider.mockedGPUInfoProvider = p -> { throw new UnsupportedOperationException("cuvs-java UnsupportedProvider"); };
     }
 
+    public static class TestGPUPlugin extends GPUPlugin {
+        public TestGPUPlugin() {
+            super(Settings.EMPTY);
+        }
+    }
+
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
-        return List.of(GPUPlugin.class);
+        return List.of(TestGPUPlugin.class);
     }
 
     public void testAutoModeWithUnavailableGPU() {
         assumeTrue("GPU_FORMAT feature flag enabled", GPUPlugin.GPU_FORMAT.isEnabled());
 
-        GPUPlugin gpuPlugin = internalCluster().getInstance(GPUPlugin.class);
+        TestGPUPlugin gpuPlugin = internalCluster().getInstance(TestGPUPlugin.class);
         VectorsFormatProvider vectorsFormatProvider = gpuPlugin.getVectorsFormatProvider();
 
         createIndex("index1");

x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/xpack/gpu/GPUPluginInitializationWithGPUIT.java

@@ -16,7 +16,6 @@
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldTypeTests;
 import org.elasticsearch.index.mapper.vectors.VectorsFormatProvider;
 import org.elasticsearch.indices.IndicesService;
-import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.junit.After;
@@ -49,9 +48,8 @@ public class GPUPluginInitializationWithGPUIT extends ESIntegTestCase {
 
     public static class TestGPUPlugin extends GPUPlugin {
 
-        @Inject
-        public TestGPUPlugin(Settings settings) {
-            super(Settings.builder().put(settings).put("vectors.indexing.use_gpu", gpuMode.name()).build());
+        public TestGPUPlugin() {
+            super(Settings.builder().put("vectors.indexing.use_gpu", gpuMode.name()).build());
         }
 
         @Override

x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/xpack/gpu/GPUPluginInitializationWithoutGPUIT.java

@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.gpu;
 
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldTypeTests;
@@ -26,15 +27,21 @@ public class GPUPluginInitializationWithoutGPUIT extends ESIntegTestCase {
         TestCuVSServiceProvider.mockedGPUInfoProvider = p -> new TestCuVSServiceProvider.TestGPUInfoProvider(List.of());
     }
 
+    public static class TestGPUPlugin extends GPUPlugin {
+        public TestGPUPlugin() {
+            super(Settings.EMPTY);
+        }
+    }
+
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
-        return List.of(GPUPlugin.class);
+        return List.of(TestGPUPlugin.class);
     }
 
     public void testFFOff() {
         assumeFalse("GPU_FORMAT feature flag disabled", GPUPlugin.GPU_FORMAT.isEnabled());
 
-        GPUPlugin gpuPlugin = internalCluster().getInstance(GPUPlugin.class);
+        TestGPUPlugin gpuPlugin = internalCluster().getInstance(TestGPUPlugin.class);
         VectorsFormatProvider vectorsFormatProvider = gpuPlugin.getVectorsFormatProvider();
 
         var format = vectorsFormatProvider.getKnnVectorsFormat(null, null, null);
@@ -44,7 +51,7 @@ public void testFFOff() {
     public void testAutoModeWithoutGPU() {
         assumeTrue("GPU_FORMAT feature flag enabled", GPUPlugin.GPU_FORMAT.isEnabled());
 
-        GPUPlugin gpuPlugin = internalCluster().getInstance(GPUPlugin.class);
+        TestGPUPlugin gpuPlugin = internalCluster().getInstance(TestGPUPlugin.class);
         VectorsFormatProvider vectorsFormatProvider = gpuPlugin.getVectorsFormatProvider();
 
         createIndex("index1");

x-pack/plugin/gpu/src/main/java/org/elasticsearch/xpack/gpu/GPUPlugin.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.gpu.codec.ES92GpuHnswVectorsFormat;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
 import org.elasticsearch.index.mapper.vectors.VectorsFormatProvider;
-import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.license.License;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.internal.InternalVectorFormatProviderPlugin;
@@ -35,7 +34,6 @@ public class GPUPlugin extends Plugin implements InternalVectorFormatProviderPlu
 
     private final GpuMode gpuMode;
 
-    @Inject
     public GPUPlugin(Settings settings) {
         this.gpuMode = VECTORS_INDEXING_USE_GPU_NODE_SETTING.get(settings);
     }