Skip to content

Commit 208f53d

Browse files
authored
Move CrossProjectRoutingResolver to Serverless (#138444)
1 parent 7e06534 commit 208f53d

File tree

7 files changed

+8
-494
lines changed

7 files changed

+8
-494
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@
209209
import org.elasticsearch.search.SearchService;
210210
import org.elasticsearch.search.SearchUtils;
211211
import org.elasticsearch.search.aggregations.support.AggregationUsageService;
212-
import org.elasticsearch.search.crossproject.CrossProjectRoutingResolver;
213212
import org.elasticsearch.search.crossproject.ProjectRoutingResolver;
214213
import org.elasticsearch.shutdown.PluginShutdownService;
215214
import org.elasticsearch.snapshots.CachingSnapshotAndShardByStateMetricsService;
@@ -1015,7 +1014,7 @@ public Map<String, String> queryFields() {
10151014

10161015
final var projectRoutingResolver = pluginsService.loadSingletonServiceProvider(
10171016
ProjectRoutingResolver.class,
1018-
CrossProjectRoutingResolver::new
1017+
() -> ProjectRoutingResolver.NOOP
10191018
);
10201019

10211020
PluginServiceInstances pluginServices = new PluginServiceInstances(

server/src/main/java/org/elasticsearch/search/crossproject/CrossProjectRoutingResolver.java

Lines changed: 0 additions & 229 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/search/crossproject/ProjectRoutingResolver.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ public interface ProjectRoutingResolver {
2626
* @return A new TargetProjects instance containing only the projects that match the project routing.
2727
*/
2828
TargetProjects resolve(String projectRouting, TargetProjects targetProjects);
29+
30+
/** No-op router - just returns the provided target projects. */
31+
ProjectRoutingResolver NOOP = (projectRouting, targetProjects) -> targetProjects;
2932
}

0 commit comments

Comments
 (0)