Skip to content

Commit 1260684

Browse files
committed
Introduce BridgeProjectIdResolver to applying null for project ID.
1 parent 2d8cc3a commit 1260684

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/script/ScriptServiceBridge.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
*/
99
package org.elasticsearch.logstashbridge.script;
1010

11-
import org.elasticsearch.cluster.project.DefaultProjectResolver;
11+
import org.elasticsearch.cluster.metadata.ProjectId;
1212
import org.elasticsearch.cluster.project.ProjectResolver;
1313
import org.elasticsearch.common.settings.Settings;
14+
import org.elasticsearch.core.CheckedRunnable;
1415
import org.elasticsearch.core.FixForMultiProject;
1516
import org.elasticsearch.ingest.common.ProcessorsWhitelistExtension;
1617
import org.elasticsearch.logstashbridge.StableBridgeAPI;
@@ -69,8 +70,8 @@ private static ScriptService getScriptService(final Settings settings, final Lon
6970
MustacheScriptEngine.NAME,
7071
new MustacheScriptEngine(settings)
7172
);
72-
@FixForMultiProject // Should this be non-DefaultProjectResolver?
73-
final ProjectResolver projectResolver = DefaultProjectResolver.INSTANCE;
73+
@FixForMultiProject // Should this be non-BridgeProjectIdResolver?
74+
final ProjectResolver projectResolver = new BridgeProjectIdResolver();
7475
return new ScriptService(settings, scriptEngines, ScriptModule.CORE_CONTEXTS, timeProvider, projectResolver);
7576
}
7677

@@ -113,4 +114,21 @@ public <T> List<T> loadExtensions(Class<T> extensionPointType) {
113114
public void close() throws IOException {
114115
this.internalDelegate.close();
115116
}
117+
118+
static class BridgeProjectIdResolver implements ProjectResolver {
119+
120+
@Override
121+
public ProjectId getProjectId() {
122+
return ProjectId.DEFAULT;
123+
}
124+
125+
@Override
126+
public <E extends Exception> void executeOnProject(ProjectId projectId, CheckedRunnable<E> body) throws E {
127+
if (projectId.equals(ProjectId.DEFAULT)) {
128+
body.run();
129+
} else {
130+
throw new IllegalArgumentException("Cannot execute on a project other than [" + ProjectId.DEFAULT + "]");
131+
}
132+
}
133+
}
116134
}

0 commit comments

Comments
 (0)