diff --git a/docs/changelog/122860.yaml b/docs/changelog/122860.yaml
new file mode 100644
index 000000000000..16f234dc17d9
--- /dev/null
+++ b/docs/changelog/122860.yaml
@@ -0,0 +1,5 @@
+pr: 122860
+summary: Improved error message when index field type is invalid
+area: Mapping
+type: enhancement
+issues: []
diff --git a/docs/changelog/123079.yaml b/docs/changelog/123079.yaml
new file mode 100644
index 000000000000..1817415bc897
--- /dev/null
+++ b/docs/changelog/123079.yaml
@@ -0,0 +1,5 @@
+pr: 123079
+summary: Register `IngestGeoIpMetadata` as a NamedXContent
+area: Ingest Node
+type: bug
+issues: []
diff --git a/docs/changelog/123197.yaml b/docs/changelog/123197.yaml
new file mode 100644
index 000000000000..ffb4bab79fe8
--- /dev/null
+++ b/docs/changelog/123197.yaml
@@ -0,0 +1,5 @@
+pr: 123197
+summary: Fix early termination in `LuceneSourceOperator`
+area: ES|QL
+type: bug
+issues: []
diff --git a/docs/changelog/123272.yaml b/docs/changelog/123272.yaml
new file mode 100644
index 000000000000..18db2437f85c
--- /dev/null
+++ b/docs/changelog/123272.yaml
@@ -0,0 +1,5 @@
+pr: 123272
+summary: Set Connect Timeout to 5s
+area: Machine Learning
+type: bug
+issues: []
diff --git a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/EntitlementBootstrap.java b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/EntitlementBootstrap.java
index ae86b69b3de4..4f37362d9325 100644
--- a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/EntitlementBootstrap.java
+++ b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/EntitlementBootstrap.java
@@ -39,8 +39,8 @@ public class EntitlementBootstrap {
Function, String> pluginResolver,
Function settingResolver,
Function> settingGlobResolver,
- Function repoDirResolver,
Path[] dataDirs,
+ Path[] sharedRepoDirs,
Path configDir,
Path libDir,
Path logsDir,
@@ -51,11 +51,11 @@ public class EntitlementBootstrap {
requireNonNull(pluginResolver);
requireNonNull(settingResolver);
requireNonNull(settingGlobResolver);
- requireNonNull(repoDirResolver);
requireNonNull(dataDirs);
if (dataDirs.length == 0) {
throw new IllegalArgumentException("must provide at least one data directory");
}
+ requireNonNull(sharedRepoDirs);
requireNonNull(configDir);
requireNonNull(libDir);
requireNonNull(logsDir);
@@ -77,8 +77,8 @@ public class EntitlementBootstrap {
* @param pluginResolver a functor to map a Java Class to the plugin it belongs to (the plugin name).
* @param settingResolver a functor to resolve the value of an Elasticsearch setting.
* @param settingGlobResolver a functor to resolve a glob expression for one or more Elasticsearch settings.
- * @param repoDirResolver a functor to map a repository location to its Elasticsearch path.
* @param dataDirs data directories for Elasticsearch
+ * @param sharedRepoDirs shared repository directories for Elasticsearch
* @param configDir the config directory for Elasticsearch
* @param libDir the lib directory for Elasticsearch
* @param tempDir the temp directory for Elasticsearch
@@ -89,8 +89,8 @@ public class EntitlementBootstrap {
Function, String> pluginResolver,
Function settingResolver,
Function> settingGlobResolver,
- Function repoDirResolver,
Path[] dataDirs,
+ Path[] sharedRepoDirs,
Path configDir,
Path libDir,
Path logsDir,
@@ -105,8 +105,8 @@ public class EntitlementBootstrap {
pluginResolver,
settingResolver,
settingGlobResolver,
- repoDirResolver,
dataDirs,
+ sharedRepoDirs,
configDir,
libDir,
logsDir,
diff --git a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java
index b4d95ceb011e..96bf8d3ba6ab 100644
--- a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java
+++ b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java
@@ -63,8 +63,11 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
+import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.BaseDir.DATA;
+import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.BaseDir.SHARED_REPO;
import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.Mode.READ;
import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.Mode.READ_WRITE;
+import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.Platform.LINUX;
/**
* Called by the agent during {@code agentmain} to configure the entitlement system,
@@ -138,6 +141,7 @@ public class EntitlementInitialization {
getUserHome(),
bootstrapArgs.configDir(),
bootstrapArgs.dataDirs(),
+ bootstrapArgs.sharedRepoDirs(),
bootstrapArgs.tempDir(),
bootstrapArgs.settingResolver(),
bootstrapArgs.settingGlobResolver()
@@ -152,8 +156,8 @@ public class EntitlementInitialization {
new CreateClassLoaderEntitlement(),
new FilesEntitlement(
List.of(
- FileData.ofPath(bootstrapArgs.repoDirResolver().apply(""), READ_WRITE),
- FileData.ofRelativePath(Path.of(""), FilesEntitlement.BaseDir.DATA, READ_WRITE)
+ FileData.ofRelativePath(Path.of(""), SHARED_REPO, READ_WRITE),
+ FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE)
)
)
)
@@ -175,26 +179,26 @@ public class EntitlementInitialization {
FileData.ofPath(bootstrapArgs.tempDir(), READ_WRITE),
FileData.ofPath(bootstrapArgs.configDir(), READ),
FileData.ofPath(bootstrapArgs.logsDir(), READ_WRITE),
- FileData.ofRelativePath(Path.of(""), FilesEntitlement.BaseDir.DATA, READ_WRITE),
- FileData.ofPath(bootstrapArgs.repoDirResolver().apply(""), READ_WRITE),
+ FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE),
+ FileData.ofRelativePath(Path.of(""), SHARED_REPO, READ_WRITE),
// OS release on Linux
- FileData.ofPath(Path.of("/etc/os-release"), READ),
- FileData.ofPath(Path.of("/etc/system-release"), READ),
- FileData.ofPath(Path.of("/usr/lib/os-release"), READ),
+ FileData.ofPath(Path.of("/etc/os-release"), READ).withPlatform(LINUX),
+ FileData.ofPath(Path.of("/etc/system-release"), READ).withPlatform(LINUX),
+ FileData.ofPath(Path.of("/usr/lib/os-release"), READ).withPlatform(LINUX),
// read max virtual memory areas
- FileData.ofPath(Path.of("/proc/sys/vm/max_map_count"), READ),
- FileData.ofPath(Path.of("/proc/meminfo"), READ),
+ FileData.ofPath(Path.of("/proc/sys/vm/max_map_count"), READ).withPlatform(LINUX),
+ FileData.ofPath(Path.of("/proc/meminfo"), READ).withPlatform(LINUX),
// load averages on Linux
- FileData.ofPath(Path.of("/proc/loadavg"), READ),
+ FileData.ofPath(Path.of("/proc/loadavg"), READ).withPlatform(LINUX),
// control group stats on Linux. cgroup v2 stats are in an unpredicable
// location under `/sys/fs/cgroup`, so unfortunately we have to allow
// read access to the entire directory hierarchy.
- FileData.ofPath(Path.of("/proc/self/cgroup"), READ),
- FileData.ofPath(Path.of("/sys/fs/cgroup/"), READ),
+ FileData.ofPath(Path.of("/proc/self/cgroup"), READ).withPlatform(LINUX),
+ FileData.ofPath(Path.of("/sys/fs/cgroup/"), READ).withPlatform(LINUX),
// // io stats on Linux
- FileData.ofPath(Path.of("/proc/self/mountinfo"), READ),
- FileData.ofPath(Path.of("/proc/diskstats"), READ)
+ FileData.ofPath(Path.of("/proc/self/mountinfo"), READ).withPlatform(LINUX),
+ FileData.ofPath(Path.of("/proc/diskstats"), READ).withPlatform(LINUX)
)
)
)
@@ -210,21 +214,21 @@ public class EntitlementInitialization {
List.of(
FileData.ofPath(bootstrapArgs.configDir(), READ),
FileData.ofPath(bootstrapArgs.tempDir(), READ),
- FileData.ofRelativePath(Path.of(""), FilesEntitlement.BaseDir.DATA, READ_WRITE)
+ FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE)
)
)
)
),
new Scope(
"org.apache.lucene.misc",
- List.of(new FilesEntitlement(List.of(FileData.ofRelativePath(Path.of(""), FilesEntitlement.BaseDir.DATA, READ_WRITE))))
+ List.of(new FilesEntitlement(List.of(FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE))))
),
new Scope("org.apache.logging.log4j.core", List.of(new ManageThreadsEntitlement())),
new Scope(
"org.elasticsearch.nativeaccess",
List.of(
new LoadNativeLibrariesEntitlement(),
- new FilesEntitlement(List.of(FileData.ofRelativePath(Path.of(""), FilesEntitlement.BaseDir.DATA, READ_WRITE)))
+ new FilesEntitlement(List.of(FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE)))
)
)
);
diff --git a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTree.java b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTree.java
index 660459f06d58..d0eded74556b 100644
--- a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTree.java
+++ b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTree.java
@@ -14,6 +14,7 @@ import org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlemen
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.List;
import java.util.Objects;
@@ -30,6 +31,10 @@ public final class FileAccessTree {
List readPaths = new ArrayList<>();
List writePaths = new ArrayList<>();
for (FilesEntitlement.FileData fileData : filesEntitlement.filesData()) {
+ var platform = fileData.platform();
+ if (platform != null && platform.isCurrent() == false) {
+ continue;
+ }
var mode = fileData.mode();
var paths = fileData.resolvePaths(pathLookup);
paths.forEach(path -> {
@@ -46,8 +51,8 @@ public final class FileAccessTree {
readPaths.add(tempDir);
writePaths.add(tempDir);
- readPaths.sort(String::compareTo);
- writePaths.sort(String::compareTo);
+ readPaths.sort(PATH_ORDER);
+ writePaths.sort(PATH_ORDER);
this.readPaths = pruneSortedPaths(readPaths).toArray(new String[0]);
this.writePaths = pruneSortedPaths(writePaths).toArray(new String[0]);
@@ -60,7 +65,7 @@ public final class FileAccessTree {
prunedReadPaths.add(currentPath);
for (int i = 1; i < paths.size(); ++i) {
String nextPath = paths.get(i);
- if (nextPath.startsWith(currentPath) == false) {
+ if (isParent(currentPath, nextPath) == false) {
prunedReadPaths.add(nextPath);
currentPath = nextPath;
}
@@ -88,21 +93,28 @@ public final class FileAccessTree {
// Note that toAbsolutePath produces paths separated by the default file separator,
// so on Windows, if the given path uses forward slashes, this consistently
// converts it to backslashes.
- return path.toAbsolutePath().normalize().toString();
+ String result = path.toAbsolutePath().normalize().toString();
+ while (result.endsWith(FILE_SEPARATOR)) {
+ result = result.substring(0, result.length() - FILE_SEPARATOR.length());
+ }
+ return result;
}
private static boolean checkPath(String path, String[] paths) {
if (paths.length == 0) {
return false;
}
- int ndx = Arrays.binarySearch(paths, path);
+ int ndx = Arrays.binarySearch(paths, path, PATH_ORDER);
if (ndx < -1) {
- String maybeParent = paths[-ndx - 2];
- return path.startsWith(maybeParent) && path.startsWith(FILE_SEPARATOR, maybeParent.length());
+ return isParent(paths[-ndx - 2], path);
}
return ndx >= 0;
}
+ private static boolean isParent(String maybeParent, String path) {
+ return path.startsWith(maybeParent) && path.startsWith(FILE_SEPARATOR, maybeParent.length());
+ }
+
@Override
public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) return false;
@@ -114,4 +126,30 @@ public final class FileAccessTree {
public int hashCode() {
return Objects.hash(Arrays.hashCode(readPaths), Arrays.hashCode(writePaths));
}
+
+ /**
+ * For our lexicographic sort trick to work correctly, we must have path separators sort before
+ * any other character so that files in a directory appear immediately after that directory.
+ * For example, we require [/a, /a/b, /a.xml] rather than the natural order [/a, /a.xml, /a/b].
+ */
+ private static final Comparator PATH_ORDER = (s1, s2) -> {
+ Path p1 = Path.of(s1);
+ Path p2 = Path.of(s2);
+ var i1 = p1.iterator();
+ var i2 = p2.iterator();
+ while (i1.hasNext() && i2.hasNext()) {
+ int cmp = i1.next().compareTo(i2.next());
+ if (cmp != 0) {
+ return cmp;
+ }
+ }
+ if (i1.hasNext()) {
+ return 1;
+ } else if (i2.hasNext()) {
+ return -1;
+ } else {
+ assert p1.equals(p2);
+ return 0;
+ }
+ };
}
diff --git a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PathLookup.java b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PathLookup.java
index 6f6220e21546..df99eecf0f8c 100644
--- a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PathLookup.java
+++ b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PathLookup.java
@@ -17,6 +17,7 @@ public record PathLookup(
Path homeDir,
Path configDir,
Path[] dataDirs,
+ Path[] sharedRepoDirs,
Path tempDir,
Function settingResolver,
Function> settingGlobResolver
diff --git a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlement.java b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlement.java
index 21b54ba51ca8..609e0ed66cfa 100644
--- a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlement.java
+++ b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlement.java
@@ -21,6 +21,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.stream.Stream;
+import static java.lang.Character.isLetter;
+
/**
* Describes a file entitlement with a path and mode.
*/
@@ -36,29 +38,104 @@ public record FilesEntitlement(List filesData) implements Entitlement
public enum BaseDir {
CONFIG,
DATA,
+ SHARED_REPO,
HOME
}
+ public enum Platform {
+ LINUX,
+ MACOS,
+ WINDOWS;
+
+ private static final Platform current = findCurrent();
+
+ private static Platform findCurrent() {
+ String os = System.getProperty("os.name");
+ if (os.startsWith("Linux")) {
+ return LINUX;
+ } else if (os.startsWith("Mac OS")) {
+ return MACOS;
+ } else if (os.startsWith("Windows")) {
+ return WINDOWS;
+ } else {
+ throw new AssertionError("Unsupported platform [" + os + "]");
+ }
+ }
+
+ public boolean isCurrent() {
+ return this == current;
+ }
+ }
+
public sealed interface FileData {
Stream resolvePaths(PathLookup pathLookup);
Mode mode();
+ Platform platform();
+
+ FileData withPlatform(Platform platform);
+
static FileData ofPath(Path path, Mode mode) {
- return new AbsolutePathFileData(path, mode);
+ return new AbsolutePathFileData(path, mode, null);
}
static FileData ofRelativePath(Path relativePath, BaseDir baseDir, Mode mode) {
- return new RelativePathFileData(relativePath, baseDir, mode);
+ return new RelativePathFileData(relativePath, baseDir, mode, null);
}
static FileData ofPathSetting(String setting, Mode mode) {
- return new PathSettingFileData(setting, mode);
+ return new PathSettingFileData(setting, mode, null);
}
static FileData ofRelativePathSetting(String setting, BaseDir baseDir, Mode mode) {
- return new RelativePathSettingFileData(setting, baseDir, mode);
+ return new RelativePathSettingFileData(setting, baseDir, mode, null);
+ }
+
+ /**
+ * Tests if a path is absolute or relative, taking into consideration both Unix and Windows conventions.
+ * Note that this leads to a conflict, resolved in favor of Unix rules: `/foo` can be either a Unix absolute path, or a Windows
+ * relative path with "wrong" directory separator (using non-canonical slash in Windows).
+ */
+ static boolean isAbsolutePath(String path) {
+ if (path.isEmpty()) {
+ return false;
+ }
+ if (path.charAt(0) == '/') {
+ // Unix/BSD absolute
+ return true;
+ }
+
+ return isWindowsAbsolutePath(path);
+ }
+
+ private static boolean isSlash(char c) {
+ return (c == '\\') || (c == '/');
+ }
+
+ private static boolean isWindowsAbsolutePath(String input) {
+ // if a prefix is present, we expected (long) UNC or (long) absolute
+ if (input.startsWith("\\\\?\\")) {
+ return true;
+ }
+
+ if (input.length() > 1) {
+ char c0 = input.charAt(0);
+ char c1 = input.charAt(1);
+ char c = 0;
+ int next = 2;
+ if (isSlash(c0) && isSlash(c1)) {
+ // Two slashes or more: UNC
+ return true;
+ }
+ if (isLetter(c0) && c1 == ':') {
+ // A drive: absolute
+ return true;
+ }
+ }
+ // Otherwise relative
+ return false;
}
}
@@ -75,14 +152,9 @@ public record FilesEntitlement(List filesData) implements Entitlement
case CONFIG:
return relativePaths.map(relativePath -> pathLookup.configDir().resolve(relativePath));
case DATA:
- // multiple data dirs are a pain...we need the combination of relative paths and data dirs
- List paths = new ArrayList<>();
- for (var relativePath : relativePaths.toList()) {
- for (var dataDir : pathLookup.dataDirs()) {
- paths.add(dataDir.resolve(relativePath));
- }
- }
- return paths.stream();
+ return relativePathsCombination(pathLookup.dataDirs(), relativePaths);
+ case SHARED_REPO:
+ return relativePathsCombination(pathLookup.sharedRepoDirs(), relativePaths);
case HOME:
return relativePaths.map(relativePath -> pathLookup.homeDir().resolve(relativePath));
default:
@@ -91,32 +163,81 @@ public record FilesEntitlement(List filesData) implements Entitlement
}
}
- private record AbsolutePathFileData(Path path, Mode mode) implements FileData {
+ private static Stream relativePathsCombination(Path[] baseDirs, Stream relativePaths) {
+ // multiple base dirs are a pain...we need the combination of the base dirs and relative paths
+ List paths = new ArrayList<>();
+ for (var relativePath : relativePaths.toList()) {
+ for (var dataDir : baseDirs) {
+ paths.add(dataDir.resolve(relativePath));
+ }
+ }
+ return paths.stream();
+ }
+
+ private record AbsolutePathFileData(Path path, Mode mode, Platform platform) implements FileData {
@Override
public Stream resolvePaths(PathLookup pathLookup) {
return Stream.of(path);
}
+
+ @Override
+ public FileData withPlatform(Platform platform) {
+ if (platform == platform()) {
+ return this;
+ }
+ return new AbsolutePathFileData(path, mode, platform);
+ }
}
- private record RelativePathFileData(Path relativePath, BaseDir baseDir, Mode mode) implements FileData, RelativeFileData {
+ private record RelativePathFileData(Path relativePath, BaseDir baseDir, Mode mode, Platform platform)
+ implements
+ FileData,
+ RelativeFileData {
@Override
public Stream resolveRelativePaths(PathLookup pathLookup) {
return Stream.of(relativePath);
}
+
+ @Override
+ public FileData withPlatform(Platform platform) {
+ if (platform == platform()) {
+ return this;
+ }
+ return new RelativePathFileData(relativePath, baseDir, mode, platform);
+ }
}
- private record PathSettingFileData(String setting, Mode mode) implements FileData {
+ private record PathSettingFileData(String setting, Mode mode, Platform platform) implements FileData {
@Override
public Stream resolvePaths(PathLookup pathLookup) {
return resolvePathSettings(pathLookup, setting);
}
+
+ @Override
+ public FileData withPlatform(Platform platform) {
+ if (platform == platform()) {
+ return this;
+ }
+ return new PathSettingFileData(setting, mode, platform);
+ }
}
- private record RelativePathSettingFileData(String setting, BaseDir baseDir, Mode mode) implements FileData, RelativeFileData {
+ private record RelativePathSettingFileData(String setting, BaseDir baseDir, Mode mode, Platform platform)
+ implements
+ FileData,
+ RelativeFileData {
@Override
public Stream resolveRelativePaths(PathLookup pathLookup) {
return resolvePathSettings(pathLookup, setting);
}
+
+ @Override
+ public FileData withPlatform(Platform platform) {
+ if (platform == platform()) {
+ return this;
+ }
+ return new RelativePathSettingFileData(setting, baseDir, mode, platform);
+ }
}
private static Stream resolvePathSettings(PathLookup pathLookup, String setting) {
@@ -137,11 +258,24 @@ public record FilesEntitlement(List filesData) implements Entitlement
}
}
+ private static Platform parsePlatform(String platform) {
+ if (platform.equals("linux")) {
+ return Platform.LINUX;
+ } else if (platform.equals("macos")) {
+ return Platform.MACOS;
+ } else if (platform.equals("windows")) {
+ return Platform.WINDOWS;
+ } else {
+ throw new PolicyValidationException("invalid platform: " + platform + ", valid values: [linux, macos, windows]");
+ }
+ }
+
private static BaseDir parseBaseDir(String baseDir) {
return switch (baseDir) {
case "config" -> BaseDir.CONFIG;
case "data" -> BaseDir.DATA;
case "home" -> BaseDir.HOME;
+ // NOTE: shared_repo is _not_ accessible to policy files, only internally
default -> throw new PolicyValidationException(
"invalid relative directory: " + baseDir + ", valid values: [config, data, home]"
);
@@ -163,6 +297,7 @@ public record FilesEntitlement(List filesData) implements Entitlement
String pathSetting = file.remove("path_setting");
String relativePathSetting = file.remove("relative_path_setting");
String modeAsString = file.remove("mode");
+ String platformAsString = file.remove("platform");
if (file.isEmpty() == false) {
throw new PolicyValidationException("unknown key(s) [" + file + "] in a listed file for files entitlement");
@@ -179,38 +314,45 @@ public record FilesEntitlement(List filesData) implements Entitlement
throw new PolicyValidationException("files entitlement must contain 'mode' for every listed file");
}
Mode mode = parseMode(modeAsString);
+ Platform platform = null;
+ if (platformAsString != null) {
+ platform = parsePlatform(platformAsString);
+ }
BaseDir baseDir = null;
if (relativeTo != null) {
baseDir = parseBaseDir(relativeTo);
}
+ final FileData fileData;
if (relativePathAsString != null) {
if (baseDir == null) {
throw new PolicyValidationException("files entitlement with a 'relative_path' must specify 'relative_to'");
}
Path relativePath = Path.of(relativePathAsString);
- if (relativePath.isAbsolute()) {
+ if (FileData.isAbsolutePath(relativePathAsString)) {
throw new PolicyValidationException("'relative_path' [" + relativePathAsString + "] must be relative");
}
- filesData.add(FileData.ofRelativePath(relativePath, baseDir, mode));
+ fileData = FileData.ofRelativePath(relativePath, baseDir, mode);
} else if (pathAsString != null) {
Path path = Path.of(pathAsString);
- if (path.isAbsolute() == false) {
+ if (FileData.isAbsolutePath(pathAsString) == false) {
throw new PolicyValidationException("'path' [" + pathAsString + "] must be absolute");
}
- filesData.add(FileData.ofPath(path, mode));
+ fileData = FileData.ofPath(path, mode);
} else if (pathSetting != null) {
- filesData.add(FileData.ofPathSetting(pathSetting, mode));
+ fileData = FileData.ofPathSetting(pathSetting, mode);
} else if (relativePathSetting != null) {
if (baseDir == null) {
throw new PolicyValidationException("files entitlement with a 'relative_path_setting' must specify 'relative_to'");
}
- filesData.add(FileData.ofRelativePathSetting(relativePathSetting, baseDir, mode));
+ fileData = FileData.ofRelativePathSetting(relativePathSetting, baseDir, mode);
} else {
throw new AssertionError("File entry validation error");
}
+
+ filesData.add(fileData.withPlatform(platform));
}
return new FilesEntitlement(filesData);
}
diff --git a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTreeTests.java b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTreeTests.java
index 4eb3620c276f..71ec497b9ec1 100644
--- a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTreeTests.java
+++ b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTreeTests.java
@@ -42,6 +42,7 @@ public class FileAccessTreeTests extends ESTestCase {
Path.of("/home"),
Path.of("/config"),
new Path[] { Path.of("/data1"), Path.of("/data2") },
+ new Path[] { Path.of("/shared1"), Path.of("/shared2") },
Path.of("/tmp"),
setting -> settings.get(setting),
glob -> settings.getGlobValues(glob)
@@ -117,6 +118,15 @@ public class FileAccessTreeTests extends ESTestCase {
assertThat(tree.canWrite(path("foo/baz")), is(false));
}
+ public void testPathAndFileWithSamePrefix() {
+ var tree = accessTree(entitlement("foo/bar/", "read", "foo/bar.xml", "read"));
+ assertThat(tree.canRead(path("foo")), is(false));
+ assertThat(tree.canRead(path("foo/bar")), is(true));
+ assertThat(tree.canRead(path("foo/bar/baz")), is(true));
+ assertThat(tree.canRead(path("foo/bar.xml")), is(true));
+ assertThat(tree.canRead(path("foo/bar.txt")), is(false));
+ }
+
public void testReadWithRelativePath() {
for (var dir : List.of("config", "home")) {
var tree = accessTree(entitlement(Map.of("relative_path", "foo", "mode", "read", "relative_to", dir)));
@@ -171,10 +181,23 @@ public class FileAccessTreeTests extends ESTestCase {
public void testNormalizePath() {
var tree = accessTree(entitlement("foo/../bar", "read"));
assertThat(tree.canRead(path("foo/../bar")), is(true));
+ assertThat(tree.canRead(path("foo/../bar/")), is(true));
assertThat(tree.canRead(path("foo")), is(false));
assertThat(tree.canRead(path("")), is(false));
}
+ public void testNormalizeTrailingSlashes() {
+ var tree = accessTree(entitlement("/trailing/slash/", "read", "/no/trailing/slash", "read"));
+ assertThat(tree.canRead(path("/trailing/slash")), is(true));
+ assertThat(tree.canRead(path("/trailing/slash/")), is(true));
+ assertThat(tree.canRead(path("/trailing/slash.xml")), is(false));
+ assertThat(tree.canRead(path("/trailing/slash/file.xml")), is(true));
+ assertThat(tree.canRead(path("/no/trailing/slash")), is(true));
+ assertThat(tree.canRead(path("/no/trailing/slash/")), is(true));
+ assertThat(tree.canRead(path("/no/trailing/slash.xml")), is(false));
+ assertThat(tree.canRead(path("/no/trailing/slash/file.xml")), is(true));
+ }
+
public void testForwardSlashes() {
String sep = getDefaultFileSystem().getSeparator();
var tree = accessTree(entitlement("a/b", "read", "m" + sep + "n", "read"));
diff --git a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java
index 2b5700d03e71..c9fade1a4821 100644
--- a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java
+++ b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java
@@ -69,6 +69,7 @@ public class PolicyManagerTests extends ESTestCase {
TEST_BASE_DIR.resolve("/user/home"),
TEST_BASE_DIR.resolve("/config"),
new Path[] { TEST_BASE_DIR.resolve("/data1/"), TEST_BASE_DIR.resolve("/data2") },
+ new Path[] { TEST_BASE_DIR.resolve("/shared1"), TEST_BASE_DIR.resolve("/shared2") },
TEST_BASE_DIR.resolve("/temp"),
Settings.EMPTY::get,
Settings.EMPTY::getGlobValues
diff --git a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FileDataTests.java b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FileDataTests.java
new file mode 100644
index 000000000000..12ac8e2d6305
--- /dev/null
+++ b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FileDataTests.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.entitlement.runtime.policy.entitlements;
+
+import org.elasticsearch.test.ESTestCase;
+
+import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.FileData.isAbsolutePath;
+import static org.hamcrest.Matchers.is;
+
+public class FileDataTests extends ESTestCase {
+
+ public void testPathIsAbsolute() {
+ var windowsNamedPipe = "\\\\.\\pipe";
+ var windowsDosAbsolutePath = "C:\\temp";
+ var unixAbsolutePath = "/tmp/foo";
+ var unixStyleUncPath = "//C/temp";
+ var uncPath = "\\\\C\\temp";
+ var longPath = "\\\\?\\C:\\temp";
+
+ var relativePath = "foo";
+ var headingSlashRelativePath = "\\foo";
+
+ assertThat(isAbsolutePath(windowsNamedPipe), is(true));
+ assertThat(isAbsolutePath(windowsDosAbsolutePath), is(true));
+ assertThat(isAbsolutePath(unixAbsolutePath), is(true));
+ assertThat(isAbsolutePath(unixStyleUncPath), is(true));
+ assertThat(isAbsolutePath(uncPath), is(true));
+ assertThat(isAbsolutePath(longPath), is(true));
+
+ assertThat(isAbsolutePath(relativePath), is(false));
+ assertThat(isAbsolutePath(headingSlashRelativePath), is(false));
+ assertThat(isAbsolutePath(""), is(false));
+ }
+}
diff --git a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlementTests.java b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlementTests.java
index b871e8ccf3e6..e0c08d18b8c1 100644
--- a/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlementTests.java
+++ b/libs/entitlement/src/test/java/org/elasticsearch/entitlement/runtime/policy/entitlements/FilesEntitlementTests.java
@@ -40,6 +40,7 @@ public class FilesEntitlementTests extends ESTestCase {
Path.of("home"),
Path.of("/config"),
new Path[] { Path.of("/data1"), Path.of("/data2") },
+ new Path[] { Path.of("/shared1"), Path.of("/shared2") },
Path.of("/tmp"),
setting -> settings.get(setting),
glob -> settings.getGlobValues(glob)
@@ -60,12 +61,36 @@ public class FilesEntitlementTests extends ESTestCase {
assertThat(ex.getMessage(), is("invalid relative directory: bar, valid values: [config, data, home]"));
}
- public void testFileDataRelativeWithEmptyDirectory() {
+ public void testFileDataRelativeWithAbsoluteDirectoryFails() {
var fileData = FileData.ofRelativePath(Path.of(""), FilesEntitlement.BaseDir.DATA, READ_WRITE);
var dataDirs = fileData.resolvePaths(TEST_PATH_LOOKUP);
assertThat(dataDirs.toList(), contains(Path.of("/data1/"), Path.of("/data2")));
}
+ public void testFileDataAbsoluteWithRelativeDirectoryFails() {
+ var ex = expectThrows(
+ PolicyValidationException.class,
+ () -> FilesEntitlement.build(List.of((Map.of("path", "foo", "mode", "read"))))
+ );
+
+ assertThat(ex.getMessage(), is("'path' [foo] must be absolute"));
+ }
+
+ public void testFileDataRelativeWithEmptyDirectory() {
+ var ex = expectThrows(
+ PolicyValidationException.class,
+ () -> FilesEntitlement.build(List.of((Map.of("relative_path", "/foo", "mode", "read", "relative_to", "config"))))
+ );
+
+ var ex2 = expectThrows(
+ PolicyValidationException.class,
+ () -> FilesEntitlement.build(List.of((Map.of("relative_path", "C:\\foo", "mode", "read", "relative_to", "config"))))
+ );
+
+ assertThat(ex.getMessage(), is("'relative_path' [/foo] must be relative"));
+ assertThat(ex2.getMessage(), is("'relative_path' [C:\\foo] must be relative"));
+ }
+
public void testPathSettingResolve() {
var entitlement = FilesEntitlement.build(List.of(Map.of("path_setting", "foo.bar", "mode", "read")));
var filesData = entitlement.filesData();
diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java
index 7305c87d7859..1d65cb30c133 100644
--- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java
+++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/PromoteDataStreamTransportAction.java
@@ -21,7 +21,6 @@ import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.DataStream;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Priority;
@@ -49,7 +48,6 @@ public class PromoteDataStreamTransportAction extends AcknowledgedTransportMaste
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
SystemIndices systemIndices
) {
super(
diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java
index cbf6d58fd4ca..3e416a102fe1 100644
--- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java
+++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsAction.java
@@ -15,7 +15,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.DataStream;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -46,7 +45,6 @@ public class TransportGetDataStreamLifecycleStatsAction extends TransportMasterN
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
DataStreamLifecycleService lifecycleService
) {
super(
diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsActionTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsActionTests.java
index 5bfd9fb25ca6..7e030e9b82b1 100644
--- a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsActionTests.java
+++ b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/action/TransportGetDataStreamLifecycleStatsActionTests.java
@@ -17,7 +17,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.DataStream;
import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
@@ -52,7 +51,6 @@ public class TransportGetDataStreamLifecycleStatsActionTests extends ESTestCase
mock(ClusterService.class),
mock(ThreadPool.class),
mock(ActionFilters.class),
- mock(IndexNameExpressionResolver.class),
dataStreamLifecycleService
);
private Long lastRunDuration;
diff --git a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle
index 71f95a990c6c..35e1514781b9 100644
--- a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle
+++ b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle
@@ -18,7 +18,7 @@ dependencies {
javaRestTestImplementation(testArtifact(project(":qa:full-cluster-restart"), "javaRestTest"))
}
-buildParams.bwcVersions.withWireCompatible(v -> v.before("9.0.0")) { bwcVersion, baseName ->
+buildParams.bwcVersions.withWireCompatible(v -> v.onOrAfter("8.15.0")) { bwcVersion, baseName ->
tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {
usesBwcDistribution(bwcVersion)
systemProperty("tests.old_cluster_version", bwcVersion)
diff --git a/modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java b/modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java
index 15e85c23bf51..a82b236c01aa 100644
--- a/modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java
+++ b/modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java
@@ -12,36 +12,25 @@ import fixture.geoip.GeoIpHttpFixture;
import com.carrotsearch.randomizedtesting.annotations.Name;
-import org.apache.http.util.EntityUtils;
import org.elasticsearch.client.Request;
-import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.Response;
-import org.elasticsearch.client.WarningsHandler;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.util.concurrent.ThreadContext;
-import org.elasticsearch.core.Nullable;
-import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.test.cluster.FeatureFlag;
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
import org.elasticsearch.test.cluster.util.Version;
-import org.elasticsearch.test.rest.ObjectPath;
import org.elasticsearch.upgrades.FullClusterRestartUpgradeStatus;
import org.elasticsearch.upgrades.ParameterizedFullClusterRestartTestCase;
import org.junit.ClassRule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCase {
@@ -50,29 +39,16 @@ public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCas
private static final GeoIpHttpFixture fixture = new GeoIpHttpFixture(useFixture);
- // e.g. use ./gradlew -Dtests.jvm.argline="-Dgeoip_test_with_security=false" ":modules:ingest-geoip:qa:full-cluster-restart:check"
- // to set this to false, if you so desire
- private static final boolean useSecurity = Boolean.parseBoolean(System.getProperty("geoip_test_with_security", "true"));
-
private static final ElasticsearchCluster cluster = ElasticsearchCluster.local()
.distribution(DistributionType.DEFAULT)
.version(Version.fromString(OLD_CLUSTER_VERSION))
.nodes(2)
.setting("ingest.geoip.downloader.endpoint", () -> fixture.getAddress(), s -> useFixture)
- .setting("xpack.security.enabled", useSecurity ? "true" : "false")
+ .setting("xpack.security.enabled", "false")
+ // .setting("logger.org.elasticsearch.ingest.geoip", "TRACE")
.feature(FeatureFlag.TIME_SERIES_MODE)
.build();
- @Override
- protected Settings restClientSettings() {
- Settings settings = super.restClientSettings();
- if (useSecurity) {
- String token = "Basic " + Base64.getEncoder().encodeToString("test_user:x-pack-test-password".getBytes(StandardCharsets.UTF_8));
- settings = Settings.builder().put(settings).put(ThreadContext.PREFIX + ".Authorization", token).build();
- }
- return settings;
- }
-
@ClassRule
public static TestRule ruleChain = RuleChain.outerRule(fixture).around(cluster);
@@ -85,196 +61,32 @@ public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCas
return cluster;
}
- public void testGeoIpSystemFeaturesMigration() throws Exception {
- final List maybeSecurityIndex = useSecurity ? List.of(".security-7") : List.of();
- final List maybeSecurityIndexReindexed = useSecurity ? List.of(".security-7-reindexed-for-10") : List.of();
-
+ @SuppressWarnings("unchecked")
+ public void testGeoIpDatabaseConfigurations() throws Exception {
if (isRunningAgainstOldCluster()) {
- Request enableDownloader = new Request("PUT", "/_cluster/settings");
- enableDownloader.setJsonEntity("""
- {"persistent": {"ingest.geoip.downloader.enabled": true}}
- """);
- assertOK(client().performRequest(enableDownloader));
-
- Request putPipeline = new Request("PUT", "/_ingest/pipeline/geoip");
- putPipeline.setJsonEntity("""
+ Request putConfiguration = new Request("PUT", "_ingest/ip_location/database/my-database-1");
+ putConfiguration.setJsonEntity("""
{
- "description": "Add geoip info",
- "processors": [{
- "geoip": {
- "field": "ip",
- "target_field": "geo",
- "database_file": "GeoLite2-Country.mmdb"
- }
- }]
+ "name": "GeoIP2-Domain",
+ "maxmind": {
+ "account_id": "1234567"
+ }
}
""");
- assertOK(client().performRequest(putPipeline));
-
- // wait for the geo databases to all be loaded
- assertBusy(() -> testDatabasesLoaded(), 30, TimeUnit.SECONDS);
-
- // the geoip index should be created
- assertBusy(() -> testCatIndices(List.of(".geoip_databases"), maybeSecurityIndex));
- assertBusy(() -> testIndexGeoDoc());
-
- // before the upgrade, Kibana should work
- assertBusy(() -> testGetStarAsKibana(List.of("my-index-00001"), maybeSecurityIndex));
-
- // as should a normal get *
- assertBusy(() -> testGetStar(List.of("my-index-00001"), maybeSecurityIndex));
-
- // and getting data streams
- assertBusy(() -> testGetDatastreams());
- } else {
- // after the upgrade, but before the migration, Kibana should work
- assertBusy(() -> testGetStarAsKibana(List.of("my-index-00001"), maybeSecurityIndex));
-
- // as should a normal get *
- assertBusy(() -> testGetStar(List.of("my-index-00001"), maybeSecurityIndex));
-
- // and getting data streams
- assertBusy(() -> testGetDatastreams());
-
- // migrate the system features and give the cluster a moment to settle
- Request migrateSystemFeatures = new Request("POST", "/_migration/system_features");
- assertOK(client().performRequest(migrateSystemFeatures));
- ensureHealth(request -> request.addParameter("wait_for_status", "yellow"));
-
- assertBusy(() -> testCatIndices(List.of(".geoip_databases-reindexed-for-10", "my-index-00001"), maybeSecurityIndexReindexed));
- assertBusy(() -> testIndexGeoDoc());
-
- // after the migration, Kibana should work
- assertBusy(() -> testGetStarAsKibana(List.of("my-index-00001"), maybeSecurityIndexReindexed));
-
- // as should a normal get *
- assertBusy(() -> testGetStar(List.of("my-index-00001"), maybeSecurityIndexReindexed));
-
- // and getting data streams
- assertBusy(() -> testGetDatastreams());
-
- Request disableDownloader = new Request("PUT", "/_cluster/settings");
- disableDownloader.setJsonEntity("""
- {"persistent": {"ingest.geoip.downloader.enabled": false}}
- """);
- assertOK(client().performRequest(disableDownloader));
-
- // the geoip index should be deleted
- assertBusy(() -> testCatIndices(List.of("my-index-00001"), maybeSecurityIndexReindexed));
-
- Request enableDownloader = new Request("PUT", "/_cluster/settings");
- enableDownloader.setJsonEntity("""
- {"persistent": {"ingest.geoip.downloader.enabled": true}}
- """);
- assertOK(client().performRequest(enableDownloader));
-
- // wait for the geo databases to all be loaded
- assertBusy(() -> testDatabasesLoaded(), 30, TimeUnit.SECONDS);
-
- // the geoip index should be recreated
- assertBusy(() -> testCatIndices(List.of(".geoip_databases", "my-index-00001"), maybeSecurityIndexReindexed));
- assertBusy(() -> testIndexGeoDoc());
- }
- }
-
- @SuppressWarnings("unchecked")
- private void testDatabasesLoaded() throws IOException {
- Request getTaskState = new Request("GET", "/_cluster/state");
- ObjectPath state = ObjectPath.createFromResponse(assertOK(client().performRequest(getTaskState)));
-
- List> tasks = state.evaluate("metadata.persistent_tasks.tasks");
- // Short-circuit to avoid using steams if the list is empty
- if (tasks.isEmpty()) {
- fail();
- }
- Map databases = (Map) tasks.stream().map(task -> {
- try {
- return ObjectPath.evaluate(task, "task.geoip-downloader.state.databases");
- } catch (IOException e) {
- return null;
- }
- }).filter(Objects::nonNull).findFirst().orElse(null);
-
- assertNotNull(databases);
-
- for (String name : List.of("GeoLite2-ASN.mmdb", "GeoLite2-City.mmdb", "GeoLite2-Country.mmdb")) {
- Object database = databases.get(name);
- assertNotNull(database);
- assertNotNull(ObjectPath.evaluate(database, "md5"));
- }
- }
-
- private void testCatIndices(List indexNames, @Nullable List additionalIndexNames) throws IOException {
- Request catIndices = new Request("GET", "_cat/indices/*?s=index&h=index&expand_wildcards=all");
- // the cat APIs can sometimes 404, erroneously
- // see https://github.com/elastic/elasticsearch/issues/104371
- setIgnoredErrorResponseCodes(catIndices, RestStatus.NOT_FOUND);
- String response = EntityUtils.toString(assertOK(client().performRequest(catIndices)).getEntity());
- List indices = List.of(response.trim().split("\\s+"));
-
- if (additionalIndexNames != null && additionalIndexNames.isEmpty() == false) {
- indexNames = new ArrayList<>(indexNames); // recopy into a mutable list
- indexNames.addAll(additionalIndexNames);
+ assertOK(client().performRequest(putConfiguration));
}
- assertThat(new HashSet<>(indices), is(new HashSet<>(indexNames)));
- }
-
- private void testIndexGeoDoc() throws IOException {
- Request putDoc = new Request("PUT", "/my-index-00001/_doc/my_id?pipeline=geoip");
- putDoc.setJsonEntity("""
- {"ip": "89.160.20.128"}
- """);
- assertOK(client().performRequest(putDoc));
-
- Request getDoc = new Request("GET", "/my-index-00001/_doc/my_id");
- ObjectPath doc = ObjectPath.createFromResponse(assertOK(client().performRequest(getDoc)));
- assertNull(doc.evaluate("_source.tags"));
- assertEquals("Sweden", doc.evaluate("_source.geo.country_name"));
- }
-
- private void testGetStar(List indexNames, @Nullable List additionalIndexNames) throws IOException {
- Request getStar = new Request("GET", "*?expand_wildcards=all");
- getStar.setOptions(
- RequestOptions.DEFAULT.toBuilder().setWarningsHandler(WarningsHandler.PERMISSIVE) // we don't care about warnings, just errors
- );
- Response response = assertOK(client().performRequest(getStar));
-
- if (additionalIndexNames != null && additionalIndexNames.isEmpty() == false) {
- indexNames = new ArrayList<>(indexNames); // recopy into a mutable list
- indexNames.addAll(additionalIndexNames);
- }
-
- Map map = responseAsMap(response);
- assertThat(map.keySet(), is(new HashSet<>(indexNames)));
- }
-
- private void testGetStarAsKibana(List indexNames, @Nullable List additionalIndexNames) throws IOException {
- Request getStar = new Request("GET", "*?expand_wildcards=all");
- getStar.setOptions(
- RequestOptions.DEFAULT.toBuilder()
- .addHeader("X-elastic-product-origin", "kibana")
- .setWarningsHandler(WarningsHandler.PERMISSIVE) // we don't care about warnings, just errors
- );
- Response response = assertOK(client().performRequest(getStar));
-
- if (additionalIndexNames != null && additionalIndexNames.isEmpty() == false) {
- indexNames = new ArrayList<>(indexNames); // recopy into a mutable list
- indexNames.addAll(additionalIndexNames);
- }
-
- Map map = responseAsMap(response);
- assertThat(map.keySet(), is(new HashSet<>(indexNames)));
- }
-
- private void testGetDatastreams() throws IOException {
- Request getStar = new Request("GET", "_data_stream");
- getStar.setOptions(
- RequestOptions.DEFAULT.toBuilder().setWarningsHandler(WarningsHandler.PERMISSIVE) // we don't care about warnings, just errors
- );
- Response response = client().performRequest(getStar);
- assertOK(response);
-
- // note: we don't actually care about the response, just that there was one and that it didn't error out on us
+ assertBusy(() -> {
+ Request getConfiguration = new Request("GET", "_ingest/ip_location/database/my-database-1");
+ Response response = assertOK(client().performRequest(getConfiguration));
+ Map map = responseAsMap(response);
+ assertThat(map.keySet(), equalTo(Set.of("databases")));
+ List
*/
@Override public T visitWhereCommand(EsqlBaseParser.WhereCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitToDataType(EsqlBaseParser.ToDataTypeContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitRowCommand(EsqlBaseParser.RowCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitFields(EsqlBaseParser.FieldsContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitField(EsqlBaseParser.FieldContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitFromCommand(EsqlBaseParser.FromCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitIndexPattern(EsqlBaseParser.IndexPatternContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitClusterString(EsqlBaseParser.ClusterStringContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitIndexString(EsqlBaseParser.IndexStringContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitMetadata(EsqlBaseParser.MetadataContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitMetricsCommand(EsqlBaseParser.MetricsCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitEvalCommand(EsqlBaseParser.EvalCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitStatsCommand(EsqlBaseParser.StatsCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitAggFields(EsqlBaseParser.AggFieldsContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitAggField(EsqlBaseParser.AggFieldContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitQualifiedName(EsqlBaseParser.QualifiedNameContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitQualifiedNamePatterns(EsqlBaseParser.QualifiedNamePatternsContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitIdentifier(EsqlBaseParser.IdentifierContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitIdentifierPattern(EsqlBaseParser.IdentifierPatternContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitInputParam(EsqlBaseParser.InputParamContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitInputNamedOrPositionalParam(EsqlBaseParser.InputNamedOrPositionalParamContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitIdentifierOrParameter(EsqlBaseParser.IdentifierOrParameterContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitLimitCommand(EsqlBaseParser.LimitCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitSortCommand(EsqlBaseParser.SortCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitOrderExpression(EsqlBaseParser.OrderExpressionContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitKeepCommand(EsqlBaseParser.KeepCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitDropCommand(EsqlBaseParser.DropCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitRenameCommand(EsqlBaseParser.RenameCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitRenameClause(EsqlBaseParser.RenameClauseContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitDissectCommand(EsqlBaseParser.DissectCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitGrokCommand(EsqlBaseParser.GrokCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitMvExpandCommand(EsqlBaseParser.MvExpandCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitCommandOptions(EsqlBaseParser.CommandOptionsContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitCommandOption(EsqlBaseParser.CommandOptionContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitExplainCommand(EsqlBaseParser.ExplainCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitSubqueryExpression(EsqlBaseParser.SubqueryExpressionContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitShowInfo(EsqlBaseParser.ShowInfoContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitEnrichCommand(EsqlBaseParser.EnrichCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitEnrichWithClause(EsqlBaseParser.EnrichWithClauseContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitLookupCommand(EsqlBaseParser.LookupCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitChangePointCommand(EsqlBaseParser.ChangePointCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitInsistCommand(EsqlBaseParser.InsistCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitForkCommand(EsqlBaseParser.ForkCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitForkSubQueries(EsqlBaseParser.ForkSubQueriesContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitForkSubQuery(EsqlBaseParser.ForkSubQueryContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitSingleForkSubQueryCommand(EsqlBaseParser.SingleForkSubQueryCommandContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitCompositeForkSubQuery(EsqlBaseParser.CompositeForkSubQueryContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitForkSubQueryProcessingCommand(EsqlBaseParser.ForkSubQueryProcessingCommandContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@@ -223,139 +566,6 @@ public class EsqlBaseParserBaseVisitor extends AbstractParseTreeVisitor im
* {@link #visitChildren} on {@code ctx}.
*/
@Override public T visitEntryExpression(EsqlBaseParser.EntryExpressionContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitToDataType(EsqlBaseParser.ToDataTypeContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitRowCommand(EsqlBaseParser.RowCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitFields(EsqlBaseParser.FieldsContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitField(EsqlBaseParser.FieldContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitFromCommand(EsqlBaseParser.FromCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitIndexPattern(EsqlBaseParser.IndexPatternContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitClusterString(EsqlBaseParser.ClusterStringContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitIndexString(EsqlBaseParser.IndexStringContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitMetadata(EsqlBaseParser.MetadataContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitMetricsCommand(EsqlBaseParser.MetricsCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitEvalCommand(EsqlBaseParser.EvalCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitStatsCommand(EsqlBaseParser.StatsCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitAggFields(EsqlBaseParser.AggFieldsContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitAggField(EsqlBaseParser.AggFieldContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitQualifiedName(EsqlBaseParser.QualifiedNameContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitQualifiedNamePatterns(EsqlBaseParser.QualifiedNamePatternsContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitIdentifier(EsqlBaseParser.IdentifierContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitIdentifierPattern(EsqlBaseParser.IdentifierPatternContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@@ -426,111 +636,6 @@ public class EsqlBaseParserBaseVisitor extends AbstractParseTreeVisitor im
* {@link #visitChildren} on {@code ctx}.
*/
@Override public T visitStringArrayLiteral(EsqlBaseParser.StringArrayLiteralContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitInputParam(EsqlBaseParser.InputParamContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitInputNamedOrPositionalParam(EsqlBaseParser.InputNamedOrPositionalParamContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitIdentifierOrParameter(EsqlBaseParser.IdentifierOrParameterContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitLimitCommand(EsqlBaseParser.LimitCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitSortCommand(EsqlBaseParser.SortCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitOrderExpression(EsqlBaseParser.OrderExpressionContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitKeepCommand(EsqlBaseParser.KeepCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitDropCommand(EsqlBaseParser.DropCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitRenameCommand(EsqlBaseParser.RenameCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitRenameClause(EsqlBaseParser.RenameClauseContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitDissectCommand(EsqlBaseParser.DissectCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitGrokCommand(EsqlBaseParser.GrokCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitMvExpandCommand(EsqlBaseParser.MvExpandCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitCommandOptions(EsqlBaseParser.CommandOptionsContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitCommandOption(EsqlBaseParser.CommandOptionContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@@ -573,55 +678,6 @@ public class EsqlBaseParserBaseVisitor extends AbstractParseTreeVisitor im
* {@link #visitChildren} on {@code ctx}.
*/
@Override public T visitComparisonOperator(EsqlBaseParser.ComparisonOperatorContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitExplainCommand(EsqlBaseParser.ExplainCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitSubqueryExpression(EsqlBaseParser.SubqueryExpressionContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitShowInfo(EsqlBaseParser.ShowInfoContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitEnrichCommand(EsqlBaseParser.EnrichCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitEnrichWithClause(EsqlBaseParser.EnrichWithClauseContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitLookupCommand(EsqlBaseParser.LookupCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
@@ -650,60 +706,4 @@ public class EsqlBaseParserBaseVisitor extends AbstractParseTreeVisitor im
* {@link #visitChildren} on {@code ctx}.
*/
@Override public T visitJoinPredicate(EsqlBaseParser.JoinPredicateContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitChangePointCommand(EsqlBaseParser.ChangePointCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitInsistCommand(EsqlBaseParser.InsistCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitForkCommand(EsqlBaseParser.ForkCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitForkSubQueries(EsqlBaseParser.ForkSubQueriesContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitForkSubQuery(EsqlBaseParser.ForkSubQueryContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitSingleForkSubQueryCommand(EsqlBaseParser.SingleForkSubQueryCommandContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitCompositeForkSubQuery(EsqlBaseParser.CompositeForkSubQueryContext ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.
- */
- @Override public T visitForkSubQueryProcessingCommand(EsqlBaseParser.ForkSubQueryProcessingCommandContext ctx) { return visitChildren(ctx); }
}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java
index 4d4fb5b891c5..fc2f46eefd40 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserListener.java
@@ -79,6 +79,508 @@ public interface EsqlBaseParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitWhereCommand(EsqlBaseParser.WhereCommandContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code toDataType}
+ * labeled alternative in {@link EsqlBaseParser#dataType}.
+ * @param ctx the parse tree
+ */
+ void enterToDataType(EsqlBaseParser.ToDataTypeContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code toDataType}
+ * labeled alternative in {@link EsqlBaseParser#dataType}.
+ * @param ctx the parse tree
+ */
+ void exitToDataType(EsqlBaseParser.ToDataTypeContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#rowCommand}.
+ * @param ctx the parse tree
+ */
+ void enterRowCommand(EsqlBaseParser.RowCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#rowCommand}.
+ * @param ctx the parse tree
+ */
+ void exitRowCommand(EsqlBaseParser.RowCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#fields}.
+ * @param ctx the parse tree
+ */
+ void enterFields(EsqlBaseParser.FieldsContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#fields}.
+ * @param ctx the parse tree
+ */
+ void exitFields(EsqlBaseParser.FieldsContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#field}.
+ * @param ctx the parse tree
+ */
+ void enterField(EsqlBaseParser.FieldContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#field}.
+ * @param ctx the parse tree
+ */
+ void exitField(EsqlBaseParser.FieldContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#fromCommand}.
+ * @param ctx the parse tree
+ */
+ void enterFromCommand(EsqlBaseParser.FromCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#fromCommand}.
+ * @param ctx the parse tree
+ */
+ void exitFromCommand(EsqlBaseParser.FromCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#indexPattern}.
+ * @param ctx the parse tree
+ */
+ void enterIndexPattern(EsqlBaseParser.IndexPatternContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#indexPattern}.
+ * @param ctx the parse tree
+ */
+ void exitIndexPattern(EsqlBaseParser.IndexPatternContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#clusterString}.
+ * @param ctx the parse tree
+ */
+ void enterClusterString(EsqlBaseParser.ClusterStringContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#clusterString}.
+ * @param ctx the parse tree
+ */
+ void exitClusterString(EsqlBaseParser.ClusterStringContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#indexString}.
+ * @param ctx the parse tree
+ */
+ void enterIndexString(EsqlBaseParser.IndexStringContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#indexString}.
+ * @param ctx the parse tree
+ */
+ void exitIndexString(EsqlBaseParser.IndexStringContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#metadata}.
+ * @param ctx the parse tree
+ */
+ void enterMetadata(EsqlBaseParser.MetadataContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#metadata}.
+ * @param ctx the parse tree
+ */
+ void exitMetadata(EsqlBaseParser.MetadataContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#metricsCommand}.
+ * @param ctx the parse tree
+ */
+ void enterMetricsCommand(EsqlBaseParser.MetricsCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#metricsCommand}.
+ * @param ctx the parse tree
+ */
+ void exitMetricsCommand(EsqlBaseParser.MetricsCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#evalCommand}.
+ * @param ctx the parse tree
+ */
+ void enterEvalCommand(EsqlBaseParser.EvalCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#evalCommand}.
+ * @param ctx the parse tree
+ */
+ void exitEvalCommand(EsqlBaseParser.EvalCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#statsCommand}.
+ * @param ctx the parse tree
+ */
+ void enterStatsCommand(EsqlBaseParser.StatsCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#statsCommand}.
+ * @param ctx the parse tree
+ */
+ void exitStatsCommand(EsqlBaseParser.StatsCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#aggFields}.
+ * @param ctx the parse tree
+ */
+ void enterAggFields(EsqlBaseParser.AggFieldsContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#aggFields}.
+ * @param ctx the parse tree
+ */
+ void exitAggFields(EsqlBaseParser.AggFieldsContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#aggField}.
+ * @param ctx the parse tree
+ */
+ void enterAggField(EsqlBaseParser.AggFieldContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#aggField}.
+ * @param ctx the parse tree
+ */
+ void exitAggField(EsqlBaseParser.AggFieldContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#qualifiedName}.
+ * @param ctx the parse tree
+ */
+ void enterQualifiedName(EsqlBaseParser.QualifiedNameContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#qualifiedName}.
+ * @param ctx the parse tree
+ */
+ void exitQualifiedName(EsqlBaseParser.QualifiedNameContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#qualifiedNamePattern}.
+ * @param ctx the parse tree
+ */
+ void enterQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#qualifiedNamePattern}.
+ * @param ctx the parse tree
+ */
+ void exitQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#qualifiedNamePatterns}.
+ * @param ctx the parse tree
+ */
+ void enterQualifiedNamePatterns(EsqlBaseParser.QualifiedNamePatternsContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#qualifiedNamePatterns}.
+ * @param ctx the parse tree
+ */
+ void exitQualifiedNamePatterns(EsqlBaseParser.QualifiedNamePatternsContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#identifier}.
+ * @param ctx the parse tree
+ */
+ void enterIdentifier(EsqlBaseParser.IdentifierContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#identifier}.
+ * @param ctx the parse tree
+ */
+ void exitIdentifier(EsqlBaseParser.IdentifierContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#identifierPattern}.
+ * @param ctx the parse tree
+ */
+ void enterIdentifierPattern(EsqlBaseParser.IdentifierPatternContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#identifierPattern}.
+ * @param ctx the parse tree
+ */
+ void exitIdentifierPattern(EsqlBaseParser.IdentifierPatternContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code inputParam}
+ * labeled alternative in {@link EsqlBaseParser#parameter}.
+ * @param ctx the parse tree
+ */
+ void enterInputParam(EsqlBaseParser.InputParamContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code inputParam}
+ * labeled alternative in {@link EsqlBaseParser#parameter}.
+ * @param ctx the parse tree
+ */
+ void exitInputParam(EsqlBaseParser.InputParamContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code inputNamedOrPositionalParam}
+ * labeled alternative in {@link EsqlBaseParser#parameter}.
+ * @param ctx the parse tree
+ */
+ void enterInputNamedOrPositionalParam(EsqlBaseParser.InputNamedOrPositionalParamContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code inputNamedOrPositionalParam}
+ * labeled alternative in {@link EsqlBaseParser#parameter}.
+ * @param ctx the parse tree
+ */
+ void exitInputNamedOrPositionalParam(EsqlBaseParser.InputNamedOrPositionalParamContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#identifierOrParameter}.
+ * @param ctx the parse tree
+ */
+ void enterIdentifierOrParameter(EsqlBaseParser.IdentifierOrParameterContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#identifierOrParameter}.
+ * @param ctx the parse tree
+ */
+ void exitIdentifierOrParameter(EsqlBaseParser.IdentifierOrParameterContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#limitCommand}.
+ * @param ctx the parse tree
+ */
+ void enterLimitCommand(EsqlBaseParser.LimitCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#limitCommand}.
+ * @param ctx the parse tree
+ */
+ void exitLimitCommand(EsqlBaseParser.LimitCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#sortCommand}.
+ * @param ctx the parse tree
+ */
+ void enterSortCommand(EsqlBaseParser.SortCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#sortCommand}.
+ * @param ctx the parse tree
+ */
+ void exitSortCommand(EsqlBaseParser.SortCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#orderExpression}.
+ * @param ctx the parse tree
+ */
+ void enterOrderExpression(EsqlBaseParser.OrderExpressionContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#orderExpression}.
+ * @param ctx the parse tree
+ */
+ void exitOrderExpression(EsqlBaseParser.OrderExpressionContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#keepCommand}.
+ * @param ctx the parse tree
+ */
+ void enterKeepCommand(EsqlBaseParser.KeepCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#keepCommand}.
+ * @param ctx the parse tree
+ */
+ void exitKeepCommand(EsqlBaseParser.KeepCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#dropCommand}.
+ * @param ctx the parse tree
+ */
+ void enterDropCommand(EsqlBaseParser.DropCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#dropCommand}.
+ * @param ctx the parse tree
+ */
+ void exitDropCommand(EsqlBaseParser.DropCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#renameCommand}.
+ * @param ctx the parse tree
+ */
+ void enterRenameCommand(EsqlBaseParser.RenameCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#renameCommand}.
+ * @param ctx the parse tree
+ */
+ void exitRenameCommand(EsqlBaseParser.RenameCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#renameClause}.
+ * @param ctx the parse tree
+ */
+ void enterRenameClause(EsqlBaseParser.RenameClauseContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#renameClause}.
+ * @param ctx the parse tree
+ */
+ void exitRenameClause(EsqlBaseParser.RenameClauseContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#dissectCommand}.
+ * @param ctx the parse tree
+ */
+ void enterDissectCommand(EsqlBaseParser.DissectCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#dissectCommand}.
+ * @param ctx the parse tree
+ */
+ void exitDissectCommand(EsqlBaseParser.DissectCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#grokCommand}.
+ * @param ctx the parse tree
+ */
+ void enterGrokCommand(EsqlBaseParser.GrokCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#grokCommand}.
+ * @param ctx the parse tree
+ */
+ void exitGrokCommand(EsqlBaseParser.GrokCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#mvExpandCommand}.
+ * @param ctx the parse tree
+ */
+ void enterMvExpandCommand(EsqlBaseParser.MvExpandCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#mvExpandCommand}.
+ * @param ctx the parse tree
+ */
+ void exitMvExpandCommand(EsqlBaseParser.MvExpandCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#commandOptions}.
+ * @param ctx the parse tree
+ */
+ void enterCommandOptions(EsqlBaseParser.CommandOptionsContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#commandOptions}.
+ * @param ctx the parse tree
+ */
+ void exitCommandOptions(EsqlBaseParser.CommandOptionsContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#commandOption}.
+ * @param ctx the parse tree
+ */
+ void enterCommandOption(EsqlBaseParser.CommandOptionContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#commandOption}.
+ * @param ctx the parse tree
+ */
+ void exitCommandOption(EsqlBaseParser.CommandOptionContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#explainCommand}.
+ * @param ctx the parse tree
+ */
+ void enterExplainCommand(EsqlBaseParser.ExplainCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#explainCommand}.
+ * @param ctx the parse tree
+ */
+ void exitExplainCommand(EsqlBaseParser.ExplainCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#subqueryExpression}.
+ * @param ctx the parse tree
+ */
+ void enterSubqueryExpression(EsqlBaseParser.SubqueryExpressionContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#subqueryExpression}.
+ * @param ctx the parse tree
+ */
+ void exitSubqueryExpression(EsqlBaseParser.SubqueryExpressionContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code showInfo}
+ * labeled alternative in {@link EsqlBaseParser#showCommand}.
+ * @param ctx the parse tree
+ */
+ void enterShowInfo(EsqlBaseParser.ShowInfoContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code showInfo}
+ * labeled alternative in {@link EsqlBaseParser#showCommand}.
+ * @param ctx the parse tree
+ */
+ void exitShowInfo(EsqlBaseParser.ShowInfoContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#enrichCommand}.
+ * @param ctx the parse tree
+ */
+ void enterEnrichCommand(EsqlBaseParser.EnrichCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#enrichCommand}.
+ * @param ctx the parse tree
+ */
+ void exitEnrichCommand(EsqlBaseParser.EnrichCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#enrichWithClause}.
+ * @param ctx the parse tree
+ */
+ void enterEnrichWithClause(EsqlBaseParser.EnrichWithClauseContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#enrichWithClause}.
+ * @param ctx the parse tree
+ */
+ void exitEnrichWithClause(EsqlBaseParser.EnrichWithClauseContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#lookupCommand}.
+ * @param ctx the parse tree
+ */
+ void enterLookupCommand(EsqlBaseParser.LookupCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#lookupCommand}.
+ * @param ctx the parse tree
+ */
+ void exitLookupCommand(EsqlBaseParser.LookupCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#inlinestatsCommand}.
+ * @param ctx the parse tree
+ */
+ void enterInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#inlinestatsCommand}.
+ * @param ctx the parse tree
+ */
+ void exitInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#changePointCommand}.
+ * @param ctx the parse tree
+ */
+ void enterChangePointCommand(EsqlBaseParser.ChangePointCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#changePointCommand}.
+ * @param ctx the parse tree
+ */
+ void exitChangePointCommand(EsqlBaseParser.ChangePointCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#insistCommand}.
+ * @param ctx the parse tree
+ */
+ void enterInsistCommand(EsqlBaseParser.InsistCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#insistCommand}.
+ * @param ctx the parse tree
+ */
+ void exitInsistCommand(EsqlBaseParser.InsistCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#forkCommand}.
+ * @param ctx the parse tree
+ */
+ void enterForkCommand(EsqlBaseParser.ForkCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#forkCommand}.
+ * @param ctx the parse tree
+ */
+ void exitForkCommand(EsqlBaseParser.ForkCommandContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#forkSubQueries}.
+ * @param ctx the parse tree
+ */
+ void enterForkSubQueries(EsqlBaseParser.ForkSubQueriesContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#forkSubQueries}.
+ * @param ctx the parse tree
+ */
+ void exitForkSubQueries(EsqlBaseParser.ForkSubQueriesContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#forkSubQuery}.
+ * @param ctx the parse tree
+ */
+ void enterForkSubQuery(EsqlBaseParser.ForkSubQueryContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#forkSubQuery}.
+ * @param ctx the parse tree
+ */
+ void exitForkSubQuery(EsqlBaseParser.ForkSubQueryContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code singleForkSubQueryCommand}
+ * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
+ * @param ctx the parse tree
+ */
+ void enterSingleForkSubQueryCommand(EsqlBaseParser.SingleForkSubQueryCommandContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code singleForkSubQueryCommand}
+ * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
+ * @param ctx the parse tree
+ */
+ void exitSingleForkSubQueryCommand(EsqlBaseParser.SingleForkSubQueryCommandContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code compositeForkSubQuery}
+ * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
+ * @param ctx the parse tree
+ */
+ void enterCompositeForkSubQuery(EsqlBaseParser.CompositeForkSubQueryContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code compositeForkSubQuery}
+ * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
+ * @param ctx the parse tree
+ */
+ void exitCompositeForkSubQuery(EsqlBaseParser.CompositeForkSubQueryContext ctx);
+ /**
+ * Enter a parse tree produced by {@link EsqlBaseParser#forkSubQueryProcessingCommand}.
+ * @param ctx the parse tree
+ */
+ void enterForkSubQueryProcessingCommand(EsqlBaseParser.ForkSubQueryProcessingCommandContext ctx);
+ /**
+ * Exit a parse tree produced by {@link EsqlBaseParser#forkSubQueryProcessingCommand}.
+ * @param ctx the parse tree
+ */
+ void exitForkSubQueryProcessingCommand(EsqlBaseParser.ForkSubQueryProcessingCommandContext ctx);
/**
* Enter a parse tree produced by the {@code matchExpression}
* labeled alternative in {@link EsqlBaseParser#booleanExpression}.
@@ -343,198 +845,6 @@ public interface EsqlBaseParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitEntryExpression(EsqlBaseParser.EntryExpressionContext ctx);
- /**
- * Enter a parse tree produced by the {@code toDataType}
- * labeled alternative in {@link EsqlBaseParser#dataType}.
- * @param ctx the parse tree
- */
- void enterToDataType(EsqlBaseParser.ToDataTypeContext ctx);
- /**
- * Exit a parse tree produced by the {@code toDataType}
- * labeled alternative in {@link EsqlBaseParser#dataType}.
- * @param ctx the parse tree
- */
- void exitToDataType(EsqlBaseParser.ToDataTypeContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#rowCommand}.
- * @param ctx the parse tree
- */
- void enterRowCommand(EsqlBaseParser.RowCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#rowCommand}.
- * @param ctx the parse tree
- */
- void exitRowCommand(EsqlBaseParser.RowCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#fields}.
- * @param ctx the parse tree
- */
- void enterFields(EsqlBaseParser.FieldsContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#fields}.
- * @param ctx the parse tree
- */
- void exitFields(EsqlBaseParser.FieldsContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#field}.
- * @param ctx the parse tree
- */
- void enterField(EsqlBaseParser.FieldContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#field}.
- * @param ctx the parse tree
- */
- void exitField(EsqlBaseParser.FieldContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#fromCommand}.
- * @param ctx the parse tree
- */
- void enterFromCommand(EsqlBaseParser.FromCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#fromCommand}.
- * @param ctx the parse tree
- */
- void exitFromCommand(EsqlBaseParser.FromCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#indexPattern}.
- * @param ctx the parse tree
- */
- void enterIndexPattern(EsqlBaseParser.IndexPatternContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#indexPattern}.
- * @param ctx the parse tree
- */
- void exitIndexPattern(EsqlBaseParser.IndexPatternContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#clusterString}.
- * @param ctx the parse tree
- */
- void enterClusterString(EsqlBaseParser.ClusterStringContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#clusterString}.
- * @param ctx the parse tree
- */
- void exitClusterString(EsqlBaseParser.ClusterStringContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#indexString}.
- * @param ctx the parse tree
- */
- void enterIndexString(EsqlBaseParser.IndexStringContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#indexString}.
- * @param ctx the parse tree
- */
- void exitIndexString(EsqlBaseParser.IndexStringContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#metadata}.
- * @param ctx the parse tree
- */
- void enterMetadata(EsqlBaseParser.MetadataContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#metadata}.
- * @param ctx the parse tree
- */
- void exitMetadata(EsqlBaseParser.MetadataContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#metricsCommand}.
- * @param ctx the parse tree
- */
- void enterMetricsCommand(EsqlBaseParser.MetricsCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#metricsCommand}.
- * @param ctx the parse tree
- */
- void exitMetricsCommand(EsqlBaseParser.MetricsCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#evalCommand}.
- * @param ctx the parse tree
- */
- void enterEvalCommand(EsqlBaseParser.EvalCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#evalCommand}.
- * @param ctx the parse tree
- */
- void exitEvalCommand(EsqlBaseParser.EvalCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#statsCommand}.
- * @param ctx the parse tree
- */
- void enterStatsCommand(EsqlBaseParser.StatsCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#statsCommand}.
- * @param ctx the parse tree
- */
- void exitStatsCommand(EsqlBaseParser.StatsCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#aggFields}.
- * @param ctx the parse tree
- */
- void enterAggFields(EsqlBaseParser.AggFieldsContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#aggFields}.
- * @param ctx the parse tree
- */
- void exitAggFields(EsqlBaseParser.AggFieldsContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#aggField}.
- * @param ctx the parse tree
- */
- void enterAggField(EsqlBaseParser.AggFieldContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#aggField}.
- * @param ctx the parse tree
- */
- void exitAggField(EsqlBaseParser.AggFieldContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#qualifiedName}.
- * @param ctx the parse tree
- */
- void enterQualifiedName(EsqlBaseParser.QualifiedNameContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#qualifiedName}.
- * @param ctx the parse tree
- */
- void exitQualifiedName(EsqlBaseParser.QualifiedNameContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#qualifiedNamePattern}.
- * @param ctx the parse tree
- */
- void enterQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#qualifiedNamePattern}.
- * @param ctx the parse tree
- */
- void exitQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#qualifiedNamePatterns}.
- * @param ctx the parse tree
- */
- void enterQualifiedNamePatterns(EsqlBaseParser.QualifiedNamePatternsContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#qualifiedNamePatterns}.
- * @param ctx the parse tree
- */
- void exitQualifiedNamePatterns(EsqlBaseParser.QualifiedNamePatternsContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#identifier}.
- * @param ctx the parse tree
- */
- void enterIdentifier(EsqlBaseParser.IdentifierContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#identifier}.
- * @param ctx the parse tree
- */
- void exitIdentifier(EsqlBaseParser.IdentifierContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#identifierPattern}.
- * @param ctx the parse tree
- */
- void enterIdentifierPattern(EsqlBaseParser.IdentifierPatternContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#identifierPattern}.
- * @param ctx the parse tree
- */
- void exitIdentifierPattern(EsqlBaseParser.IdentifierPatternContext ctx);
/**
* Enter a parse tree produced by the {@code nullLiteral}
* labeled alternative in {@link EsqlBaseParser#constant}.
@@ -655,160 +965,6 @@ public interface EsqlBaseParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitStringArrayLiteral(EsqlBaseParser.StringArrayLiteralContext ctx);
- /**
- * Enter a parse tree produced by the {@code inputParam}
- * labeled alternative in {@link EsqlBaseParser#parameter}.
- * @param ctx the parse tree
- */
- void enterInputParam(EsqlBaseParser.InputParamContext ctx);
- /**
- * Exit a parse tree produced by the {@code inputParam}
- * labeled alternative in {@link EsqlBaseParser#parameter}.
- * @param ctx the parse tree
- */
- void exitInputParam(EsqlBaseParser.InputParamContext ctx);
- /**
- * Enter a parse tree produced by the {@code inputNamedOrPositionalParam}
- * labeled alternative in {@link EsqlBaseParser#parameter}.
- * @param ctx the parse tree
- */
- void enterInputNamedOrPositionalParam(EsqlBaseParser.InputNamedOrPositionalParamContext ctx);
- /**
- * Exit a parse tree produced by the {@code inputNamedOrPositionalParam}
- * labeled alternative in {@link EsqlBaseParser#parameter}.
- * @param ctx the parse tree
- */
- void exitInputNamedOrPositionalParam(EsqlBaseParser.InputNamedOrPositionalParamContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#identifierOrParameter}.
- * @param ctx the parse tree
- */
- void enterIdentifierOrParameter(EsqlBaseParser.IdentifierOrParameterContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#identifierOrParameter}.
- * @param ctx the parse tree
- */
- void exitIdentifierOrParameter(EsqlBaseParser.IdentifierOrParameterContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#limitCommand}.
- * @param ctx the parse tree
- */
- void enterLimitCommand(EsqlBaseParser.LimitCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#limitCommand}.
- * @param ctx the parse tree
- */
- void exitLimitCommand(EsqlBaseParser.LimitCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#sortCommand}.
- * @param ctx the parse tree
- */
- void enterSortCommand(EsqlBaseParser.SortCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#sortCommand}.
- * @param ctx the parse tree
- */
- void exitSortCommand(EsqlBaseParser.SortCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#orderExpression}.
- * @param ctx the parse tree
- */
- void enterOrderExpression(EsqlBaseParser.OrderExpressionContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#orderExpression}.
- * @param ctx the parse tree
- */
- void exitOrderExpression(EsqlBaseParser.OrderExpressionContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#keepCommand}.
- * @param ctx the parse tree
- */
- void enterKeepCommand(EsqlBaseParser.KeepCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#keepCommand}.
- * @param ctx the parse tree
- */
- void exitKeepCommand(EsqlBaseParser.KeepCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#dropCommand}.
- * @param ctx the parse tree
- */
- void enterDropCommand(EsqlBaseParser.DropCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#dropCommand}.
- * @param ctx the parse tree
- */
- void exitDropCommand(EsqlBaseParser.DropCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#renameCommand}.
- * @param ctx the parse tree
- */
- void enterRenameCommand(EsqlBaseParser.RenameCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#renameCommand}.
- * @param ctx the parse tree
- */
- void exitRenameCommand(EsqlBaseParser.RenameCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#renameClause}.
- * @param ctx the parse tree
- */
- void enterRenameClause(EsqlBaseParser.RenameClauseContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#renameClause}.
- * @param ctx the parse tree
- */
- void exitRenameClause(EsqlBaseParser.RenameClauseContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#dissectCommand}.
- * @param ctx the parse tree
- */
- void enterDissectCommand(EsqlBaseParser.DissectCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#dissectCommand}.
- * @param ctx the parse tree
- */
- void exitDissectCommand(EsqlBaseParser.DissectCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#grokCommand}.
- * @param ctx the parse tree
- */
- void enterGrokCommand(EsqlBaseParser.GrokCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#grokCommand}.
- * @param ctx the parse tree
- */
- void exitGrokCommand(EsqlBaseParser.GrokCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#mvExpandCommand}.
- * @param ctx the parse tree
- */
- void enterMvExpandCommand(EsqlBaseParser.MvExpandCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#mvExpandCommand}.
- * @param ctx the parse tree
- */
- void exitMvExpandCommand(EsqlBaseParser.MvExpandCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#commandOptions}.
- * @param ctx the parse tree
- */
- void enterCommandOptions(EsqlBaseParser.CommandOptionsContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#commandOptions}.
- * @param ctx the parse tree
- */
- void exitCommandOptions(EsqlBaseParser.CommandOptionsContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#commandOption}.
- * @param ctx the parse tree
- */
- void enterCommandOption(EsqlBaseParser.CommandOptionContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#commandOption}.
- * @param ctx the parse tree
- */
- void exitCommandOption(EsqlBaseParser.CommandOptionContext ctx);
/**
* Enter a parse tree produced by {@link EsqlBaseParser#booleanValue}.
* @param ctx the parse tree
@@ -869,78 +1025,6 @@ public interface EsqlBaseParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitComparisonOperator(EsqlBaseParser.ComparisonOperatorContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#explainCommand}.
- * @param ctx the parse tree
- */
- void enterExplainCommand(EsqlBaseParser.ExplainCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#explainCommand}.
- * @param ctx the parse tree
- */
- void exitExplainCommand(EsqlBaseParser.ExplainCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#subqueryExpression}.
- * @param ctx the parse tree
- */
- void enterSubqueryExpression(EsqlBaseParser.SubqueryExpressionContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#subqueryExpression}.
- * @param ctx the parse tree
- */
- void exitSubqueryExpression(EsqlBaseParser.SubqueryExpressionContext ctx);
- /**
- * Enter a parse tree produced by the {@code showInfo}
- * labeled alternative in {@link EsqlBaseParser#showCommand}.
- * @param ctx the parse tree
- */
- void enterShowInfo(EsqlBaseParser.ShowInfoContext ctx);
- /**
- * Exit a parse tree produced by the {@code showInfo}
- * labeled alternative in {@link EsqlBaseParser#showCommand}.
- * @param ctx the parse tree
- */
- void exitShowInfo(EsqlBaseParser.ShowInfoContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#enrichCommand}.
- * @param ctx the parse tree
- */
- void enterEnrichCommand(EsqlBaseParser.EnrichCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#enrichCommand}.
- * @param ctx the parse tree
- */
- void exitEnrichCommand(EsqlBaseParser.EnrichCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#enrichWithClause}.
- * @param ctx the parse tree
- */
- void enterEnrichWithClause(EsqlBaseParser.EnrichWithClauseContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#enrichWithClause}.
- * @param ctx the parse tree
- */
- void exitEnrichWithClause(EsqlBaseParser.EnrichWithClauseContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#lookupCommand}.
- * @param ctx the parse tree
- */
- void enterLookupCommand(EsqlBaseParser.LookupCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#lookupCommand}.
- * @param ctx the parse tree
- */
- void exitLookupCommand(EsqlBaseParser.LookupCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#inlinestatsCommand}.
- * @param ctx the parse tree
- */
- void enterInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#inlinestatsCommand}.
- * @param ctx the parse tree
- */
- void exitInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx);
/**
* Enter a parse tree produced by {@link EsqlBaseParser#joinCommand}.
* @param ctx the parse tree
@@ -981,88 +1065,4 @@ public interface EsqlBaseParserListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitJoinPredicate(EsqlBaseParser.JoinPredicateContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#changePointCommand}.
- * @param ctx the parse tree
- */
- void enterChangePointCommand(EsqlBaseParser.ChangePointCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#changePointCommand}.
- * @param ctx the parse tree
- */
- void exitChangePointCommand(EsqlBaseParser.ChangePointCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#insistCommand}.
- * @param ctx the parse tree
- */
- void enterInsistCommand(EsqlBaseParser.InsistCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#insistCommand}.
- * @param ctx the parse tree
- */
- void exitInsistCommand(EsqlBaseParser.InsistCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#forkCommand}.
- * @param ctx the parse tree
- */
- void enterForkCommand(EsqlBaseParser.ForkCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#forkCommand}.
- * @param ctx the parse tree
- */
- void exitForkCommand(EsqlBaseParser.ForkCommandContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#forkSubQueries}.
- * @param ctx the parse tree
- */
- void enterForkSubQueries(EsqlBaseParser.ForkSubQueriesContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#forkSubQueries}.
- * @param ctx the parse tree
- */
- void exitForkSubQueries(EsqlBaseParser.ForkSubQueriesContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#forkSubQuery}.
- * @param ctx the parse tree
- */
- void enterForkSubQuery(EsqlBaseParser.ForkSubQueryContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#forkSubQuery}.
- * @param ctx the parse tree
- */
- void exitForkSubQuery(EsqlBaseParser.ForkSubQueryContext ctx);
- /**
- * Enter a parse tree produced by the {@code singleForkSubQueryCommand}
- * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
- * @param ctx the parse tree
- */
- void enterSingleForkSubQueryCommand(EsqlBaseParser.SingleForkSubQueryCommandContext ctx);
- /**
- * Exit a parse tree produced by the {@code singleForkSubQueryCommand}
- * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
- * @param ctx the parse tree
- */
- void exitSingleForkSubQueryCommand(EsqlBaseParser.SingleForkSubQueryCommandContext ctx);
- /**
- * Enter a parse tree produced by the {@code compositeForkSubQuery}
- * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
- * @param ctx the parse tree
- */
- void enterCompositeForkSubQuery(EsqlBaseParser.CompositeForkSubQueryContext ctx);
- /**
- * Exit a parse tree produced by the {@code compositeForkSubQuery}
- * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
- * @param ctx the parse tree
- */
- void exitCompositeForkSubQuery(EsqlBaseParser.CompositeForkSubQueryContext ctx);
- /**
- * Enter a parse tree produced by {@link EsqlBaseParser#forkSubQueryProcessingCommand}.
- * @param ctx the parse tree
- */
- void enterForkSubQueryProcessingCommand(EsqlBaseParser.ForkSubQueryProcessingCommandContext ctx);
- /**
- * Exit a parse tree produced by {@link EsqlBaseParser#forkSubQueryProcessingCommand}.
- * @param ctx the parse tree
- */
- void exitForkSubQueryProcessingCommand(EsqlBaseParser.ForkSubQueryProcessingCommandContext ctx);
}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java
index 15639e19ee3c..dc11d36e0090 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParserVisitor.java
@@ -56,6 +56,306 @@ public interface EsqlBaseParserVisitor extends ParseTreeVisitor {
* @return the visitor result
*/
T visitWhereCommand(EsqlBaseParser.WhereCommandContext ctx);
+ /**
+ * Visit a parse tree produced by the {@code toDataType}
+ * labeled alternative in {@link EsqlBaseParser#dataType}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitToDataType(EsqlBaseParser.ToDataTypeContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#rowCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitRowCommand(EsqlBaseParser.RowCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#fields}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitFields(EsqlBaseParser.FieldsContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#field}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitField(EsqlBaseParser.FieldContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#fromCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitFromCommand(EsqlBaseParser.FromCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#indexPattern}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitIndexPattern(EsqlBaseParser.IndexPatternContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#clusterString}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitClusterString(EsqlBaseParser.ClusterStringContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#indexString}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitIndexString(EsqlBaseParser.IndexStringContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#metadata}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitMetadata(EsqlBaseParser.MetadataContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#metricsCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitMetricsCommand(EsqlBaseParser.MetricsCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#evalCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitEvalCommand(EsqlBaseParser.EvalCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#statsCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitStatsCommand(EsqlBaseParser.StatsCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#aggFields}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitAggFields(EsqlBaseParser.AggFieldsContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#aggField}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitAggField(EsqlBaseParser.AggFieldContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#qualifiedName}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitQualifiedName(EsqlBaseParser.QualifiedNameContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#qualifiedNamePattern}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#qualifiedNamePatterns}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitQualifiedNamePatterns(EsqlBaseParser.QualifiedNamePatternsContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#identifier}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitIdentifier(EsqlBaseParser.IdentifierContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#identifierPattern}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitIdentifierPattern(EsqlBaseParser.IdentifierPatternContext ctx);
+ /**
+ * Visit a parse tree produced by the {@code inputParam}
+ * labeled alternative in {@link EsqlBaseParser#parameter}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitInputParam(EsqlBaseParser.InputParamContext ctx);
+ /**
+ * Visit a parse tree produced by the {@code inputNamedOrPositionalParam}
+ * labeled alternative in {@link EsqlBaseParser#parameter}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitInputNamedOrPositionalParam(EsqlBaseParser.InputNamedOrPositionalParamContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#identifierOrParameter}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitIdentifierOrParameter(EsqlBaseParser.IdentifierOrParameterContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#limitCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitLimitCommand(EsqlBaseParser.LimitCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#sortCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitSortCommand(EsqlBaseParser.SortCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#orderExpression}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitOrderExpression(EsqlBaseParser.OrderExpressionContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#keepCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitKeepCommand(EsqlBaseParser.KeepCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#dropCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitDropCommand(EsqlBaseParser.DropCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#renameCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitRenameCommand(EsqlBaseParser.RenameCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#renameClause}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitRenameClause(EsqlBaseParser.RenameClauseContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#dissectCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitDissectCommand(EsqlBaseParser.DissectCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#grokCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitGrokCommand(EsqlBaseParser.GrokCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#mvExpandCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitMvExpandCommand(EsqlBaseParser.MvExpandCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#commandOptions}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitCommandOptions(EsqlBaseParser.CommandOptionsContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#commandOption}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitCommandOption(EsqlBaseParser.CommandOptionContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#explainCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitExplainCommand(EsqlBaseParser.ExplainCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#subqueryExpression}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitSubqueryExpression(EsqlBaseParser.SubqueryExpressionContext ctx);
+ /**
+ * Visit a parse tree produced by the {@code showInfo}
+ * labeled alternative in {@link EsqlBaseParser#showCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitShowInfo(EsqlBaseParser.ShowInfoContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#enrichCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitEnrichCommand(EsqlBaseParser.EnrichCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#enrichWithClause}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitEnrichWithClause(EsqlBaseParser.EnrichWithClauseContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#lookupCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitLookupCommand(EsqlBaseParser.LookupCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#inlinestatsCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#changePointCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitChangePointCommand(EsqlBaseParser.ChangePointCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#insistCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitInsistCommand(EsqlBaseParser.InsistCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#forkCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitForkCommand(EsqlBaseParser.ForkCommandContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#forkSubQueries}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitForkSubQueries(EsqlBaseParser.ForkSubQueriesContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#forkSubQuery}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitForkSubQuery(EsqlBaseParser.ForkSubQueryContext ctx);
+ /**
+ * Visit a parse tree produced by the {@code singleForkSubQueryCommand}
+ * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitSingleForkSubQueryCommand(EsqlBaseParser.SingleForkSubQueryCommandContext ctx);
+ /**
+ * Visit a parse tree produced by the {@code compositeForkSubQuery}
+ * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitCompositeForkSubQuery(EsqlBaseParser.CompositeForkSubQueryContext ctx);
+ /**
+ * Visit a parse tree produced by {@link EsqlBaseParser#forkSubQueryProcessingCommand}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitForkSubQueryProcessingCommand(EsqlBaseParser.ForkSubQueryProcessingCommandContext ctx);
/**
* Visit a parse tree produced by the {@code matchExpression}
* labeled alternative in {@link EsqlBaseParser#booleanExpression}.
@@ -211,121 +511,6 @@ public interface EsqlBaseParserVisitor extends ParseTreeVisitor {
* @return the visitor result
*/
T visitEntryExpression(EsqlBaseParser.EntryExpressionContext ctx);
- /**
- * Visit a parse tree produced by the {@code toDataType}
- * labeled alternative in {@link EsqlBaseParser#dataType}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitToDataType(EsqlBaseParser.ToDataTypeContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#rowCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitRowCommand(EsqlBaseParser.RowCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#fields}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitFields(EsqlBaseParser.FieldsContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#field}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitField(EsqlBaseParser.FieldContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#fromCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitFromCommand(EsqlBaseParser.FromCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#indexPattern}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitIndexPattern(EsqlBaseParser.IndexPatternContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#clusterString}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitClusterString(EsqlBaseParser.ClusterStringContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#indexString}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitIndexString(EsqlBaseParser.IndexStringContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#metadata}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitMetadata(EsqlBaseParser.MetadataContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#metricsCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitMetricsCommand(EsqlBaseParser.MetricsCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#evalCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitEvalCommand(EsqlBaseParser.EvalCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#statsCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitStatsCommand(EsqlBaseParser.StatsCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#aggFields}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitAggFields(EsqlBaseParser.AggFieldsContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#aggField}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitAggField(EsqlBaseParser.AggFieldContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#qualifiedName}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitQualifiedName(EsqlBaseParser.QualifiedNameContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#qualifiedNamePattern}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitQualifiedNamePattern(EsqlBaseParser.QualifiedNamePatternContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#qualifiedNamePatterns}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitQualifiedNamePatterns(EsqlBaseParser.QualifiedNamePatternsContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#identifier}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitIdentifier(EsqlBaseParser.IdentifierContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#identifierPattern}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitIdentifierPattern(EsqlBaseParser.IdentifierPatternContext ctx);
/**
* Visit a parse tree produced by the {@code nullLiteral}
* labeled alternative in {@link EsqlBaseParser#constant}.
@@ -396,98 +581,6 @@ public interface EsqlBaseParserVisitor extends ParseTreeVisitor {
* @return the visitor result
*/
T visitStringArrayLiteral(EsqlBaseParser.StringArrayLiteralContext ctx);
- /**
- * Visit a parse tree produced by the {@code inputParam}
- * labeled alternative in {@link EsqlBaseParser#parameter}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitInputParam(EsqlBaseParser.InputParamContext ctx);
- /**
- * Visit a parse tree produced by the {@code inputNamedOrPositionalParam}
- * labeled alternative in {@link EsqlBaseParser#parameter}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitInputNamedOrPositionalParam(EsqlBaseParser.InputNamedOrPositionalParamContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#identifierOrParameter}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitIdentifierOrParameter(EsqlBaseParser.IdentifierOrParameterContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#limitCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitLimitCommand(EsqlBaseParser.LimitCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#sortCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitSortCommand(EsqlBaseParser.SortCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#orderExpression}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitOrderExpression(EsqlBaseParser.OrderExpressionContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#keepCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitKeepCommand(EsqlBaseParser.KeepCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#dropCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitDropCommand(EsqlBaseParser.DropCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#renameCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitRenameCommand(EsqlBaseParser.RenameCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#renameClause}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitRenameClause(EsqlBaseParser.RenameClauseContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#dissectCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitDissectCommand(EsqlBaseParser.DissectCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#grokCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitGrokCommand(EsqlBaseParser.GrokCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#mvExpandCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitMvExpandCommand(EsqlBaseParser.MvExpandCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#commandOptions}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitCommandOptions(EsqlBaseParser.CommandOptionsContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#commandOption}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitCommandOption(EsqlBaseParser.CommandOptionContext ctx);
/**
* Visit a parse tree produced by {@link EsqlBaseParser#booleanValue}.
* @param ctx the parse tree
@@ -524,49 +617,6 @@ public interface EsqlBaseParserVisitor extends ParseTreeVisitor {
* @return the visitor result
*/
T visitComparisonOperator(EsqlBaseParser.ComparisonOperatorContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#explainCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitExplainCommand(EsqlBaseParser.ExplainCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#subqueryExpression}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitSubqueryExpression(EsqlBaseParser.SubqueryExpressionContext ctx);
- /**
- * Visit a parse tree produced by the {@code showInfo}
- * labeled alternative in {@link EsqlBaseParser#showCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitShowInfo(EsqlBaseParser.ShowInfoContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#enrichCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitEnrichCommand(EsqlBaseParser.EnrichCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#enrichWithClause}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitEnrichWithClause(EsqlBaseParser.EnrichWithClauseContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#lookupCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitLookupCommand(EsqlBaseParser.LookupCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#inlinestatsCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitInlinestatsCommand(EsqlBaseParser.InlinestatsCommandContext ctx);
/**
* Visit a parse tree produced by {@link EsqlBaseParser#joinCommand}.
* @param ctx the parse tree
@@ -591,54 +641,4 @@ public interface EsqlBaseParserVisitor extends ParseTreeVisitor {
* @return the visitor result
*/
T visitJoinPredicate(EsqlBaseParser.JoinPredicateContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#changePointCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitChangePointCommand(EsqlBaseParser.ChangePointCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#insistCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitInsistCommand(EsqlBaseParser.InsistCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#forkCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitForkCommand(EsqlBaseParser.ForkCommandContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#forkSubQueries}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitForkSubQueries(EsqlBaseParser.ForkSubQueriesContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#forkSubQuery}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitForkSubQuery(EsqlBaseParser.ForkSubQueryContext ctx);
- /**
- * Visit a parse tree produced by the {@code singleForkSubQueryCommand}
- * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitSingleForkSubQueryCommand(EsqlBaseParser.SingleForkSubQueryCommandContext ctx);
- /**
- * Visit a parse tree produced by the {@code compositeForkSubQuery}
- * labeled alternative in {@link EsqlBaseParser#forkSubQueryCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitCompositeForkSubQuery(EsqlBaseParser.CompositeForkSubQueryContext ctx);
- /**
- * Visit a parse tree produced by {@link EsqlBaseParser#forkSubQueryProcessingCommand}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitForkSubQueryProcessingCommand(EsqlBaseParser.ForkSubQueryProcessingCommandContext ctx);
}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlInfoTransportActionTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlInfoTransportActionTests.java
index 61e218572183..3521e173cdee 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlInfoTransportActionTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlInfoTransportActionTests.java
@@ -100,14 +100,7 @@ public class EsqlInfoTransportActionTests extends ESTestCase {
when(mockNode.getId()).thenReturn("mocknode");
when(clusterService.localNode()).thenReturn(mockNode);
- var usageAction = new EsqlUsageTransportAction(
- transportService,
- clusterService,
- threadPool,
- mock(ActionFilters.class),
- null,
- client
- );
+ var usageAction = new EsqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client);
PlainActionFuture future = new PlainActionFuture<>();
usageAction.masterOperation(mock(Task.class), null, null, future);
EsqlFeatureSetUsage esqlUsage = (EsqlFeatureSetUsage) future.get().getUsage();
diff --git a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/GraphUsageTransportAction.java b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/GraphUsageTransportAction.java
index 358998e207ca..89799b399d7a 100644
--- a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/GraphUsageTransportAction.java
+++ b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/GraphUsageTransportAction.java
@@ -9,7 +9,6 @@ package org.elasticsearch.xpack.graph;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.injection.guice.Inject;
@@ -35,7 +34,6 @@ public class GraphUsageTransportAction extends XPackUsageFeatureTransportAction
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Settings settings,
XPackLicenseState licenseState
) {
diff --git a/x-pack/plugin/graph/src/test/java/org/elasticsearch/xpack/graph/GraphInfoTransportActionTests.java b/x-pack/plugin/graph/src/test/java/org/elasticsearch/xpack/graph/GraphInfoTransportActionTests.java
index db6bfe798568..8624969a9710 100644
--- a/x-pack/plugin/graph/src/test/java/org/elasticsearch/xpack/graph/GraphInfoTransportActionTests.java
+++ b/x-pack/plugin/graph/src/test/java/org/elasticsearch/xpack/graph/GraphInfoTransportActionTests.java
@@ -50,7 +50,6 @@ public class GraphInfoTransportActionTests extends ESTestCase {
null,
mock(ThreadPool.class),
mock(ActionFilters.class),
- null,
Settings.EMPTY,
licenseState
);
@@ -90,7 +89,6 @@ public class GraphInfoTransportActionTests extends ESTestCase {
null,
mock(ThreadPool.class),
mock(ActionFilters.class),
- null,
settings.build(),
licenseState
);
diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java
index 963ae231bf05..2e04d37be151 100644
--- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java
+++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java
@@ -10,7 +10,6 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.rollover.RolloverConditions;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.core.Tuple;
@@ -48,8 +47,7 @@ public class IndexLifecycleUsageTransportAction extends XPackUsageFeatureTranspo
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(XPackUsageFeatureAction.INDEX_LIFECYCLE.name(), transportService, clusterService, threadPool, actionFilters);
}
diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportDeleteLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportDeleteLifecycleAction.java
index ba0b1244d588..13ca5217a779 100644
--- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportDeleteLifecycleAction.java
+++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportDeleteLifecycleAction.java
@@ -17,7 +17,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
import org.elasticsearch.cluster.project.ProjectResolver;
@@ -51,8 +50,7 @@ public class TransportDeleteLifecycleAction extends TransportMasterNodeAction future = new PlainActionFuture<>();
usageAction.masterOperation(null, null, clusterState, future);
IndexLifecycleFeatureSetUsage ilmUsage = (IndexLifecycleFeatureSetUsage) future.get().getUsage();
diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportDeleteLifecycleActionTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportDeleteLifecycleActionTests.java
index eae024adc2e0..7ec50e88ca4c 100644
--- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportDeleteLifecycleActionTests.java
+++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportDeleteLifecycleActionTests.java
@@ -8,7 +8,6 @@
package org.elasticsearch.xpack.ilm.action;
import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.project.ProjectResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.test.ESTestCase;
@@ -29,8 +28,7 @@ public class TransportDeleteLifecycleActionTests extends ESTestCase {
mock(ClusterService.class),
threadPool,
mock(ActionFilters.class),
- mock(ProjectResolver.class),
- mock(IndexNameExpressionResolver.class)
+ mock(ProjectResolver.class)
);
assertEquals(ReservedLifecycleAction.NAME, putAction.reservedStateHandlerName().get());
diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportPutLifecycleActionTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportPutLifecycleActionTests.java
index 5dd1365f80c6..2498846c9498 100644
--- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportPutLifecycleActionTests.java
+++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportPutLifecycleActionTests.java
@@ -9,7 +9,6 @@ package org.elasticsearch.xpack.ilm.action;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.client.internal.Client;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.project.ProjectResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.license.XPackLicenseState;
@@ -55,7 +54,6 @@ public class TransportPutLifecycleActionTests extends ESTestCase {
mock(ClusterService.class),
threadPool,
mock(ActionFilters.class),
- mock(IndexNameExpressionResolver.class),
mock(NamedXContentRegistry.class),
mock(XPackLicenseState.class),
mock(Client.class),
diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportStopILMActionTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportStopILMActionTests.java
index bd0d63ebb0f3..073cb5554443 100644
--- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportStopILMActionTests.java
+++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/action/TransportStopILMActionTests.java
@@ -11,7 +11,6 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Priority;
import org.elasticsearch.tasks.Task;
@@ -42,8 +41,7 @@ public class TransportStopILMActionTests extends ESTestCase {
transportService,
clusterService,
threadPool,
- mock(ActionFilters.class),
- mock(IndexNameExpressionResolver.class)
+ mock(ActionFilters.class)
);
Task task = new Task(
randomLong(),
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointAction.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointAction.java
index 3b6901ae0c31..82e04b08c4e7 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointAction.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointAction.java
@@ -18,7 +18,6 @@ import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.inference.InferenceServiceRegistry;
@@ -53,7 +52,6 @@ public class TransportDeleteInferenceEndpointAction extends TransportMasterNodeA
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
ModelRegistry modelRegistry,
InferenceServiceRegistry serviceRegistry
) {
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java
index ec41c9327b34..6804257d1cf4 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java
@@ -12,7 +12,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.client.internal.OriginSettingClient;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.inference.ModelConfigurations;
import org.elasticsearch.inference.TaskType;
@@ -42,7 +41,6 @@ public class TransportInferenceUsageAction extends XPackUsageFeatureTransportAct
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Client client
) {
super(XPackUsageFeatureAction.INFERENCE.name(), transportService, clusterService, threadPool, actionFilters);
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java
index 73af12dacfad..fb7543079923 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportPutInferenceModelAction.java
@@ -16,7 +16,6 @@ import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -72,7 +71,6 @@ public class TransportPutInferenceModelAction extends TransportMasterNodeAction<
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
XPackLicenseState licenseState,
ModelRegistry modelRegistry,
InferenceServiceRegistry serviceRegistry,
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportUpdateInferenceModelAction.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportUpdateInferenceModelAction.java
index ed005a86d66b..004739710b74 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportUpdateInferenceModelAction.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportUpdateInferenceModelAction.java
@@ -19,7 +19,6 @@ import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -83,7 +82,6 @@ public class TransportUpdateInferenceModelAction extends TransportMasterNodeActi
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
XPackLicenseState licenseState,
ModelRegistry modelRegistry,
InferenceServiceRegistry serviceRegistry,
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpClient.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpClient.java
index f0102d01b37a..f890b6fce13d 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpClient.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpClient.java
@@ -8,6 +8,7 @@
package org.elasticsearch.xpack.inference.external.http;
import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.concurrent.FutureCallback;
import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
@@ -56,14 +57,18 @@ public class HttpClient implements Closeable {
PoolingNHttpClientConnectionManager connectionManager,
ThrottlerManager throttlerManager
) {
- CloseableHttpAsyncClient client = createAsyncClient(Objects.requireNonNull(connectionManager));
+ var client = createAsyncClient(Objects.requireNonNull(connectionManager), Objects.requireNonNull(settings));
return new HttpClient(settings, client, threadPool, throttlerManager);
}
- private static CloseableHttpAsyncClient createAsyncClient(PoolingNHttpClientConnectionManager connectionManager) {
- HttpAsyncClientBuilder clientBuilder = HttpAsyncClientBuilder.create();
- clientBuilder.setConnectionManager(connectionManager);
+ private static CloseableHttpAsyncClient createAsyncClient(
+ PoolingNHttpClientConnectionManager connectionManager,
+ HttpSettings settings
+ ) {
+ var requestConfig = RequestConfig.custom().setConnectTimeout(settings.connectionTimeout()).build();
+
+ var clientBuilder = HttpAsyncClientBuilder.create().setConnectionManager(connectionManager).setDefaultRequestConfig(requestConfig);
// The apache client will be shared across all connections because it can be expensive to create it
// so we don't want to support cookies to avoid accidental authentication for unauthorized users
clientBuilder.disableCookieManagement();
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpSettings.java
index 270e62765ba7..72dfd7bcd1b1 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpSettings.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpSettings.java
@@ -12,6 +12,7 @@ import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
+import org.elasticsearch.core.TimeValue;
import java.util.List;
import java.util.Objects;
@@ -27,12 +28,21 @@ public class HttpSettings {
Setting.Property.Dynamic
);
+ // The time we wait for a connection to establish
+ public static final Setting CONNECTION_TIMEOUT = Setting.timeSetting(
+ "xpack.inference.http.connect_timeout",
+ TimeValue.timeValueSeconds(5),
+ Setting.Property.NodeScope
+ );
+
private volatile ByteSizeValue maxResponseSize;
+ private final int connectionTimeout;
public HttpSettings(Settings settings, ClusterService clusterService) {
Objects.requireNonNull(clusterService);
Objects.requireNonNull(settings);
maxResponseSize = MAX_HTTP_RESPONSE_SIZE.get(settings);
+ connectionTimeout = Math.toIntExact(CONNECTION_TIMEOUT.get(settings).getMillis());
clusterService.getClusterSettings().addSettingsUpdateConsumer(MAX_HTTP_RESPONSE_SIZE, this::setMaxResponseSize);
}
@@ -41,11 +51,15 @@ public class HttpSettings {
return maxResponseSize;
}
+ public int connectionTimeout() {
+ return connectionTimeout;
+ }
+
private void setMaxResponseSize(ByteSizeValue maxResponseSize) {
this.maxResponseSize = maxResponseSize;
}
public static List> getSettingsDefinitions() {
- return List.of(MAX_HTTP_RESPONSE_SIZE);
+ return List.of(MAX_HTTP_RESPONSE_SIZE, CONNECTION_TIMEOUT);
}
}
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandler.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandler.java
index 4061e78c31dc..b55ae9f76cad 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandler.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandler.java
@@ -29,7 +29,6 @@ import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import static org.elasticsearch.xpack.core.inference.action.InferenceAction.Request.DEFAULT_TIMEOUT;
import static org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceService.ELASTIC_INFERENCE_SERVICE_IDENTIFIER;
/**
@@ -39,6 +38,7 @@ public class ElasticInferenceServiceAuthorizationHandler {
private static final String FAILED_TO_RETRIEVE_MESSAGE =
"Failed to retrieve the authorization information from the Elastic Inference Service.";
+ private static final TimeValue DEFAULT_AUTH_TIMEOUT = TimeValue.timeValueMinutes(1);
private static final ResponseHandler AUTH_RESPONSE_HANDLER = createAuthResponseHandler();
private static ResponseHandler createAuthResponseHandler() {
@@ -110,7 +110,7 @@ public class ElasticInferenceServiceAuthorizationHandler {
var request = new ElasticInferenceServiceAuthorizationRequest(baseUrl, getCurrentTraceInfo());
- sender.sendWithoutQueuing(logger, request, AUTH_RESPONSE_HANDLER, DEFAULT_TIMEOUT, newListener);
+ sender.sendWithoutQueuing(logger, request, AUTH_RESPONSE_HANDLER, DEFAULT_AUTH_TIMEOUT, newListener);
} catch (Exception e) {
logger.warn(Strings.format("Retrieving the authorization information encountered an exception: %s", e));
requestCompleteLatch.countDown();
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointActionTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointActionTests.java
index a640e64c2022..cfc2c70003ff 100644
--- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointActionTests.java
+++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportDeleteInferenceEndpointActionTests.java
@@ -12,7 +12,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.inference.InferenceService;
@@ -50,7 +49,6 @@ public class TransportDeleteInferenceEndpointActionTests extends ESTestCase {
mock(ClusterService.class),
threadPool,
mock(ActionFilters.class),
- mock(IndexNameExpressionResolver.class),
modelRegistry,
mock(InferenceServiceRegistry.class)
);
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java
index bf173432f3d9..430e1c0048da 100644
--- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java
+++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java
@@ -12,7 +12,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.inference.ModelConfigurations;
@@ -64,7 +63,6 @@ public class TransportInferenceUsageActionTests extends ESTestCase {
mock(ClusterService.class),
mock(ThreadPool.class),
mock(ActionFilters.class),
- mock(IndexNameExpressionResolver.class),
client
);
}
diff --git a/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBUsageTransportAction.java b/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBUsageTransportAction.java
index b9153c73e3c1..298a885508b6 100644
--- a/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBUsageTransportAction.java
+++ b/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBUsageTransportAction.java
@@ -11,7 +11,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.index.IndexMode;
@@ -38,8 +37,7 @@ public class LogsDBUsageTransportAction extends XPackUsageFeatureTransportAction
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- Client client,
- IndexNameExpressionResolver indexNameExpressionResolver
+ Client client
) {
super(XPackUsageFeatureAction.LOGSDB.name(), transportService, clusterService, threadPool, actionFilters);
this.clusterService = clusterService;
diff --git a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/LogstashUsageTransportAction.java b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/LogstashUsageTransportAction.java
index 39b86cbcf7cc..d0587dffe13b 100644
--- a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/LogstashUsageTransportAction.java
+++ b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/LogstashUsageTransportAction.java
@@ -9,7 +9,6 @@ package org.elasticsearch.xpack.logstash;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.license.XPackLicenseState;
@@ -32,7 +31,6 @@ public class LogstashUsageTransportAction extends XPackUsageFeatureTransportActi
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
XPackLicenseState licenseState
) {
super(XPackUsageFeatureAction.LOGSTASH.name(), transportService, clusterService, threadPool, actionFilters);
diff --git a/x-pack/plugin/logstash/src/test/java/org/elasticsearch/xpack/logstash/LogstashInfoTransportActionTests.java b/x-pack/plugin/logstash/src/test/java/org/elasticsearch/xpack/logstash/LogstashInfoTransportActionTests.java
index cfcefbaee461..93eb5b6a6d8a 100644
--- a/x-pack/plugin/logstash/src/test/java/org/elasticsearch/xpack/logstash/LogstashInfoTransportActionTests.java
+++ b/x-pack/plugin/logstash/src/test/java/org/elasticsearch/xpack/logstash/LogstashInfoTransportActionTests.java
@@ -71,7 +71,6 @@ public class LogstashInfoTransportActionTests extends ESTestCase {
null,
transportService.getThreadPool(),
mock(ActionFilters.class),
- null,
licenseState
);
}
diff --git a/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportGetTrainedModelPackageConfigAction.java b/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportGetTrainedModelPackageConfigAction.java
index ab3048c1cc0f..a19c077977a7 100644
--- a/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportGetTrainedModelPackageConfigAction.java
+++ b/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportGetTrainedModelPackageConfigAction.java
@@ -16,7 +16,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -50,8 +49,7 @@ public class TransportGetTrainedModelPackageConfigAction extends TransportMaster
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(
GetTrainedModelPackageConfigAction.NAME,
diff --git a/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java b/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java
index 4d40ec7880fb..ead85ffab0b6 100644
--- a/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java
+++ b/x-pack/plugin/ml-package-loader/src/main/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackage.java
@@ -20,7 +20,6 @@ import org.elasticsearch.client.internal.OriginSettingClient;
import org.elasticsearch.client.internal.ParentTaskAssigningClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -66,7 +65,6 @@ public class TransportLoadTrainedModelPackage extends TransportMasterNodeAction<
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Client client,
CircuitBreakerService circuitBreakerService
) {
diff --git a/x-pack/plugin/ml-package-loader/src/test/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackageTests.java b/x-pack/plugin/ml-package-loader/src/test/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackageTests.java
index 3486ce6af0db..61f5bf4aac72 100644
--- a/x-pack/plugin/ml-package-loader/src/test/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackageTests.java
+++ b/x-pack/plugin/ml-package-loader/src/test/java/org/elasticsearch/xpack/ml/packageloader/action/TransportLoadTrainedModelPackageTests.java
@@ -13,7 +13,6 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.internal.Client;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.indices.breaker.CircuitBreakerService;
import org.elasticsearch.rest.RestStatus;
@@ -150,7 +149,6 @@ public class TransportLoadTrainedModelPackageTests extends ESTestCase {
mock(ClusterService.class),
mock(ThreadPool.class),
mock(ActionFilters.class),
- mock(IndexNameExpressionResolver.class),
mock(Client.class),
mock(CircuitBreakerService.class)
);
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningUsageTransportAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningUsageTransportAction.java
index 03c9334483bf..a088a50cac40 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningUsageTransportAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningUsageTransportAction.java
@@ -12,7 +12,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.client.internal.OriginSettingClient;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.service.ClusterService;
@@ -125,7 +124,6 @@ public class MachineLearningUsageTransportAction extends XPackUsageFeatureTransp
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Environment environment,
Client client,
XPackLicenseState licenseState,
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDataFrameAnalyticsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDataFrameAnalyticsAction.java
index c849b9cb2090..da0c5d4d6efe 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDataFrameAnalyticsAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDataFrameAnalyticsAction.java
@@ -17,7 +17,6 @@ import org.elasticsearch.client.internal.ParentTaskAssigningClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.injection.guice.Inject;
@@ -61,7 +60,6 @@ public class TransportDeleteDataFrameAnalyticsAction extends AcknowledgedTranspo
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Client client,
MlMemoryTracker memoryTracker,
DataFrameAnalyticsConfigProvider configProvider,
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java
index 923825472905..715d9bb1d078 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java
@@ -15,7 +15,6 @@ import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.injection.guice.Inject;
@@ -46,7 +45,6 @@ public class TransportDeleteDatafeedAction extends AcknowledgedTransportMasterNo
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Client client,
PersistentTasksService persistentTasksService,
DatafeedManager datafeedManager
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteJobAction.java
index 58206051e773..348f9181313a 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteJobAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteJobAction.java
@@ -21,7 +21,6 @@ import org.elasticsearch.client.internal.ParentTaskAssigningClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.core.Nullable;
@@ -88,7 +87,6 @@ public class TransportDeleteJobAction extends AcknowledgedTransportMasterNodeAct
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
PersistentTasksService persistentTasksService,
Client client,
AnomalyDetectionAuditor auditor,
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAction.java
index 860f76b4986a..e5aedac14b08 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAction.java
@@ -22,7 +22,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -77,7 +76,6 @@ public class TransportDeleteTrainedModelAction extends AcknowledgedTransportMast
ThreadPool threadPool,
Client client,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
TrainedModelProvider configProvider,
InferenceAuditor auditor,
IngestService ingestService
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAliasAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAliasAction.java
index 8cf3b47eed16..f2dbe43cd70e 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAliasAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAliasAction.java
@@ -19,7 +19,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -55,8 +54,7 @@ public class TransportDeleteTrainedModelAliasAction extends AcknowledgedTranspor
ThreadPool threadPool,
ActionFilters actionFilters,
InferenceAuditor auditor,
- IngestService ingestService,
- IndexNameExpressionResolver indexNameExpressionResolver
+ IngestService ingestService
) {
super(
DeleteTrainedModelAliasAction.NAME,
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAssignmentAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAssignmentAction.java
index a726e1aaca90..c1433c84598b 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAssignmentAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteTrainedModelAssignmentAction.java
@@ -14,7 +14,6 @@ import org.elasticsearch.action.support.master.AcknowledgedTransportMasterNodeAc
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.injection.guice.Inject;
@@ -35,8 +34,7 @@ public class TransportDeleteTrainedModelAssignmentAction extends AcknowledgedTra
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(
DeleteTrainedModelAssignmentAction.NAME,
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportFinalizeJobExecutionAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportFinalizeJobExecutionAction.java
index 0e2fb354b916..5888a605e368 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportFinalizeJobExecutionAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportFinalizeJobExecutionAction.java
@@ -19,7 +19,6 @@ import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.injection.guice.Inject;
@@ -51,7 +50,6 @@ public class TransportFinalizeJobExecutionAction extends AcknowledgedTransportMa
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Client client
) {
super(
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportFlushTrainedModelCacheAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportFlushTrainedModelCacheAction.java
index b0c85f91aa60..3bb783f601b7 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportFlushTrainedModelCacheAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportFlushTrainedModelCacheAction.java
@@ -14,7 +14,6 @@ import org.elasticsearch.action.support.master.AcknowledgedTransportMasterNodeAc
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.injection.guice.Inject;
@@ -34,7 +33,6 @@ public class TransportFlushTrainedModelCacheAction extends AcknowledgedTransport
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
TrainedModelCacheMetadataService modelCacheMetadataService
) {
super(
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsAction.java
index 65e53f5e3f21..50d18c00d746 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsAction.java
@@ -14,7 +14,6 @@ import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.injection.guice.Inject;
@@ -37,8 +36,7 @@ public class TransportGetDatafeedsAction extends TransportMasterNodeReadAction future = new PlainActionFuture<>();
diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/ArchiveUsageTransportAction.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/ArchiveUsageTransportAction.java
index a8aa9b0510d1..23a823acbe15 100644
--- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/ArchiveUsageTransportAction.java
+++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/ArchiveUsageTransportAction.java
@@ -11,7 +11,6 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.license.XPackLicenseState;
@@ -36,7 +35,6 @@ public class ArchiveUsageTransportAction extends XPackUsageFeatureTransportActio
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
XPackLicenseState licenseState
) {
super(XPackUsageFeatureAction.ARCHIVE.name(), transportService, clusterService, threadPool, actionFilters);
diff --git a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/ProfilingUsageTransportAction.java b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/ProfilingUsageTransportAction.java
index ba8609da57f0..49dd05d25591 100644
--- a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/ProfilingUsageTransportAction.java
+++ b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/ProfilingUsageTransportAction.java
@@ -10,7 +10,6 @@ package org.elasticsearch.xpack.profiling.action;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.injection.guice.Inject;
@@ -35,7 +34,6 @@ public class ProfilingUsageTransportAction extends XPackUsageFeatureTransportAct
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
ProfilingLicenseChecker licenseChecker,
Settings settings
) {
diff --git a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/TransportGetStatusAction.java b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/TransportGetStatusAction.java
index ac619b342883..1381eac5faa8 100644
--- a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/TransportGetStatusAction.java
+++ b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/TransportGetStatusAction.java
@@ -20,7 +20,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateObserver;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.service.ClusterService;
@@ -52,8 +51,7 @@ public class TransportGetStatusAction extends TransportMasterNodeAction future = new PlainActionFuture<>();
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
RollupFeatureSetUsage rollupUsage = (RollupFeatureSetUsage) future.get().getUsage();
diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/SearchableSnapshotsUsageTransportAction.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/SearchableSnapshotsUsageTransportAction.java
index 86458de74263..dd543db8dd52 100644
--- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/SearchableSnapshotsUsageTransportAction.java
+++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/SearchableSnapshotsUsageTransportAction.java
@@ -11,7 +11,6 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.license.XPackLicenseState;
@@ -36,7 +35,6 @@ public class SearchableSnapshotsUsageTransportAction extends XPackUsageFeatureTr
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
XPackLicenseState licenseState
) {
super(XPackUsageFeatureAction.SEARCHABLE_SNAPSHOTS.name(), transportService, clusterService, threadPool, actionFilters);
diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/TransportMountSearchableSnapshotAction.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/TransportMountSearchableSnapshotAction.java
index df5aa3d787b7..913e5f7a31fd 100644
--- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/TransportMountSearchableSnapshotAction.java
+++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/TransportMountSearchableSnapshotAction.java
@@ -17,7 +17,6 @@ import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.routing.allocation.DataTier;
import org.elasticsearch.cluster.routing.allocation.ExistingShardsAllocator;
import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider;
@@ -85,7 +84,6 @@ public class TransportMountSearchableSnapshotAction extends TransportMasterNodeA
ThreadPool threadPool,
RepositoriesService repositoriesService,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
XPackLicenseState licenseState,
SystemIndices systemIndices
) {
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityUsageTransportAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityUsageTransportAction.java
index fa196daee411..45b019ad18f7 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityUsageTransportAction.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityUsageTransportAction.java
@@ -10,7 +10,6 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.RefCountingListener;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.Maps;
@@ -69,7 +68,6 @@ public class SecurityUsageTransportAction extends XPackUsageFeatureTransportActi
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Settings settings,
XPackLicenseState licenseState,
SecurityUsageServices securityServices
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportGetSecuritySettingsAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportGetSecuritySettingsAction.java
index 8ec8b4478f10..19369ab2b43a 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportGetSecuritySettingsAction.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportGetSecuritySettingsAction.java
@@ -15,7 +15,6 @@ import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexAbstraction;
import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -43,8 +42,7 @@ public class TransportGetSecuritySettingsAction extends TransportMasterNodeActio
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(
GetSecuritySettingsAction.INSTANCE.name(),
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportUpdateSecuritySettingsAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportUpdateSecuritySettingsAction.java
index a102a8456673..cc36c79a0057 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportUpdateSecuritySettingsAction.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportUpdateSecuritySettingsAction.java
@@ -17,7 +17,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexAbstraction;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.metadata.MetadataUpdateSettingsService;
import org.elasticsearch.cluster.service.ClusterService;
@@ -55,8 +54,7 @@ public class TransportUpdateSecuritySettingsAction extends TransportMasterNodeAc
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- MetadataUpdateSettingsService metadataUpdateSettingsService,
- IndexNameExpressionResolver indexNameExpressionResolver
+ MetadataUpdateSettingsService metadataUpdateSettingsService
) {
super(
UpdateSecuritySettingsAction.INSTANCE.name(),
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/LocalStateSecurity.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/LocalStateSecurity.java
index 98fc8a8a49c4..d75e0d4c5396 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/LocalStateSecurity.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/LocalStateSecurity.java
@@ -10,7 +10,6 @@ import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.TransportAction;
import org.elasticsearch.client.internal.node.NodeClient;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.injection.guice.Inject;
@@ -49,10 +48,9 @@ public class LocalStateSecurity extends LocalStateCompositeXPackPlugin implement
TransportService transportService,
ClusterService clusterService,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
NodeClient client
) {
- super(threadPool, transportService, clusterService, actionFilters, indexNameExpressionResolver, client);
+ super(threadPool, transportService, clusterService, actionFilters, client);
}
@Override
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityInfoTransportActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityInfoTransportActionTests.java
index 688e12fe727c..e0a971aef746 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityInfoTransportActionTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityInfoTransportActionTests.java
@@ -373,7 +373,6 @@ public class SecurityInfoTransportActionTests extends ESTestCase {
null,
threadPool,
mock(ActionFilters.class),
- null,
settings,
licenseState,
securityServices
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java
index 9abee6b68e18..4f80922ce9f4 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java
@@ -19,7 +19,6 @@ import org.elasticsearch.cluster.ClusterStateTaskExecutor;
import org.elasticsearch.cluster.ClusterStateTaskListener;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.metadata.NodesShutdownMetadata;
import org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata;
@@ -110,8 +109,7 @@ public class TransportDeleteShutdownNodeAction extends AcknowledgedTransportMast
ClusterService clusterService,
RerouteService rerouteService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(
DeleteShutdownNodeAction.NAME,
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java
index 854df21bd353..b95847bb3cf0 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java
@@ -16,7 +16,6 @@ import org.elasticsearch.cluster.ClusterInfoService;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.LifecycleExecutionState;
import org.elasticsearch.cluster.metadata.NodesShutdownMetadata;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
@@ -75,7 +74,6 @@ public class TransportGetShutdownStatusAction extends TransportMasterNodeAction<
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
AllocationService allocationService,
AllocationDeciders allocationDeciders,
ClusterInfoService clusterInfoService,
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java
index 6c13c9930d95..e8313d757f21 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java
@@ -18,7 +18,6 @@ import org.elasticsearch.cluster.ClusterStateTaskExecutor;
import org.elasticsearch.cluster.ClusterStateTaskListener;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.NodesShutdownMetadata;
import org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata;
import org.elasticsearch.cluster.node.DiscoveryNode;
@@ -154,8 +153,7 @@ public class TransportPutShutdownNodeAction extends AcknowledgedTransportMasterN
ClusterService clusterService,
AllocationService allocationService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(
PutShutdownNodeAction.NAME,
diff --git a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeActionTests.java b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeActionTests.java
index 88f397ff9ad2..817ebf02aa37 100644
--- a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeActionTests.java
+++ b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeActionTests.java
@@ -12,7 +12,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateTaskExecutor;
import org.elasticsearch.cluster.ClusterStateTaskExecutor.TaskContext;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.metadata.NodesShutdownMetadata;
import org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata;
@@ -60,18 +59,10 @@ public class TransportDeleteShutdownNodeActionTests extends ESTestCase {
clusterService = mock(ClusterService.class);
var rerouteService = mock(RerouteService.class);
var actionFilters = mock(ActionFilters.class);
- var indexNameExpressionResolver = mock(IndexNameExpressionResolver.class);
when(clusterService.createTaskQueue(any(), any(), Mockito.>any())).thenReturn(
taskQueue
);
- action = new TransportDeleteShutdownNodeAction(
- transportService,
- clusterService,
- rerouteService,
- threadPool,
- actionFilters,
- indexNameExpressionResolver
- );
+ action = new TransportDeleteShutdownNodeAction(transportService, clusterService, rerouteService, threadPool, actionFilters);
}
public void testNoop() throws Exception {
diff --git a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeActionTests.java b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeActionTests.java
index ed603d30d059..b8be1de03959 100644
--- a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeActionTests.java
+++ b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeActionTests.java
@@ -13,7 +13,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateTaskExecutor;
import org.elasticsearch.cluster.ClusterStateTaskExecutor.TaskContext;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata.Type;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
@@ -72,18 +71,10 @@ public class TransportPutShutdownNodeActionTests extends ESTestCase {
var allocationService = mock(AllocationService.class);
when(allocationService.reroute(any(ClusterState.class), anyString(), any())).then(invocation -> invocation.getArgument(0));
var actionFilters = mock(ActionFilters.class);
- var indexNameExpressionResolver = mock(IndexNameExpressionResolver.class);
when(clusterService.createTaskQueue(any(), any(), Mockito.>any())).thenReturn(
taskQueue
);
- action = new TransportPutShutdownNodeAction(
- transportService,
- clusterService,
- allocationService,
- threadPool,
- actionFilters,
- indexNameExpressionResolver
- );
+ action = new TransportPutShutdownNodeAction(transportService, clusterService, allocationService, threadPool, actionFilters);
}
public void testNoop() throws Exception {
diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java
index 279449f4ec29..c7d21aad53c1 100644
--- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java
+++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java
@@ -10,7 +10,6 @@ package org.elasticsearch.xpack.slm;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.protocol.xpack.XPackUsageRequest;
@@ -30,8 +29,7 @@ public class SLMUsageTransportAction extends XPackUsageFeatureTransportAction {
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(XPackUsageFeatureAction.SNAPSHOT_LIFECYCLE.name(), transportService, clusterService, threadPool, actionFilters);
}
diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportDeleteSnapshotLifecycleAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportDeleteSnapshotLifecycleAction.java
index 79d403e4ef2f..ee2810d23eeb 100644
--- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportDeleteSnapshotLifecycleAction.java
+++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportDeleteSnapshotLifecycleAction.java
@@ -17,7 +17,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
@@ -45,8 +44,7 @@ public class TransportDeleteSnapshotLifecycleAction extends TransportMasterNodeA
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(
DeleteSnapshotLifecycleAction.NAME,
diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotLifecycleAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotLifecycleAction.java
index 26fc6f4fb4c2..718f69f7b50e 100644
--- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotLifecycleAction.java
+++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotLifecycleAction.java
@@ -15,7 +15,6 @@ import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.tasks.Task;
@@ -43,7 +42,6 @@ public class TransportExecuteSnapshotLifecycleAction extends TransportMasterNode
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Client client,
SnapshotHistoryStore historyStore
) {
diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotRetentionAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotRetentionAction.java
index eff7b3144d6f..6b1dc1ed124e 100644
--- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotRetentionAction.java
+++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotRetentionAction.java
@@ -17,7 +17,6 @@ import org.elasticsearch.action.support.master.AcknowledgedTransportMasterNodeAc
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.tasks.Task;
@@ -38,7 +37,6 @@ public class TransportExecuteSnapshotRetentionAction extends AcknowledgedTranspo
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
SnapshotRetentionService retentionService
) {
super(
diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportGetSLMStatusAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportGetSLMStatusAction.java
index 0d9ab7c057ae..0e92c683fcd7 100644
--- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportGetSLMStatusAction.java
+++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportGetSLMStatusAction.java
@@ -14,7 +14,6 @@ import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.injection.guice.Inject;
@@ -32,8 +31,7 @@ public class TransportGetSLMStatusAction extends TransportMasterNodeAction future = new PlainActionFuture<>();
@@ -94,7 +93,6 @@ public class SpatialInfoTransportActionTests extends ESTestCase {
clusterService,
threadPool,
mock(ActionFilters.class),
- null,
mockClient()
);
PlainActionFuture future = new PlainActionFuture<>();
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/SqlUsageTransportAction.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/SqlUsageTransportAction.java
index 284cd72576b6..4191d326ed32 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/SqlUsageTransportAction.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/SqlUsageTransportAction.java
@@ -10,7 +10,6 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.protocol.xpack.XPackUsageRequest;
@@ -39,7 +38,6 @@ public class SqlUsageTransportAction extends XPackUsageFeatureTransportAction {
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Client client
) {
super(XPackUsageFeatureAction.SQL.name(), transportService, clusterService, threadPool, actionFilters);
diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/SqlInfoTransportActionTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/SqlInfoTransportActionTests.java
index c663a48895a3..e8100a6e3c4b 100644
--- a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/SqlInfoTransportActionTests.java
+++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/SqlInfoTransportActionTests.java
@@ -95,14 +95,7 @@ public class SqlInfoTransportActionTests extends ESTestCase {
ThreadPool threadPool = mock(ThreadPool.class);
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
- var usageAction = new SqlUsageTransportAction(
- transportService,
- clusterService,
- threadPool,
- mock(ActionFilters.class),
- null,
- client
- );
+ var usageAction = new SqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client);
PlainActionFuture future = new PlainActionFuture<>();
usageAction.masterOperation(mock(Task.class), null, null, future);
SqlFeatureSetUsage sqlUsage = (SqlFeatureSetUsage) future.get().getUsage();
diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/transform/transforms_crud.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/transform/transforms_crud.yml
index 729094ba7e9d..6bb619851701 100644
--- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/transform/transforms_crud.yml
+++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/transform/transforms_crud.yml
@@ -407,7 +407,7 @@ setup:
---
"Test transform where source query is invalid":
- do:
- catch: /No handler for type \[bad-type\] declared on runtime field \[rt-field\]/
+ catch: /The mapper type \[bad-type\] declared on runtime field \[rt-field\]/
transform.put_transform:
transform_id: "airline-transform"
body: >
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java
index 5f7ec0a3cc2d..d8b1056078ba 100644
--- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java
+++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java
@@ -16,7 +16,6 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.injection.guice.Inject;
@@ -78,7 +77,6 @@ public class TransformUsageTransportAction extends XPackUsageFeatureTransportAct
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Client client
) {
super(XPackUsageFeatureAction.TRANSFORM.name(), transportService, clusterService, threadPool, actionFilters);
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportDeleteTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportDeleteTransformAction.java
index 619e72581cb5..d2cfdeac2886 100644
--- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportDeleteTransformAction.java
+++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportDeleteTransformAction.java
@@ -23,7 +23,6 @@ import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.core.TimeValue;
@@ -67,7 +66,6 @@ public class TransportDeleteTransformAction extends AcknowledgedTransportMasterN
ActionFilters actionFilters,
ThreadPool threadPool,
ClusterService clusterService,
- IndexNameExpressionResolver indexNameExpressionResolver,
TransformServices transformServices,
Client client
) {
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportSetTransformResetModeAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportSetTransformResetModeAction.java
index 0e284a7d9864..864d749a84f9 100644
--- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportSetTransformResetModeAction.java
+++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportSetTransformResetModeAction.java
@@ -8,7 +8,6 @@ package org.elasticsearch.xpack.transform.action;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
@@ -26,10 +25,9 @@ public class TransportSetTransformResetModeAction extends AbstractTransportSetRe
TransportService transportService,
ThreadPool threadPool,
ClusterService clusterService,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
- super(SetResetModeAction.NAME, transportService, threadPool, clusterService, actionFilters, indexNameExpressionResolver);
+ super(SetResetModeAction.NAME, transportService, threadPool, clusterService, actionFilters);
}
@Override
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportSetTransformUpgradeModeAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportSetTransformUpgradeModeAction.java
index 7a10704bcc19..32eaa0ba20cb 100644
--- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportSetTransformUpgradeModeAction.java
+++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportSetTransformUpgradeModeAction.java
@@ -18,7 +18,6 @@ import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.client.internal.OriginSettingClient;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.persistent.PersistentTasksClusterService;
@@ -53,20 +52,11 @@ public class TransportSetTransformUpgradeModeAction extends AbstractTransportSet
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
PersistentTasksClusterService persistentTasksClusterService,
PersistentTasksService persistentTasksService,
Client client
) {
- super(
- SetTransformUpgradeModeAction.NAME,
- "transform",
- transportService,
- clusterService,
- threadPool,
- actionFilters,
- indexNameExpressionResolver
- );
+ super(SetTransformUpgradeModeAction.NAME, "transform", transportService, clusterService, threadPool, actionFilters);
this.persistentTasksClusterService = persistentTasksClusterService;
this.persistentTasksService = persistentTasksService;
this.client = new OriginSettingClient(client, TRANSFORM_ORIGIN);
diff --git a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/TransportSetTransformUpgradeModeActionTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/TransportSetTransformUpgradeModeActionTests.java
index f31922d5b69f..c9ee8e943d5f 100644
--- a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/TransportSetTransformUpgradeModeActionTests.java
+++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/TransportSetTransformUpgradeModeActionTests.java
@@ -78,7 +78,6 @@ public class TransportSetTransformUpgradeModeActionTests extends ESTestCase {
clusterService,
threadPool,
mock(),
- mock(),
persistentTasksClusterService,
persistentTasksService,
client
diff --git a/x-pack/plugin/voting-only-node/src/main/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyUsageTransportAction.java b/x-pack/plugin/voting-only-node/src/main/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyUsageTransportAction.java
index 62835a90c9af..b9873b31881f 100644
--- a/x-pack/plugin/voting-only-node/src/main/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyUsageTransportAction.java
+++ b/x-pack/plugin/voting-only-node/src/main/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyUsageTransportAction.java
@@ -10,7 +10,6 @@ package org.elasticsearch.cluster.coordination.votingonly;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.injection.guice.Inject;
import org.elasticsearch.protocol.xpack.XPackUsageRequest;
@@ -29,8 +28,7 @@ public class VotingOnlyUsageTransportAction extends XPackUsageFeatureTransportAc
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(XPackUsageFeatureAction.VOTING_ONLY.name(), transportService, clusterService, threadPool, actionFilters);
}
diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherUsageTransportAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherUsageTransportAction.java
index 35332d720787..8bf4ae276034 100644
--- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherUsageTransportAction.java
+++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherUsageTransportAction.java
@@ -11,7 +11,6 @@ import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.ContextPreservingActionListener;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -49,7 +48,6 @@ public class WatcherUsageTransportAction extends XPackUsageFeatureTransportActio
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver,
Settings settings,
XPackLicenseState licenseState,
Client client
diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportWatcherServiceAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportWatcherServiceAction.java
index 7118dea6ee1b..616821a8f3dd 100644
--- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportWatcherServiceAction.java
+++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportWatcherServiceAction.java
@@ -18,7 +18,6 @@ import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.core.SuppressForbidden;
@@ -42,8 +41,7 @@ public class TransportWatcherServiceAction extends AcknowledgedTransportMasterNo
TransportService transportService,
ClusterService clusterService,
ThreadPool threadPool,
- ActionFilters actionFilters,
- IndexNameExpressionResolver indexNameExpressionResolver
+ ActionFilters actionFilters
) {
super(
WatcherServiceAction.NAME,
diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherInfoTransportActionTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherInfoTransportActionTests.java
index 87258afcc532..2fd38a7b81cd 100644
--- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherInfoTransportActionTests.java
+++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherInfoTransportActionTests.java
@@ -138,7 +138,6 @@ public class WatcherInfoTransportActionTests extends ESTestCase {
clusterService,
threadPool,
mock(ActionFilters.class),
- null,
Settings.EMPTY,
licenseState,
client