Clean up

Author: n1v0lg

server/src/main/java/module-info.java

@@ -398,8 +398,7 @@
             org.elasticsearch.settings.secure,
             org.elasticsearch.serverless.constants,
             org.elasticsearch.serverless.apifiltering,
-            org.elasticsearch.internal.security,
-            org.elasticsearch.serverless.crossproject;
+            org.elasticsearch.internal.security;
 
     exports org.elasticsearch.telemetry.tracing;
     exports org.elasticsearch.telemetry;

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -23,7 +23,7 @@
 import org.elasticsearch.action.bulk.IncrementalBulkService;
 import org.elasticsearch.action.datastreams.autosharding.DataStreamAutoShardingService;
 import org.elasticsearch.action.ingest.ReservedPipelineAction;
-import org.elasticsearch.action.search.CrossClusterSearchExtension;
+import org.elasticsearch.search.internal.CrossClusterSearchExtension;
 import org.elasticsearch.action.search.OnlinePrewarmingService;
 import org.elasticsearch.action.search.OnlinePrewarmingServiceProvider;
 import org.elasticsearch.action.search.SearchExecutionStatsCollector;
@@ -1018,11 +1018,10 @@ public Map<String, String> queryFields() {
 
         var crossClusterSearchExtension = pluginsService.loadSingletonServiceProvider(
             CrossClusterSearchExtension.class,
-            CrossClusterSearchExtension.Noop::new
+            CrossClusterSearchExtension.Default::new
         );
 
-        logger.info("Using cross-cluster search extension: [{}]", crossClusterSearchExtension.getClass().getName());
-        logger.info("Cross-cluster search force reconnect: [{}]", crossClusterSearchExtension.forceReconnect());
+        logger.info("Cross-cluster search force reconnect: [{}]", crossClusterSearchExtension.forceReconnectBehaviorSupplier().get());
 
         ActionModule actionModule = new ActionModule(
             settings,

server/src/main/java/org/elasticsearch/action/search/CrossClusterSearchExtension.java renamed to server/src/main/java/org/elasticsearch/search/internal/CrossClusterSearchExtension.java

@@ -7,18 +7,20 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.action.search;
+package org.elasticsearch.search.internal;
+
+import java.util.function.Supplier;
 
 public interface CrossClusterSearchExtension {
 
-    boolean forceReconnect();
+    Supplier<Boolean> forceReconnectBehaviorSupplier();
 
-    class Noop implements CrossClusterSearchExtension {
-        public Noop() {}
+    class Default implements CrossClusterSearchExtension {
+        public Default() {}
 
         @Override
-        public boolean forceReconnect() {
-            return false;
+        public Supplier<Boolean> forceReconnectBehaviorSupplier() {
+            return () -> false;
         }
     }
 }