diff --git a/distribution/tools/geoip-cli/src/main/java/org/elasticsearch/geoip/GeoIpCli.java b/distribution/tools/geoip-cli/src/main/java/org/elasticsearch/geoip/GeoIpCli.java index 8aea17585a5af..5edfe0a326fec 100644 --- a/distribution/tools/geoip-cli/src/main/java/org/elasticsearch/geoip/GeoIpCli.java +++ b/distribution/tools/geoip-cli/src/main/java/org/elasticsearch/geoip/GeoIpCli.java @@ -64,11 +64,11 @@ protected void execute(Terminal terminal, OptionSet options, ProcessInfo process } @SuppressForbidden(reason = "file arg for cli") - private Path getPath(String file) { + private static Path getPath(String file) { return PathUtils.get(file); } - private void copyTgzToTarget(Path source, Path target) throws IOException { + private static void copyTgzToTarget(Path source, Path target) throws IOException { if (source.equals(target)) { return; } @@ -79,7 +79,7 @@ private void copyTgzToTarget(Path source, Path target) throws IOException { } } - private void packDatabasesToTgz(Terminal terminal, Path source, Path target) throws IOException { + private static void packDatabasesToTgz(Terminal terminal, Path source, Path target) throws IOException { try (Stream files = Files.list(source)) { for (Path path : files.filter(p -> p.getFileName().toString().endsWith(".mmdb")).toList()) { String fileName = path.getFileName().toString(); @@ -102,7 +102,7 @@ private void packDatabasesToTgz(Terminal terminal, Path source, Path target) thr } } - private void createOverviewJson(Terminal terminal, Path directory) throws IOException { + private static void createOverviewJson(Terminal terminal, Path directory) throws IOException { Path overview = directory.resolve("overview.json"); try ( Stream files = Files.list(directory); @@ -130,7 +130,7 @@ private void createOverviewJson(Terminal terminal, Path directory) throws IOExce terminal.println("overview.json created"); } - private byte[] createTarHeader(String name, long size) { + private static byte[] createTarHeader(String name, long size) { byte[] buf = new byte[512]; byte[] sizeBytes = String.format(Locale.ROOT, "%1$012o", size).getBytes(StandardCharsets.UTF_8); byte[] nameBytes = name.substring(Math.max(0, name.length() - 100)).getBytes(StandardCharsets.US_ASCII); diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/cli/keystore/AddFileKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/cli/keystore/AddFileKeyStoreCommand.java index 8a6b1e462eb83..e378747e583db 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/cli/keystore/AddFileKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/cli/keystore/AddFileKeyStoreCommand.java @@ -77,7 +77,7 @@ protected void executeCommand(Terminal terminal, OptionSet options, Environment } @SuppressForbidden(reason = "file arg for cli") - private Path getPath(String file) { + private static Path getPath(String file) { return PathUtils.get(file); } diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java index 349e655f95afe..d32cbd8dd1736 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java @@ -201,7 +201,6 @@ public class InstallPluginAction implements Closeable { private Environment env; private boolean batch; private Proxy proxy = null; - private NamedComponentScanner scanner = new NamedComponentScanner(); public InstallPluginAction(Terminal terminal, Environment env, boolean batch) { this.terminal = terminal; @@ -394,7 +393,7 @@ private String getElasticUrl( return String.format(Locale.ROOT, "%s/%s-%s.zip", baseUrl, pluginId, Build.current().qualifiedVersion()); } - private String nonReleaseUrl(final String hostname, final Version version, final String stagingHash, final String pluginId) { + private static String nonReleaseUrl(final String hostname, final Version version, final String stagingHash, final String pluginId) { return String.format( Locale.ROOT, "https://%s.elastic.co/%s-%s/downloads/elasticsearch-plugins/%s", @@ -441,7 +440,7 @@ boolean urlExists(String urlString) throws IOException { /** * Returns all the official plugin names that look similar to pluginId. **/ - private List checkMisspelledPlugin(String pluginId) { + private static List checkMisspelledPlugin(String pluginId) { LevenshteinDistance ld = new LevenshteinDistance(); List> scoredKeys = new ArrayList<>(); for (String officialPlugin : OFFICIAL_PLUGINS) { @@ -819,7 +818,7 @@ private Path unzip(Path zip, Path pluginsDir) throws IOException, UserException return target; } - private Path stagingDirectory(Path pluginsDir) throws IOException { + private static Path stagingDirectory(Path pluginsDir) throws IOException { try { return Files.createTempDirectory(pluginsDir, ".installing-", PosixFilePermissions.asFileAttribute(PLUGIN_DIR_PERMS)); } catch (UnsupportedOperationException e) { @@ -827,12 +826,12 @@ private Path stagingDirectory(Path pluginsDir) throws IOException { } } - private Path stagingDirectoryWithoutPosixPermissions(Path pluginsDir) throws IOException { + private static Path stagingDirectoryWithoutPosixPermissions(Path pluginsDir) throws IOException { return Files.createTempDirectory(pluginsDir, ".installing-"); } // checking for existing version of the plugin - private void verifyPluginName(Path pluginPath, String pluginName) throws UserException, IOException { + private static void verifyPluginName(Path pluginPath, String pluginName) throws UserException, IOException { // don't let user install plugin conflicting with module... // they might be unavoidably in maven central and are packaged up the same way) if (MODULES.contains(pluginName)) { @@ -877,15 +876,15 @@ private PluginDescriptor loadPluginInfo(Path pluginRoot) throws Exception { return info; } - private void generateNameComponentFile(Path pluginRoot) throws IOException { + private static void generateNameComponentFile(Path pluginRoot) throws IOException { Stream classPath = ClassReaders.ofClassPath().stream(); // contains plugin-api List classReaders = Stream.concat(ClassReaders.ofDirWithJars(pluginRoot).stream(), classPath).toList(); - Map> namedComponentsMap = scanner.scanForNamedClasses(classReaders); + Map> namedComponentsMap = NamedComponentScanner.scanForNamedClasses(classReaders); Path outputFile = pluginRoot.resolve(PluginDescriptor.NAMED_COMPONENTS_FILENAME); - scanner.writeToFile(namedComponentsMap, outputFile); + NamedComponentScanner.writeToFile(namedComponentsMap, outputFile); } - private boolean hasNamedComponentFile(Path pluginRoot) { + private static boolean hasNamedComponentFile(Path pluginRoot) { return Files.exists(pluginRoot.resolve(PluginDescriptor.NAMED_COMPONENTS_FILENAME)); } @@ -949,7 +948,7 @@ private PluginDescriptor installPlugin(InstallablePlugin descriptor, Path tmpRoo /** * Moves bin and config directories from the plugin if they exist */ - private void installPluginSupportFiles( + private static void installPluginSupportFiles( PluginDescriptor info, Path tmpRoot, Path destBinDir, @@ -973,7 +972,7 @@ private void installPluginSupportFiles( /** * Moves the plugin directory into its final destination. */ - private void movePlugin(Path tmpRoot, Path destination) throws IOException { + private static void movePlugin(Path tmpRoot, Path destination) throws IOException { Files.move(tmpRoot, destination, StandardCopyOption.ATOMIC_MOVE); Files.walkFileTree(destination, new SimpleFileVisitor<>() { @Override @@ -1000,7 +999,7 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) /** * Copies the files from {@code tmpBinDir} into {@code destBinDir}, along with permissions from dest dirs parent. */ - private void installBin(PluginDescriptor info, Path tmpBinDir, Path destBinDir) throws Exception { + private static void installBin(PluginDescriptor info, Path tmpBinDir, Path destBinDir) throws Exception { if (Files.isDirectory(tmpBinDir) == false) { throw new UserException(PLUGIN_MALFORMED, "bin in plugin " + info.getName() + " is not a directory"); } @@ -1028,7 +1027,7 @@ private void installBin(PluginDescriptor info, Path tmpBinDir, Path destBinDir) * Copies the files from {@code tmpConfigDir} into {@code destConfigDir}. * Any files existing in both the source and destination will be skipped. */ - private void installConfig(PluginDescriptor info, Path tmpConfigDir, Path destConfigDir) throws Exception { + private static void installConfig(PluginDescriptor info, Path tmpConfigDir, Path destConfigDir) throws Exception { if (Files.isDirectory(tmpConfigDir) == false) { throw new UserException(PLUGIN_MALFORMED, "config in plugin " + info.getName() + " is not a directory"); } diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/ListPluginsCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/ListPluginsCommand.java index afb07324f8952..178c0bfabfc7a 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/ListPluginsCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/ListPluginsCommand.java @@ -57,7 +57,7 @@ public void execute(Terminal terminal, OptionSet options, Environment env, Proce } } - private void printPlugin(Environment env, Terminal terminal, Path plugin, String prefix) throws IOException { + private static void printPlugin(Environment env, Terminal terminal, Path plugin, String prefix) throws IOException { terminal.println(Terminal.Verbosity.SILENT, prefix + plugin.getFileName().toString()); PluginDescriptor info = PluginDescriptor.readFromProperties(env.pluginsFile().resolve(plugin)); terminal.println(Terminal.Verbosity.VERBOSE, info.toString(prefix)); diff --git a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerCli.java b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerCli.java index 869ff520a0534..7b3adadb29b4c 100644 --- a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerCli.java +++ b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerCli.java @@ -112,7 +112,7 @@ public void execute(Terminal terminal, OptionSet options, Environment env, Proce } } - private void printVersion(Terminal terminal) { + private static void printVersion(Terminal terminal) { final String versionOutput = String.format( Locale.ROOT, "Version: %s, Build: %s/%s/%s, JVM: %s", @@ -197,7 +197,7 @@ void syncPlugins(Terminal terminal, Environment env, ProcessInfo processInfo) th syncPlugins.execute(terminal, syncPlugins.parseOptions(new String[0]), env, processInfo); } - private void validatePidFile(Path pidFile) throws UserException { + private static void validatePidFile(Path pidFile) throws UserException { Path parent = pidFile.getParent(); if (parent != null && Files.exists(parent) && Files.isDirectory(parent) == false) { throw new UserException(ExitCodes.USAGE, "pid file parent [" + parent + "] exists but is not a directory"); diff --git a/distribution/tools/windows-service-cli/src/main/java/org/elasticsearch/windows/service/ProcrunCommand.java b/distribution/tools/windows-service-cli/src/main/java/org/elasticsearch/windows/service/ProcrunCommand.java index b507e5e43a456..e32e34fb24400 100644 --- a/distribution/tools/windows-service-cli/src/main/java/org/elasticsearch/windows/service/ProcrunCommand.java +++ b/distribution/tools/windows-service-cli/src/main/java/org/elasticsearch/windows/service/ProcrunCommand.java @@ -92,7 +92,7 @@ static String quote(String s) { } /** Determines the service id for the Elasticsearch service that should be used */ - private String getServiceId(OptionSet options, Map env) throws UserException { + private static String getServiceId(OptionSet options, Map env) throws UserException { List args = options.nonOptionArguments(); if (args.size() > 1) { throw new UserException(ExitCodes.USAGE, "too many arguments, expected one service id"); @@ -107,7 +107,7 @@ private String getServiceId(OptionSet options, Map env) throws U } /** Determines the logging arguments that should be passed to the procrun command */ - private String getLogArgs(String serviceId, Path esHome, Map env) { + private static String getLogArgs(String serviceId, Path esHome, Map env) { String logArgs = env.get("LOG_OPTS"); if (logArgs != null && logArgs.isBlank() == false) { return logArgs; diff --git a/libs/core/src/main/java/org/elasticsearch/core/internal/provider/EmbeddedImplClassLoader.java b/libs/core/src/main/java/org/elasticsearch/core/internal/provider/EmbeddedImplClassLoader.java index 134170f52ee14..049b619fb57ac 100644 --- a/libs/core/src/main/java/org/elasticsearch/core/internal/provider/EmbeddedImplClassLoader.java +++ b/libs/core/src/main/java/org/elasticsearch/core/internal/provider/EmbeddedImplClassLoader.java @@ -185,7 +185,7 @@ protected URL findResource(String name) { * url or null if not found. Iterates over all known package specific multi-release versions, * then the root, for the given jar prefix. */ - T findResourceInLoaderPkgOrNull(JarMeta jarMeta, String pkg, String name, Function finder) { + static T findResourceInLoaderPkgOrNull(JarMeta jarMeta, String pkg, String name, Function finder) { List releaseVersions = jarMeta.pkgToVersions().getOrDefault(pkg, List.of()); for (int releaseVersion : releaseVersions) { String fullName = jarMeta.prefix() + "/" + MRJAR_VERSION_PREFIX + releaseVersion + "/" + name; diff --git a/libs/core/src/main/java/org/elasticsearch/jdk/ModuleQualifiedExportsService.java b/libs/core/src/main/java/org/elasticsearch/jdk/ModuleQualifiedExportsService.java index ac93c56bafbf1..0858493ea003d 100644 --- a/libs/core/src/main/java/org/elasticsearch/jdk/ModuleQualifiedExportsService.java +++ b/libs/core/src/main/java/org/elasticsearch/jdk/ModuleQualifiedExportsService.java @@ -49,7 +49,7 @@ protected ModuleQualifiedExportsService(Module module) { .collect(Collectors.toUnmodifiableSet()); } - private Map> invert( + private static Map> invert( Collection sourcesToTargets, Predicate qualifiedPredicate, Function sourceGetter, diff --git a/libs/geo/src/main/java/org/elasticsearch/geometry/Polygon.java b/libs/geo/src/main/java/org/elasticsearch/geometry/Polygon.java index d6a08a8bec20f..3360ac4da2b2c 100644 --- a/libs/geo/src/main/java/org/elasticsearch/geometry/Polygon.java +++ b/libs/geo/src/main/java/org/elasticsearch/geometry/Polygon.java @@ -58,7 +58,7 @@ public ShapeType type() { return ShapeType.POLYGON; } - private void checkRing(LinearRing ring) { + private static void checkRing(LinearRing ring) { if (ring.length() < 4) { throw new IllegalArgumentException("at least 4 polygon points required"); } diff --git a/libs/geo/src/main/java/org/elasticsearch/geometry/simplify/SimplificationErrorCalculator.java b/libs/geo/src/main/java/org/elasticsearch/geometry/simplify/SimplificationErrorCalculator.java index b442cf35bcdcd..d90dabcc8cc35 100644 --- a/libs/geo/src/main/java/org/elasticsearch/geometry/simplify/SimplificationErrorCalculator.java +++ b/libs/geo/src/main/java/org/elasticsearch/geometry/simplify/SimplificationErrorCalculator.java @@ -83,7 +83,7 @@ public double calculateError(PointLike left, PointLike middle, PointLike right) } } - private double distance(PointLike a, PointLike b) { + private static double distance(PointLike a, PointLike b) { return SloppyMath.haversinMeters(a.y(), a.x(), b.y(), b.x()); } } @@ -115,7 +115,7 @@ public double calculateError(PointLike left, PointLike middle, PointLike right) } } - private double distance(PointLike a, PointLike b) { + private static double distance(PointLike a, PointLike b) { return SloppyMath.haversinMeters(a.y(), a.x(), b.y(), b.x()); } } diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java b/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java index 67e4a018f29ea..5b9a6f4698967 100644 --- a/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java +++ b/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java @@ -96,7 +96,7 @@ private Grok( this.captureConfig = List.copyOf(grokCaptureConfigs); } - private String groupMatch(String name, Region region, String pattern) { + private static String groupMatch(String name, Region region, String pattern) { int number = GROK_PATTERN_REGEX.nameToBackrefNumber( name.getBytes(StandardCharsets.UTF_8), 0, diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureType.java b/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureType.java index 0da0cde4908d1..9df8c74e31f51 100644 --- a/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureType.java +++ b/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureType.java @@ -68,7 +68,7 @@ static GrokCaptureType fromString(String str) { }; } - protected final GrokCaptureExtracter rawExtracter(int[] backRefs, Consumer emit) { + protected static GrokCaptureExtracter rawExtracter(int[] backRefs, Consumer emit) { return (utf8Bytes, offset, region) -> { for (int number : backRefs) { if (region.beg[number] >= 0) { diff --git a/libs/plugin-scanner/src/main/java/org/elasticsearch/plugin/scanner/NamedComponentScanner.java b/libs/plugin-scanner/src/main/java/org/elasticsearch/plugin/scanner/NamedComponentScanner.java index e306cf93bba48..7a55a6749846a 100644 --- a/libs/plugin-scanner/src/main/java/org/elasticsearch/plugin/scanner/NamedComponentScanner.java +++ b/libs/plugin-scanner/src/main/java/org/elasticsearch/plugin/scanner/NamedComponentScanner.java @@ -31,14 +31,13 @@ public class NamedComponentScanner { public static void main(String[] args) throws IOException { List classReaders = ClassReaders.ofClassPath(); - NamedComponentScanner scanner = new NamedComponentScanner(); - Map> namedComponentsMap = scanner.scanForNamedClasses(classReaders); + Map> namedComponentsMap = scanForNamedClasses(classReaders); Path outputFile = Path.of(args[0]); - scanner.writeToFile(namedComponentsMap, outputFile); + NamedComponentScanner.writeToFile(namedComponentsMap, outputFile); } // scope for testing - public void writeToFile(Map> namedComponentsMap, Path outputFile) throws IOException { + public static void writeToFile(Map> namedComponentsMap, Path outputFile) throws IOException { Files.createDirectories(outputFile.getParent()); try (OutputStream outputStream = Files.newOutputStream(outputFile)) { @@ -58,7 +57,7 @@ public void writeToFile(Map> namedComponentsMap, Pat } // returns a Map - extensible interface -> map{ namedName -> className } - public Map> scanForNamedClasses(List classReaders) { + public static Map> scanForNamedClasses(List classReaders) { ClassScanner extensibleClassScanner = new ClassScanner(Type.getDescriptor(Extensible.class), (classname, map) -> { map.put(classname, classname); return null; @@ -95,7 +94,7 @@ public void visit(String key, Object value) { return componentInfo; } - private String pathToClassName(String classWithSlashes) { + private static String pathToClassName(String classWithSlashes) { return classWithSlashes.replace('/', '.'); } diff --git a/libs/plugin-scanner/src/test/java/org/elasticsearch/plugin/scanner/NamedComponentScannerTests.java b/libs/plugin-scanner/src/test/java/org/elasticsearch/plugin/scanner/NamedComponentScannerTests.java index cf81b81963c7b..1b3781c61cf8f 100644 --- a/libs/plugin-scanner/src/test/java/org/elasticsearch/plugin/scanner/NamedComponentScannerTests.java +++ b/libs/plugin-scanner/src/test/java/org/elasticsearch/plugin/scanner/NamedComponentScannerTests.java @@ -39,10 +39,8 @@ private Path tmpDir() throws IOException { return createTempDir(); } - NamedComponentScanner namedComponentScanner = new NamedComponentScanner(); - public void testFindNamedComponentInSingleClass() throws URISyntaxException { - Map> namedComponents = namedComponentScanner.scanForNamedClasses( + Map> namedComponents = NamedComponentScanner.scanForNamedClasses( classReaderStream(TestNamedComponent.class, ExtensibleInterface.class) ); @@ -82,7 +80,7 @@ public class B implements ExtensibleInterface{} )// contains plugin-api .toList(); - Map> namedComponents = namedComponentScanner.scanForNamedClasses(classReaderStream); + Map> namedComponents = NamedComponentScanner.scanForNamedClasses(classReaderStream); org.hamcrest.MatcherAssert.assertThat( namedComponents, @@ -158,7 +156,7 @@ public class B implements CustomExtensibleInterface{} List classReaders = Stream.concat(ClassReaders.ofDirWithJars(dirWithJar).stream(), classPath)// contains plugin-api .toList(); - Map> namedComponents = namedComponentScanner.scanForNamedClasses(classReaders); + Map> namedComponents = NamedComponentScanner.scanForNamedClasses(classReaders); org.hamcrest.MatcherAssert.assertThat( namedComponents, @@ -189,7 +187,7 @@ public void testWriteToFile() throws IOException { mapToWrite.put(ExtensibleInterface.class.getCanonicalName(), extensibleInterfaceComponents); Path path = tmpDir().resolve("file.json"); - namedComponentScanner.writeToFile(mapToWrite, path); + NamedComponentScanner.writeToFile(mapToWrite, path); String jsonMap = Files.readString(path); assertThat(jsonMap, equalTo(""" diff --git a/libs/tdigest/src/main/java/org/elasticsearch/tdigest/TDigest.java b/libs/tdigest/src/main/java/org/elasticsearch/tdigest/TDigest.java index 2eaf3192eefef..296ed57a4d960 100644 --- a/libs/tdigest/src/main/java/org/elasticsearch/tdigest/TDigest.java +++ b/libs/tdigest/src/main/java/org/elasticsearch/tdigest/TDigest.java @@ -105,7 +105,7 @@ public final void add(double x) { add(x, 1); } - final void checkValue(double x) { + static void checkValue(double x) { if (Double.isNaN(x) || Double.isInfinite(x)) { throw new IllegalArgumentException("Invalid value: " + x); } diff --git a/libs/x-content/src/main/java/org/elasticsearch/xcontent/support/filtering/FilterPath.java b/libs/x-content/src/main/java/org/elasticsearch/xcontent/support/filtering/FilterPath.java index d42ef96d8ff3a..733e5b6b77684 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/xcontent/support/filtering/FilterPath.java +++ b/libs/x-content/src/main/java/org/elasticsearch/xcontent/support/filtering/FilterPath.java @@ -151,7 +151,7 @@ FilterPath build() { return buildPath("", root); } - void insertNode(String filter, BuildNode node) { + static void insertNode(String filter, BuildNode node) { int end = filter.length(); int splitPosition = -1; boolean findEscapes = false; @@ -184,7 +184,7 @@ void insertNode(String filter, BuildNode node) { } } - FilterPath buildPath(String segment, BuildNode node) { + static FilterPath buildPath(String segment, BuildNode node) { Map termsChildren = new HashMap<>(); List wildcardChildren = new ArrayList<>(); for (Map.Entry entry : node.children.entrySet()) { diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSourceParser.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSourceParser.java index eab1c24820285..34a8a44326f46 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSourceParser.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSourceParser.java @@ -169,7 +169,7 @@ public final ArrayValuesSourceAggregationBuilder parse(String aggregationName return factory; } - private void parseMissingAndAdd( + private static void parseMissingAndAdd( final String aggregationName, final String currentFieldName, XContentParser parser, diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsResults.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsResults.java index b5b3fad8253eb..9aa7358563d79 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsResults.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsResults.java @@ -184,7 +184,7 @@ static > double getValFromUpperTriangularMatrix(Ma throw new IllegalArgumentException("Coefficient not computed between fields: " + fieldX + " and " + fieldY); } - private void checkField(String field, Map map) { + private static void checkField(String field, Map map) { if (field == null) { throw new IllegalArgumentException("field name cannot be null"); } diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java index 14de9193e01fe..5d85a199c4e3d 100644 --- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java +++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java @@ -1096,7 +1096,7 @@ private void setForceMergeCompletedTimestamp(String targetIndex, ActionListener< * Returns true if a value has been set for the custom index metadata field "force_merge_completed_timestamp" within the field * "data_stream_lifecycle". */ - private boolean isForceMergeComplete(IndexMetadata backingIndex) { + private static boolean isForceMergeComplete(IndexMetadata backingIndex) { Map customMetadata = backingIndex.getCustomData(LIFECYCLE_CUSTOM_INDEX_METADATA_KEY); return customMetadata != null && customMetadata.containsKey(FORCE_MERGE_COMPLETED_TIMESTAMP_METADATA_KEY); } diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java index 40c0d9194f1b2..c8774b18c7e9e 100644 --- a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java +++ b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java @@ -56,7 +56,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException { ); } - private XContentBuilder timestampMapping(boolean enabled, CheckedConsumer propertiesBuilder) + private static XContentBuilder timestampMapping(boolean enabled, CheckedConsumer propertiesBuilder) throws IOException { return topMapping(b -> { b.startObject(DataStreamTimestampFieldMapper.NAME).field("enabled", enabled).endObject(); diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/NetworkDirectionProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/NetworkDirectionProcessor.java index 57b58483d227b..6d1809d871680 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/NetworkDirectionProcessor.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/NetworkDirectionProcessor.java @@ -153,7 +153,7 @@ private String getDirection(IngestDocument d) throws Exception { return DIRECTION_EXTERNAL; } - private boolean isInternal(List networks, String ip) { + private static boolean isInternal(List networks, String ip) { for (String network : networks) { if (inNetwork(ip, network)) { return true; @@ -162,7 +162,7 @@ private boolean isInternal(List networks, String ip) { return false; } - private boolean inNetwork(String ip, String network) { + private static boolean inNetwork(String ip, String network) { InetAddress address = InetAddresses.forString(ip); return switch (network) { case LOOPBACK_NAMED_NETWORK -> isLoopback(address); diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RerouteProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RerouteProcessor.java index fd456f7f132e9..e44bb57f0b8e8 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RerouteProcessor.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RerouteProcessor.java @@ -124,7 +124,7 @@ private static String parseDataStreamNamespace(String dataStreamName, int indexO return dataStreamName.substring(indexOfSecondDash + 1); } - private String determineDataStreamField( + private static String determineDataStreamField( IngestDocument ingestDocument, List valueSources, String fallbackFromCurrentTarget diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java index d60a740930858..76c0e6e494a74 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java @@ -248,7 +248,7 @@ int indexChunks(String name, InputStream is, int chunk, String expectedMd5, long } // visible for testing - byte[] getChunk(InputStream is) throws IOException { + static byte[] getChunk(InputStream is) throws IOException { byte[] buf = new byte[MAX_CHUNK_SIZE]; int chunkSize = 0; while (chunkSize < MAX_CHUNK_SIZE) { diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/HttpClient.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/HttpClient.java index 7481f144b6376..188d826b05ff5 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/HttpClient.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/HttpClient.java @@ -69,11 +69,11 @@ InputStream get(String urlToGet) throws IOException { } @SuppressForbidden(reason = "we need socket connection to download data from internet") - private InputStream getInputStream(HttpURLConnection conn) throws IOException { + private static InputStream getInputStream(HttpURLConnection conn) throws IOException { return conn.getInputStream(); } - private HttpURLConnection createConnection(String url) throws IOException { + private static HttpURLConnection createConnection(String url) throws IOException { HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection(); conn.setConnectTimeout(10000); conn.setReadTimeout(10000); diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTests.java index f5a57e68581f2..5fedb357fff8e 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTests.java @@ -119,22 +119,22 @@ public void tearDown() throws Exception { } public void testGetChunkEndOfStream() throws IOException { - byte[] chunk = geoIpDownloader.getChunk(new InputStream() { + byte[] chunk = GeoIpDownloader.getChunk(new InputStream() { @Override public int read() { return -1; } }); assertArrayEquals(new byte[0], chunk); - chunk = geoIpDownloader.getChunk(new ByteArrayInputStream(new byte[0])); + chunk = GeoIpDownloader.getChunk(new ByteArrayInputStream(new byte[0])); assertArrayEquals(new byte[0], chunk); } public void testGetChunkLessThanChunkSize() throws IOException { ByteArrayInputStream is = new ByteArrayInputStream(new byte[] { 1, 2, 3, 4 }); - byte[] chunk = geoIpDownloader.getChunk(is); + byte[] chunk = GeoIpDownloader.getChunk(is); assertArrayEquals(new byte[] { 1, 2, 3, 4 }, chunk); - chunk = geoIpDownloader.getChunk(is); + chunk = GeoIpDownloader.getChunk(is); assertArrayEquals(new byte[0], chunk); } @@ -145,9 +145,9 @@ public void testGetChunkExactlyChunkSize() throws IOException { bigArray[i] = (byte) i; } ByteArrayInputStream is = new ByteArrayInputStream(bigArray); - byte[] chunk = geoIpDownloader.getChunk(is); + byte[] chunk = GeoIpDownloader.getChunk(is); assertArrayEquals(bigArray, chunk); - chunk = geoIpDownloader.getChunk(is); + chunk = GeoIpDownloader.getChunk(is); assertArrayEquals(new byte[0], chunk); } @@ -159,17 +159,17 @@ public void testGetChunkMoreThanChunkSize() throws IOException { byte[] smallArray = new byte[MAX_CHUNK_SIZE]; System.arraycopy(bigArray, 0, smallArray, 0, MAX_CHUNK_SIZE); ByteArrayInputStream is = new ByteArrayInputStream(bigArray); - byte[] chunk = geoIpDownloader.getChunk(is); + byte[] chunk = GeoIpDownloader.getChunk(is); assertArrayEquals(smallArray, chunk); System.arraycopy(bigArray, MAX_CHUNK_SIZE, smallArray, 0, MAX_CHUNK_SIZE); - chunk = geoIpDownloader.getChunk(is); + chunk = GeoIpDownloader.getChunk(is); assertArrayEquals(smallArray, chunk); - chunk = geoIpDownloader.getChunk(is); + chunk = GeoIpDownloader.getChunk(is); assertArrayEquals(new byte[0], chunk); } public void testGetChunkRethrowsIOException() { - expectThrows(IOException.class, () -> geoIpDownloader.getChunk(new InputStream() { + expectThrows(IOException.class, () -> GeoIpDownloader.getChunk(new InputStream() { @Override public int read() throws IOException { throw new IOException(); diff --git a/modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/DeviceTypeParser.java b/modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/DeviceTypeParser.java index e6bba12a37484..40e54c8fe5f7e 100644 --- a/modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/DeviceTypeParser.java +++ b/modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/DeviceTypeParser.java @@ -129,7 +129,7 @@ public String findDeviceType(VersionedName userAgent, VersionedName os, Versione return "Other"; } - private String findMatch(List possiblePatterns, String matchString) { + private static String findMatch(List possiblePatterns, String matchString) { String name; for (DeviceTypeSubPattern pattern : possiblePatterns) { name = pattern.match(matchString); diff --git a/modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentParser.java b/modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentParser.java index 37e54f56984b7..41ced0c7ff4cc 100644 --- a/modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentParser.java +++ b/modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentParser.java @@ -111,7 +111,7 @@ private void init(InputStream regexStream) throws IOException { } } - private Pattern compilePattern(String regex, String regex_flag) { + private static Pattern compilePattern(String regex, String regex_flag) { // Only flag present in the current default regexes.yaml if (regex_flag != null && regex_flag.equals("i")) { return Pattern.compile(regex, Pattern.CASE_INSENSITIVE); @@ -188,7 +188,7 @@ public Details parse(String agentString, boolean extractDeviceType) { return details; } - private VersionedName findMatch(List possiblePatterns, String agentString) { + private static VersionedName findMatch(List possiblePatterns, String agentString) { VersionedName versionedName; for (UserAgentSubpattern pattern : possiblePatterns) { versionedName = pattern.match(agentString); diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngine.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngine.java index 243487981c5fa..c6f60c48c4ab4 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngine.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngine.java @@ -71,7 +71,7 @@ public Set> getSupportedContexts() { return Set.of(TemplateScript.CONTEXT, TemplateScript.INGEST_CONTEXT); } - private CustomMustacheFactory createMustacheFactory(Map options) { + private static CustomMustacheFactory createMustacheFactory(Map options) { if (options == null || options.isEmpty() || options.containsKey(Script.CONTENT_TYPE_OPTION) == false) { return new CustomMustacheFactory(); } diff --git a/modules/lang-painless/src/doc/java/org/elasticsearch/painless/ContextGeneratorCommon.java b/modules/lang-painless/src/doc/java/org/elasticsearch/painless/ContextGeneratorCommon.java index a83f3b0ac6cec..c54214e5f854d 100644 --- a/modules/lang-painless/src/doc/java/org/elasticsearch/painless/ContextGeneratorCommon.java +++ b/modules/lang-painless/src/doc/java/org/elasticsearch/painless/ContextGeneratorCommon.java @@ -210,7 +210,7 @@ public PainlessInfos(List contextInfos, JavadocExtractor ex } } - private Set getCommon(List painlessContexts, Function> getter) { + private static Set getCommon(List painlessContexts, Function> getter) { Map infoCounts = new HashMap<>(); for (PainlessContextInfo contextInfo : painlessContexts) { for (T info : getter.apply(contextInfo)) { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java index 2c286479dcf4d..e2f64d3853670 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java @@ -151,7 +151,7 @@ public Set> getSupportedContexts() { * @param The factory class. * @return A factory class that will return script instances. */ - private Type generateStatefulFactory(Loader loader, ScriptContext context, ScriptScope scriptScope) { + private static Type generateStatefulFactory(Loader loader, ScriptContext context, ScriptScope scriptScope) { int classFrames = ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS; int classAccess = Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER | Opcodes.ACC_FINAL; String interfaceBase = Type.getType(context.statefulFactoryClazz).getInternalName(); @@ -271,7 +271,7 @@ private Type generateStatefulFactory(Loader loader, ScriptContext context * @param The factory class. * @return A factory class that will return script instances. */ - private T generateFactory(Loader loader, ScriptContext context, Type classType, ScriptScope scriptScope) { + private static T generateFactory(Loader loader, ScriptContext context, Type classType, ScriptScope scriptScope) { int classFrames = ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS; int classAccess = Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER | Opcodes.ACC_FINAL; String interfaceBase = Type.getType(context.factoryClazz).getInternalName(); @@ -362,7 +362,7 @@ private T generateFactory(Loader loader, ScriptContext context, Type clas } } - private void writeNeedsMethods(Class clazz, ClassWriter writer, Set extractedVariables) { + private static void writeNeedsMethods(Class clazz, ClassWriter writer, Set extractedVariables) { for (Method method : clazz.getMethods()) { if (method.getName().startsWith("needs") && method.getReturnType().equals(boolean.class) @@ -458,7 +458,7 @@ private CompilerSettings buildCompilerSettings(Map params) { return compilerSettings; } - private ScriptException convertToScriptException(String scriptSource, Throwable t) { + private static ScriptException convertToScriptException(String scriptSource, Throwable t) { // create a script stack: this is just the script portion List scriptStack = new ArrayList<>(); ScriptException.Position pos = null; @@ -499,11 +499,11 @@ private ScriptException convertToScriptException(String scriptSource, Throwable } // very simple heuristic: +/- 25 chars. can be improved later. - private int getPreviousStatement(int offset) { + private static int getPreviousStatement(int offset) { return Math.max(0, offset - 25); } - private int getNextStatement(String scriptSource, int offset) { + private static int getNextStatement(String scriptSource, int offset) { return Math.min(scriptSource.length(), offset + 25); } } diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ScriptClassInfo.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/ScriptClassInfo.java index 4ee427c04325f..8b0b57e6389fc 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ScriptClassInfo.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/ScriptClassInfo.java @@ -213,7 +213,7 @@ public List> getGetReturns() { */ public record MethodArgument(Class clazz, String name) {} - private MethodArgument methodArgument(PainlessLookup painlessLookup, Class clazz, String argName) { + private static MethodArgument methodArgument(PainlessLookup painlessLookup, Class clazz, String argName) { Class defClass = definitionTypeForClass( painlessLookup, clazz, diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java index 038f0cc3c2f06..e9a3b2c1fd7f7 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java @@ -195,7 +195,7 @@ private SourceContext buildAntlrTree(String sourceString) { return parser.source(); } - private void setupPicky(PainlessParser parser) { + private static void setupPicky(PainlessParser parser) { // Diagnostic listener invokes syntaxError on other listeners for ambiguity issues, parser.addErrorListener(new DiagnosticErrorListener(true)); // a second listener to fail the test when the above happens. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupBuilder.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupBuilder.java index e32caaf8407ea..bf001c5e49db9 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupBuilder.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupBuilder.java @@ -203,7 +203,7 @@ private boolean isValidType(Class type) { return type == def.class || classesToPainlessClassBuilders.containsKey(type); } - private Class loadClass(ClassLoader classLoader, String javaClassName, Supplier errorMessage) { + private static Class loadClass(ClassLoader classLoader, String javaClassName, Supplier errorMessage) { try { return Class.forName(javaClassName, true, classLoader); } catch (ClassNotFoundException cnfe) { @@ -1838,7 +1838,11 @@ private void generateRuntimeMethods() { } } - private void generateFilteredMethod(Class targetClass, PainlessClassBuilder painlessClassBuilder, PainlessMethod painlessMethod) { + private static void generateFilteredMethod( + Class targetClass, + PainlessClassBuilder painlessClassBuilder, + PainlessMethod painlessMethod + ) { String painlessMethodKey = buildPainlessMethodKey(painlessMethod.javaMethod().getName(), painlessMethod.typeParameters().size()); PainlessMethod filteredPainlessMethod = painlessFilteredCache.get(painlessMethod); @@ -1907,10 +1911,10 @@ private void generateFilteredMethod(Class targetClass, PainlessClassBuilder p } private void cacheRuntimeHandles() { - classesToPainlessClassBuilders.values().forEach(this::cacheRuntimeHandles); + classesToPainlessClassBuilders.values().forEach(PainlessLookupBuilder::cacheRuntimeHandles); } - private void cacheRuntimeHandles(PainlessClassBuilder painlessClassBuilder) { + private static void cacheRuntimeHandles(PainlessClassBuilder painlessClassBuilder) { for (Map.Entry painlessMethodEntry : painlessClassBuilder.methods.entrySet()) { String methodKey = painlessMethodEntry.getKey(); PainlessMethod painlessMethod = painlessMethodEntry.getValue(); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java index 2097a3e2995f8..3cba26f7b2da1 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java @@ -704,7 +704,7 @@ public void visitInvokeCallMember(InvokeCallMemberNode irInvokeCallMemberNode, C } } - private void replaceCallWithConstant( + private static void replaceCallWithConstant( InvokeCallMemberNode irInvokeCallMemberNode, Consumer scope, Method javaMethod, diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultSemanticAnalysisPhase.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultSemanticAnalysisPhase.java index 9e95734f0978b..ddb7b060062b5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultSemanticAnalysisPhase.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultSemanticAnalysisPhase.java @@ -166,7 +166,7 @@ private static ClassCastException castError(String formatText, Object... argumen /** * Decorates a user expression node with a PainlessCast. */ - public void decorateWithCast(AExpression userExpressionNode, SemanticScope semanticScope) { + public static void decorateWithCast(AExpression userExpressionNode, SemanticScope semanticScope) { Location location = userExpressionNode.getLocation(); Class valueType = semanticScope.getDecoration(userExpressionNode, ValueType.class).valueType(); Class targetType = semanticScope.getDecoration(userExpressionNode, TargetType.class).targetType(); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java index 4739f7682ef3e..76babcdb9d26e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java @@ -479,7 +479,7 @@ protected ExpressionNode injectCast(AExpression userExpressionNode, ScriptScope * @param irStoreNode The store node if this is a write. * @return The root node for this assignment. */ - protected ExpressionNode buildLoadStore( + protected static ExpressionNode buildLoadStore( int accessDepth, Location location, boolean isNullSafe, diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticAnalysisPhase.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticAnalysisPhase.java index a7b4771a1fbfc..0f77fb90b5b59 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticAnalysisPhase.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticAnalysisPhase.java @@ -193,7 +193,7 @@ public void visitReturn(SReturn userReturnNode, SemanticScope semanticScope) { /** * Decorates a user expression node with a PainlessCast. */ - public void decorateWithCastForReturn( + public static void decorateWithCastForReturn( AExpression userExpressionNode, AStatement parent, SemanticScope semanticScope, diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessUserTreeToIRTreePhase.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessUserTreeToIRTreePhase.java index c104c95dc579d..4be4d07e449f1 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessUserTreeToIRTreePhase.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessUserTreeToIRTreePhase.java @@ -262,7 +262,7 @@ protected void injectStaticFieldsAndGetters() { // requires the gets method name be modified from "getExample" to "example" // if a get method variable isn't used it's declaration node is removed from // the ir tree permanently so there is no frivolous variable slotting - protected void injectGetsDeclarations(BlockNode irBlockNode, ScriptScope scriptScope) { + protected static void injectGetsDeclarations(BlockNode irBlockNode, ScriptScope scriptScope) { Location internalLocation = new Location("$internal$ScriptInjectionPhase$injectGetsDeclarations", 0); for (int i = 0; i < scriptScope.getScriptClassInfo().getGetMethods().size(); ++i) { @@ -345,7 +345,7 @@ protected void injectNeedsMethods(ScriptScope scriptScope) { * } * */ - protected void injectSandboxExceptions(FunctionNode irFunctionNode) { + protected static void injectSandboxExceptions(FunctionNode irFunctionNode) { try { Location internalLocation = new Location("$internal$ScriptInjectionPhase$injectSandboxExceptions", 0); BlockNode irBlockNode = irFunctionNode.getBlockNode(); @@ -513,7 +513,7 @@ public void visitReturn(SReturn userReturnNode, ScriptScope scriptScope) { injectConverter(userReturnNode, scriptScope); } - public void injectConverter(AStatement userStatementNode, ScriptScope scriptScope) { + public static void injectConverter(AStatement userStatementNode, ScriptScope scriptScope) { Converter converter = scriptScope.getDecoration(userStatementNode, Converter.class); if (converter == null) { return; diff --git a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/GeoShapeType.java b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/GeoShapeType.java index fb72ee793d399..0bef69ca26a6b 100644 --- a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/GeoShapeType.java +++ b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/GeoShapeType.java @@ -167,7 +167,7 @@ public PolygonBuilder getBuilder( return polygon; } - void validateLinearRing(CoordinateNode coordinates, boolean coerce) { + static void validateLinearRing(CoordinateNode coordinates, boolean coerce) { if (coordinates.children == null || coordinates.children.isEmpty()) { String error = "Invalid LinearRing found."; error += (coordinates.coordinate == null) diff --git a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/PolygonBuilder.java b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/PolygonBuilder.java index 46cc6a131415f..beef840756e78 100644 --- a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/PolygonBuilder.java +++ b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/PolygonBuilder.java @@ -166,7 +166,7 @@ private static void validateLinearRing(LineStringBuilder lineString) { /** * Validates only 1 vertex is tangential (shared) between the interior and exterior of a polygon */ - protected void validateHole(LineStringBuilder shell, LineStringBuilder hole) { + protected static void validateHole(LineStringBuilder shell, LineStringBuilder hole) { HashSet exterior = Sets.newHashSet(shell.coordinates); HashSet interior = Sets.newHashSet(hole.coordinates); exterior.retainAll(interior); diff --git a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/ShapeBuilder.java b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/ShapeBuilder.java index 0ca7d20c6678d..31d610fbdc57a 100644 --- a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/ShapeBuilder.java +++ b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/ShapeBuilder.java @@ -176,7 +176,7 @@ protected Coordinate[] coordinates(boolean closed) { return result; } - protected JtsGeometry jtsGeometry(Geometry geom) { + protected static JtsGeometry jtsGeometry(Geometry geom) { // dateline180Check is false because ElasticSearch does it's own dateline wrapping JtsGeometry jtsGeometry = new JtsGeometry(geom, SPATIAL_CONTEXT, false, MULTI_POLYGON_MAY_OVERLAP); if (AUTO_VALIDATE_JTS_GEOMETRY) jtsGeometry.validate(); diff --git a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java index 9b16a08d4ba2f..46860ff38b8ca 100644 --- a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java +++ b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java @@ -294,7 +294,7 @@ private void setupFieldTypeDeprecatedParameters(GeoShapeFieldType ft) { } } - private void setupPrefixTrees(GeoShapeFieldType ft) { + private static void setupPrefixTrees(GeoShapeFieldType ft) { SpatialPrefixTree prefixTree; if (ft.tree().equals(PrefixTrees.GEOHASH)) { prefixTree = new GeohashPrefixTree( diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapperTests.java index 285e58ec87fc5..4c738ddcffce1 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapperTests.java @@ -101,7 +101,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException { ); } - private XContentBuilder testMapping(boolean syntheticSource) throws IOException { + private static XContentBuilder testMapping(boolean syntheticSource) throws IOException { if (syntheticSource) { return syntheticSourceMapping(b -> b.startObject("field").field("type", "match_only_text").endObject()); } diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapperTests.java index b95d36d2e6a01..88124504faade 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapperTests.java @@ -279,7 +279,8 @@ public void testMultiFields() throws IOException { } } - private void assertMultiField(int shingleSize, MapperService mapperService, String suggestPath, String textPath) throws IOException { + private static void assertMultiField(int shingleSize, MapperService mapperService, String suggestPath, String textPath) + throws IOException { List fields = new ArrayList<>(); fields.add(suggestPath); fields.add(textPath); diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapperTests.java index dd48a8d4996b1..1636def53536b 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapperTests.java @@ -165,7 +165,7 @@ private DocumentMapper createIndexWithTokenCountField() throws IOException { })); } - private SourceToParse createDocument(String fieldValue) throws Exception { + private static SourceToParse createDocument(String fieldValue) throws Exception { return source(b -> b.field("test", fieldValue)); } diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java index 6a644cdcdc5ca..95db4d92874a4 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentChildInnerHitContextBuilder.java @@ -156,7 +156,7 @@ public TopDocsAndMaxScore topDocs(SearchHit hit) throws IOException { } } - private String getSortedDocValue(String field, SearchContext context, int docId) { + private static String getSortedDocValue(String field, SearchContext context, int docId) { try { List ctxs = context.searcher().getIndexReader().leaves(); LeafReaderContext ctx = ctxs.get(ReaderUtil.subIndex(docId, ctxs)); diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java index d2e30ed1d420d..016d9d3f75a21 100644 --- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java +++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java @@ -327,7 +327,7 @@ Tuple createCandidateQuery(IndexReader indexReader) throw // This was extracted the method above, because otherwise it is difficult to test what terms are included in // the query in case a CoveringQuery is used (it does not have a getter to retrieve the clauses) - Tuple, Map>> extractTermsAndRanges(IndexReader indexReader) throws IOException { + static Tuple, Map>> extractTermsAndRanges(IndexReader indexReader) throws IOException { List extractedTerms = new ArrayList<>(); Map> encodedPointValuesByField = new HashMap<>(); diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java index 6a77f6c97b0f4..5a12e0c9f3a37 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java @@ -367,7 +367,7 @@ public void testExtractTermsAndRanges() throws Exception { IndexReader indexReader = memoryIndex.createSearcher().getIndexReader(); - Tuple, Map>> t = fieldType.extractTermsAndRanges(indexReader); + Tuple, Map>> t = PercolatorFieldMapper.PercolatorFieldType.extractTermsAndRanges(indexReader); assertEquals(1, t.v2().size()); Map> rangesMap = t.v2(); assertEquals(1, rangesMap.size()); @@ -449,7 +449,7 @@ public void testExtractTermsAndRanges_numberFields() throws Exception { IndexReader indexReader = memoryIndex.createSearcher().getIndexReader(); - Tuple, Map>> t = fieldType.extractTermsAndRanges(indexReader); + Tuple, Map>> t = PercolatorFieldMapper.PercolatorFieldType.extractTermsAndRanges(indexReader); assertEquals(0, t.v1().size()); Map> rangesMap = t.v2(); assertEquals(7, rangesMap.size()); diff --git a/modules/reindex/src/main/java/org/elasticsearch/reindex/AbstractBaseReindexRestHandler.java b/modules/reindex/src/main/java/org/elasticsearch/reindex/AbstractBaseReindexRestHandler.java index 95fc3060a6af0..952dd0585e7ba 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/reindex/AbstractBaseReindexRestHandler.java +++ b/modules/reindex/src/main/java/org/elasticsearch/reindex/AbstractBaseReindexRestHandler.java @@ -107,7 +107,7 @@ protected Request setCommonOptions(RestRequest restRequest, Request request) { return request; } - private RestChannelConsumer sendTask(String localNodeId, Task task) { + private static RestChannelConsumer sendTask(String localNodeId, Task task) { return channel -> { try (XContentBuilder builder = channel.newBuilder()) { builder.startObject(); diff --git a/modules/reindex/src/main/java/org/elasticsearch/reindex/AbstractBulkByQueryRestHandler.java b/modules/reindex/src/main/java/org/elasticsearch/reindex/AbstractBulkByQueryRestHandler.java index 2f7d3c5de5202..7502ab748f7fe 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/reindex/AbstractBulkByQueryRestHandler.java +++ b/modules/reindex/src/main/java/org/elasticsearch/reindex/AbstractBulkByQueryRestHandler.java @@ -76,7 +76,7 @@ protected void parseInternalRequest( * should get better when SearchRequest has full ObjectParser support * then we can delegate and stuff. */ - private XContentParser extractRequestSpecificFields(RestRequest restRequest, Map> bodyConsumers) + private static XContentParser extractRequestSpecificFields(RestRequest restRequest, Map> bodyConsumers) throws IOException { if (restRequest.hasContentOrSourceParam() == false) { return null; // body is optional diff --git a/modules/reindex/src/main/java/org/elasticsearch/reindex/BulkIndexByScrollResponseContentListener.java b/modules/reindex/src/main/java/org/elasticsearch/reindex/BulkIndexByScrollResponseContentListener.java index d1f9bdf7e147d..2c597dba6e22f 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/reindex/BulkIndexByScrollResponseContentListener.java +++ b/modules/reindex/src/main/java/org/elasticsearch/reindex/BulkIndexByScrollResponseContentListener.java @@ -40,7 +40,7 @@ public RestResponse buildResponse(BulkByScrollResponse response, XContentBuilder return new RestResponse(getStatus(response), builder); } - private RestStatus getStatus(BulkByScrollResponse response) { + private static RestStatus getStatus(BulkByScrollResponse response) { /* * Return the highest numbered rest status under the assumption that higher numbered statuses are "more error" and thus more * interesting to the user. diff --git a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobStore.java b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobStore.java index d5e510dd5288a..91ac9996f97ca 100644 --- a/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobStore.java +++ b/modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobStore.java @@ -122,9 +122,9 @@ public AzureBlobStore(RepositoryMetadata metadata, AzureStorageService service, (httpMethod, url) -> httpMethod.equals("GET") && isListRequest(httpMethod, url) == false, stats.getOperations::incrementAndGet ), - RequestStatsCollector.create(this::isListRequest, stats.listOperations::incrementAndGet), - RequestStatsCollector.create(this::isPutBlockRequest, stats.putBlockOperations::incrementAndGet), - RequestStatsCollector.create(this::isPutBlockListRequest, stats.putBlockListOperations::incrementAndGet), + RequestStatsCollector.create(AzureBlobStore::isListRequest, stats.listOperations::incrementAndGet), + RequestStatsCollector.create(AzureBlobStore::isPutBlockRequest, stats.putBlockOperations::incrementAndGet), + RequestStatsCollector.create(AzureBlobStore::isPutBlockListRequest, stats.putBlockListOperations::incrementAndGet), RequestStatsCollector.create( // https://docs.microsoft.com/en-us/rest/api/storageservices/put-blob#uri-parameters // The only URI parameter allowed for put-blob operation is "timeout", but if a sas token is used, @@ -158,18 +158,18 @@ && isPutBlockListRequest(httpMethod, url) == false, }; } - private boolean isListRequest(String httpMethod, URL url) { + private static boolean isListRequest(String httpMethod, URL url) { return httpMethod.equals("GET") && url.getQuery() != null && url.getQuery().contains("comp=list"); } // https://docs.microsoft.com/en-us/rest/api/storageservices/put-block - private boolean isPutBlockRequest(String httpMethod, URL url) { + private static boolean isPutBlockRequest(String httpMethod, URL url) { String queryParams = url.getQuery() == null ? "" : url.getQuery(); return httpMethod.equals("PUT") && queryParams.contains("comp=block") && queryParams.contains("blockid="); } // https://docs.microsoft.com/en-us/rest/api/storageservices/put-block-list - private boolean isPutBlockListRequest(String httpMethod, URL url) { + private static boolean isPutBlockListRequest(String httpMethod, URL url) { String queryParams = url.getQuery() == null ? "" : url.getQuery(); return httpMethod.equals("PUT") && queryParams.contains("comp=blocklist"); } @@ -504,7 +504,7 @@ private void executeMultipartUpload(String blobName, InputStream inputStream, lo private static final Base64.Encoder base64Encoder = Base64.getEncoder().withoutPadding(); private static final Base64.Decoder base64UrlDecoder = Base64.getUrlDecoder(); - private String makeMultipartBlockId() { + private static String makeMultipartBlockId() { return base64Encoder.encodeToString(base64UrlDecoder.decode(UUIDs.base64UUID())); } diff --git a/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java b/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java index fca005e8de32c..911d59aa52dcb 100644 --- a/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java +++ b/modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java @@ -171,7 +171,7 @@ public final void collectMetrics(Request request, Response response) { protected abstract void collectMetrics(Request request); } - private long getRequestCount(Request request) { + private static long getRequestCount(Request request) { Number requestCount = request.getAWSRequestMetrics().getTimingInfo().getCounter(AWSRequestMetrics.Field.RequestCount.name()); if (requestCount == null) { logger.warn("Expected request count to be tracked for request [{}] but found not count.", request); diff --git a/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/URLHttpClient.java b/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/URLHttpClient.java index 580348564b07e..42bece3dbea16 100644 --- a/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/URLHttpClient.java +++ b/modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/http/URLHttpClient.java @@ -180,7 +180,7 @@ private String parseBodyAsString(CloseableHttpResponse response, int maxSize) { return errorMessage; } - private Charset getCharset(HttpEntity httpEntity) { + private static Charset getCharset(HttpEntity httpEntity) { final Header contentType = httpEntity.getContentType(); if (contentType == null) { return StandardCharsets.UTF_8; @@ -195,14 +195,14 @@ private Charset getCharset(HttpEntity httpEntity) { return StandardCharsets.UTF_8; } - private boolean isValidContentTypeToParseError(HttpEntity httpEntity) { + private static boolean isValidContentTypeToParseError(HttpEntity httpEntity) { Header contentType = httpEntity.getContentType(); return contentType != null && httpEntity.getContentLength() > 0 && (contentType.getValue().startsWith("text/") || contentType.getValue().startsWith("application/")); } - private boolean isSuccessful(int statusCode) { + private static boolean isSuccessful(int statusCode) { return statusCode / 100 == RestStatus.OK.getStatus() / 100; } diff --git a/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/IcuTokenizerFactory.java b/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/IcuTokenizerFactory.java index 18ac1d6d9641b..e869ebf20f59e 100644 --- a/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/IcuTokenizerFactory.java +++ b/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/IcuTokenizerFactory.java @@ -51,7 +51,7 @@ public Tokenizer create() { } } - private ICUTokenizerConfig getIcuConfig(Environment env, Settings settings) { + private static ICUTokenizerConfig getIcuConfig(Environment env, Settings settings) { Map tailored = new HashMap<>(); try { @@ -96,7 +96,7 @@ public RuleBasedBreakIterator getBreakIterator(int script) { } // parse a single RBBi rule file - private BreakIterator parseRules(String filename, Environment env) throws IOException { + private static BreakIterator parseRules(String filename, Environment env) throws IOException { final Path path = env.configFile().resolve(filename); String rules = Files.readAllLines(path).stream().filter((v) -> v.startsWith("#") == false).collect(Collectors.joining("\n")); diff --git a/plugins/analysis-phonetic/src/main/java/org/elasticsearch/plugin/analysis/phonetic/KoelnerPhonetik.java b/plugins/analysis-phonetic/src/main/java/org/elasticsearch/plugin/analysis/phonetic/KoelnerPhonetik.java index aed1a8cfec19a..4fc6cde6e1244 100644 --- a/plugins/analysis-phonetic/src/main/java/org/elasticsearch/plugin/analysis/phonetic/KoelnerPhonetik.java +++ b/plugins/analysis-phonetic/src/main/java/org/elasticsearch/plugin/analysis/phonetic/KoelnerPhonetik.java @@ -261,11 +261,11 @@ private String substitute(String str) { return s; } - private String expandUmlauts(String str) { + private static String expandUmlauts(String str) { return str.replaceAll("\u00C4", "AE").replaceAll("\u00D6", "OE").replaceAll("\u00DC", "UE"); } - private String removeSequences(String str) { + private static String removeSequences(String str) { if (str == null || str.length() == 0) { return ""; } diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2NameResolver.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2NameResolver.java index c55eb8ff7f471..5c8a2a8fb92f9 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2NameResolver.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2NameResolver.java @@ -80,7 +80,7 @@ private enum Ec2HostnameType { * @see CustomNameResolver#resolveIfPossible(String) */ @SuppressForbidden(reason = "We call getInputStream in doPrivileged and provide SocketPermission") - public InetAddress[] resolve(Ec2HostnameType type) throws IOException { + public static InetAddress[] resolve(Ec2HostnameType type) throws IOException { InputStream in = null; String metadataUrl = EC2MetadataUtils.getHostAddressForEC2MetadataService() + "/latest/meta-data/" + type.ec2Name; String metadataTokenUrl = EC2MetadataUtils.getHostAddressForEC2MetadataService() + "/latest/api/token"; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java b/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java index 7d9e1f3955089..b9cc8ef8ac515 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java @@ -441,7 +441,7 @@ public void assertLinearizable() { if (history.size() > 300) { scheduler.schedule(() -> abort.set(true), 10, TimeUnit.SECONDS); } - linearizable = new LinearizabilityChecker().isLinearizable(spec, history, missingResponseGenerator(), abort::get); + linearizable = LinearizabilityChecker.isLinearizable(spec, history, missingResponseGenerator(), abort::get); ThreadPool.terminate(scheduler, 1, TimeUnit.SECONDS); if (abort.get() && linearizable == false) { linearizable = true; // let the test pass @@ -690,11 +690,7 @@ private static void runLinearizabilityChecker(FileInputStream fileInputStream, l LinearizabilityChecker.History history = readHistory(is); Version initialVersion = new Version(primaryTerm, seqNo); - boolean result = new LinearizabilityChecker().isLinearizable( - new CASSequentialSpec(initialVersion), - history, - missingResponseGenerator() - ); + boolean result = LinearizabilityChecker.isLinearizable(new CASSequentialSpec(initialVersion), history, missingResponseGenerator()); System.out.println(LinearizabilityChecker.visualize(new CASSequentialSpec(initialVersion), history, missingResponseGenerator())); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java index fce38ab63c302..901f8b1e83c69 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java @@ -243,7 +243,7 @@ public void onFailure(Exception e) { } } - private NodesRemovalPrevalidation createPrevalidationResult(DiscoveryNodes nodes, PrevalidateShardPathResponse response) { + private static NodesRemovalPrevalidation createPrevalidationResult(DiscoveryNodes nodes, PrevalidateShardPathResponse response) { List nodeResults = new ArrayList<>(response.getNodes().size() + response.failures().size()); for (NodePrevalidateShardPathResponse nodeResponse : response.getNodes()) { Result result; diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java index ba9ba10a80d0d..7111f64d050de 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java @@ -82,7 +82,7 @@ public void writeTo(StreamOutput out) throws IOException { RoutingExplanations.writeTo(explanations, out); } - private boolean emitState(ToXContent.Params params) { + private static boolean emitState(ToXContent.Params params) { return Objects.equals(params.param("metric"), "none") == false; } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateAction.java index 7f3e058916572..dbb6b5994867f 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateAction.java @@ -178,7 +178,7 @@ public TransformState transform(Object source, TransformState prevState) throws // 4. validate for v2 composable template overlaps for (var request : composables) { - indexTemplateService.v2TemplateOverlaps(state, request.name(), request.indexTemplate(), true); + MetadataIndexTemplateService.v2TemplateOverlaps(state, request.name(), request.indexTemplate(), true); } Set componentEntities = components.stream().map(r -> reservedComponentName(r.name())).collect(Collectors.toSet()); diff --git a/server/src/main/java/org/elasticsearch/action/ingest/ReservedPipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/ReservedPipelineAction.java index 4e796a638f480..aca9bb81fb53f 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/ReservedPipelineAction.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/ReservedPipelineAction.java @@ -68,7 +68,7 @@ private Collection prepare(List requests return requests; } - private ClusterState wrapIngestTaskExecute(IngestService.PipelineClusterStateUpdateTask task, ClusterState state) { + private static ClusterState wrapIngestTaskExecute(IngestService.PipelineClusterStateUpdateTask task, ClusterState state) { final var allIndexMetadata = state.metadata().indices().values(); final IngestMetadata currentIndexMetadata = state.metadata().custom(IngestMetadata.TYPE); diff --git a/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java b/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java index cefcd4bfb511e..8fd5e40dab1d2 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java @@ -60,7 +60,7 @@ void onNonFatalUncaught(final String threadName, final Throwable t) { logErrorMessage(t, message); } - private void logErrorMessage(Throwable t, String message) { + private static void logErrorMessage(Throwable t, String message) { AccessController.doPrivileged((PrivilegedAction) () -> { logger.error(message, t); return null; diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/CoordinationDiagnosticsService.java b/server/src/main/java/org/elasticsearch/cluster/coordination/CoordinationDiagnosticsService.java index 1c2f120c6c925..fb5c9f2fea7de 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/CoordinationDiagnosticsService.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/CoordinationDiagnosticsService.java @@ -249,7 +249,7 @@ private CoordinationDiagnosticsResult diagnoseOnHaveSeenMasterRecently(MasterHis * @param verbose Whether to calculate and include the details in the result * @return The CoordinationDiagnosticsResult for the given localMasterHistory */ - private CoordinationDiagnosticsResult diagnoseOnMasterHasChangedIdentity( + private static CoordinationDiagnosticsResult diagnoseOnMasterHasChangedIdentity( MasterHistory localMasterHistory, int masterChanges, boolean verbose @@ -352,7 +352,7 @@ private CoordinationDiagnosticsResult diagnoseOnMasterHasFlappedNull(MasterHisto * Returns a CoordinationDiagnosticsResult for the case when the master is seen as stable * @return A CoordinationDiagnosticsResult for the case when the master is seen as stable (GREEN status, no impacts or details) */ - private CoordinationDiagnosticsResult getMasterIsStableResult(boolean verbose, MasterHistory localMasterHistory) { + private static CoordinationDiagnosticsResult getMasterIsStableResult(boolean verbose, MasterHistory localMasterHistory) { String summary = "The cluster has a stable master node"; logger.trace("The cluster has a stable master node"); CoordinationDiagnosticsDetails details = getDetails(verbose, localMasterHistory, null, null); diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/StableMasterHealthIndicatorService.java b/server/src/main/java/org/elasticsearch/cluster/coordination/StableMasterHealthIndicatorService.java index 5dea832cc6ad3..56289ab348a3a 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/StableMasterHealthIndicatorService.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/StableMasterHealthIndicatorService.java @@ -219,7 +219,7 @@ private String getNameForNodeId(String nodeId) { * @param explain If true, the returned list includes a UserAction to contact support, otherwise an empty list * @return a single UserAction instructing users to contact support. */ - private List getContactSupportUserActions(boolean explain) { + private static List getContactSupportUserActions(boolean explain) { if (explain) { return List.of(CONTACT_SUPPORT); } else { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java index 5415454a10486..cf63602729bb4 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java @@ -643,7 +643,7 @@ public ClusterState addIndexTemplateV2( * @param validate should we throw {@link IllegalArgumentException} if conflicts are found or just compute them * @return a map of v2 template names to their index patterns for v2 templates that would overlap with the given template */ - public Map> v2TemplateOverlaps( + public static Map> v2TemplateOverlaps( ClusterState currentState, String name, final ComposableIndexTemplate template, diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java index e62bdbe01a8ee..1cdfbd40e5214 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java @@ -107,7 +107,7 @@ boolean requiresUpdate(IndexMetadata indexMetadata) { } // package-private for testing - boolean isVisible(IndexMetadata indexMetadata) { + static boolean isVisible(IndexMetadata indexMetadata) { return indexMetadata.getSettings().getAsBoolean(IndexMetadata.SETTING_INDEX_HIDDEN, false) == false; } @@ -118,7 +118,7 @@ boolean shouldBeSystem(IndexMetadata indexMetadata) { } // package-private for testing - boolean hasVisibleAlias(IndexMetadata indexMetadata) { + static boolean hasVisibleAlias(IndexMetadata indexMetadata) { return indexMetadata.getAliases().values().stream().anyMatch(a -> Boolean.FALSE.equals(a.isHidden())); } diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java index c454a0daca8be..5f477a9ca66df 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java @@ -426,7 +426,7 @@ private void setFrozenFloodStageMaxHeadroom(ByteSizeValue maxHeadroom) { this.frozenFloodStageMaxHeadroom = maxHeadroom; } - private ByteSizeValue getFreeBytesThreshold(ByteSizeValue total, RelativeByteSizeValue watermark, ByteSizeValue maxHeadroom) { + private static ByteSizeValue getFreeBytesThreshold(ByteSizeValue total, RelativeByteSizeValue watermark, ByteSizeValue maxHeadroom) { // If bytes are given, they can be readily returned as free bytes. If percentages are given, we need to calculate the free bytes. if (watermark.isAbsolute()) { return watermark.getAbsolute(); @@ -450,7 +450,7 @@ public ByteSizeValue getFreeBytesThresholdFrozenFloodStage(ByteSizeValue total) return getFreeBytesThreshold(total, frozenFloodStageWatermark, frozenFloodStageMaxHeadroom); } - private ByteSizeValue getMinimumTotalSizeForBelowWatermark( + private static ByteSizeValue getMinimumTotalSizeForBelowWatermark( ByteSizeValue used, RelativeByteSizeValue watermark, ByteSizeValue maxHeadroom @@ -490,7 +490,7 @@ public TimeValue getRerouteInterval() { return rerouteInterval; } - private String describeThreshold( + private static String describeThreshold( ByteSizeValue total, RelativeByteSizeValue watermark, ByteSizeValue maxHeadroom, diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardsAvailabilityHealthIndicatorService.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardsAvailabilityHealthIndicatorService.java index 9d41dd86d2ceb..15710da073c8e 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardsAvailabilityHealthIndicatorService.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardsAvailabilityHealthIndicatorService.java @@ -725,7 +725,7 @@ private List checkDataTierAtShardLimit( } } - private List checkDataTierShouldMigrate( + private static List checkDataTierShouldMigrate( IndexMetadata indexMetadata, List dataTierAllocationResults, @Nullable String preferredTier, @@ -770,7 +770,7 @@ private List checkDataTierShouldMigrate( } } - private Optional checkNotEnoughNodesInDataTier( + private static Optional checkNotEnoughNodesInDataTier( List dataTierAllocationResults, @Nullable String preferredTier ) { diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocator.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocator.java index 1a0c6453e815a..ee95074b8a730 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocator.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocator.java @@ -313,7 +313,9 @@ public ClusterState execute(BatchExecutionContext b return newState; } - private TaskContext findLatest(List> taskContexts) { + private static TaskContext findLatest( + List> taskContexts + ) { return taskContexts.stream().max(Comparator.comparing(context -> context.getTask().desiredBalance.lastConvergedIndex())).get(); } @@ -331,7 +333,7 @@ private ClusterState applyBalance( } } - private void discardSupersededTasks( + private static void discardSupersededTasks( List> taskContexts, TaskContext latest ) { diff --git a/server/src/main/java/org/elasticsearch/common/cli/EnvironmentAwareCommand.java b/server/src/main/java/org/elasticsearch/common/cli/EnvironmentAwareCommand.java index 2f117d8f097f4..2fc6a1ce6320a 100644 --- a/server/src/main/java/org/elasticsearch/common/cli/EnvironmentAwareCommand.java +++ b/server/src/main/java/org/elasticsearch/common/cli/EnvironmentAwareCommand.java @@ -54,7 +54,7 @@ protected void execute(Terminal terminal, OptionSet options, ProcessInfo process execute(terminal, options, createEnv(options, processInfo), processInfo); } - private void putDockerEnvSettings(Map settings, Map envVars) { + private static void putDockerEnvSettings(Map settings, Map envVars) { for (var envVar : envVars.entrySet()) { String key = envVar.getKey(); if (DOCKER_LOWERCASE_SETTING_REGEX.matcher(key).matches()) { diff --git a/server/src/main/java/org/elasticsearch/common/logging/JULBridge.java b/server/src/main/java/org/elasticsearch/common/logging/JULBridge.java index 64915acaee031..91026ff38ab1f 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/JULBridge.java +++ b/server/src/main/java/org/elasticsearch/common/logging/JULBridge.java @@ -78,7 +78,7 @@ public void publish(LogRecord record) { } } - private Level translateJulLevel(java.util.logging.Level julLevel) { + private static Level translateJulLevel(java.util.logging.Level julLevel) { Level esLevel = levelMap.get(julLevel); if (esLevel != null) { return esLevel; diff --git a/server/src/main/java/org/elasticsearch/common/logging/internal/LoggerImpl.java b/server/src/main/java/org/elasticsearch/common/logging/internal/LoggerImpl.java index df9222453d862..7a41b469b1d45 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/internal/LoggerImpl.java +++ b/server/src/main/java/org/elasticsearch/common/logging/internal/LoggerImpl.java @@ -22,7 +22,7 @@ public LoggerImpl(org.apache.logging.log4j.Logger log4jLogger) { this.log4jLogger = log4jLogger; } - private org.apache.logging.log4j.util.Supplier mapSupplier(Supplier msgSupplier) { + private static org.apache.logging.log4j.util.Supplier mapSupplier(Supplier msgSupplier) { return () -> msgSupplier.get(); } diff --git a/server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java index c0ad251e7c2c7..2f2e4367e1930 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java +++ b/server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java @@ -193,7 +193,7 @@ private void registerSetting(Setting setting) { // TODO: remove this hack once we remove the deprecated ability to use repository settings in the cluster state in the S3 snapshot // module - private boolean isS3InsecureCredentials(Setting setting) { + private static boolean isS3InsecureCredentials(Setting setting) { final String settingKey = setting.getKey(); return settingKey.equals("access_key") || settingKey.equals("secret_key"); } diff --git a/server/src/main/java/org/elasticsearch/health/HealthService.java b/server/src/main/java/org/elasticsearch/health/HealthService.java index f4b71247d6291..8f6460e0a5915 100644 --- a/server/src/main/java/org/elasticsearch/health/HealthService.java +++ b/server/src/main/java/org/elasticsearch/health/HealthService.java @@ -182,7 +182,7 @@ private ActionRunnable> calculateFilteredIndicatorsR * @param results The results that the listener will be notified of, if they pass validation * @param listener A listener to be notified of results */ - private void validateResultsAndNotifyListener( + private static void validateResultsAndNotifyListener( @Nullable String indicatorName, List results, ActionListener> listener @@ -203,7 +203,7 @@ assert findDuplicatesByName(results).isEmpty() * @param computeDetails If details should be calculated on which indicators are causing the UNKNOWN state. * @return Details explaining why results are UNKNOWN, or an empty detail set if computeDetails is false. */ - private HealthIndicatorDetails healthUnknownReason(List preflightResults, boolean computeDetails) { + private static HealthIndicatorDetails healthUnknownReason(List preflightResults, boolean computeDetails) { assert preflightResults.isEmpty() == false : "Requires at least one non-GREEN preflight result"; HealthIndicatorDetails unknownDetails; if (computeDetails) { @@ -226,7 +226,7 @@ private HealthIndicatorDetails healthUnknownReason(List p * @param details the details to include on the result * @return A result with the UNKNOWN status */ - private HealthIndicatorResult generateUnknownResult( + private static HealthIndicatorResult generateUnknownResult( HealthIndicatorService indicatorService, String summary, HealthIndicatorDetails details diff --git a/server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java b/server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java index 6577171202169..b5a334e56e94c 100644 --- a/server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java +++ b/server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java @@ -293,7 +293,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - private ByteSizeValue getFreeBytes(ByteSizeValue total, RelativeByteSizeValue watermark, ByteSizeValue maxHeadroom) { + private static ByteSizeValue getFreeBytes(ByteSizeValue total, RelativeByteSizeValue watermark, ByteSizeValue maxHeadroom) { if (watermark.isAbsolute()) { return watermark.getAbsolute(); } @@ -312,7 +312,7 @@ public ByteSizeValue getFreeBytesFrozenFloodStageWatermark(ByteSizeValue total) return getFreeBytes(total, frozenFloodStageWatermark, frozenFloodStageMaxHeadroom); } - private String getThresholdStringRep(RelativeByteSizeValue relativeByteSizeValue) { + private static String getThresholdStringRep(RelativeByteSizeValue relativeByteSizeValue) { if (relativeByteSizeValue.isAbsolute()) { return relativeByteSizeValue.getAbsolute().getStringRep(); } else { diff --git a/server/src/main/java/org/elasticsearch/health/node/DiskHealthIndicatorService.java b/server/src/main/java/org/elasticsearch/health/node/DiskHealthIndicatorService.java index 8dabc6da9dce4..925dae7136914 100644 --- a/server/src/main/java/org/elasticsearch/health/node/DiskHealthIndicatorService.java +++ b/server/src/main/java/org/elasticsearch/health/node/DiskHealthIndicatorService.java @@ -116,7 +116,7 @@ public HealthIndicatorResult calculate(boolean verbose, int maxAffectedResources * not ordinary important, but could be useful in tracking down problems where nodes have stopped reporting health node information. * @param diskHealthInfoMap A map of nodeId to DiskHealthInfo */ - private void logNodesMissingHealthInfo(Map diskHealthInfoMap, ClusterState clusterState) { + private static void logNodesMissingHealthInfo(Map diskHealthInfoMap, ClusterState clusterState) { if (logger.isDebugEnabled()) { String nodesMissingHealthInfo = getSortedUniqueValuesString( clusterState.getNodes().getAllNodes(), @@ -492,7 +492,7 @@ static Diagnosis createNonDataNodeDiagnosis(HealthStatus healthStatus, List> nodes) { + private static int getUnhealthyNodeSize(Map> nodes) { return (nodes.containsKey(HealthStatus.RED) ? nodes.get(HealthStatus.RED).size() : 0) + (nodes.containsKey(HealthStatus.YELLOW) ? nodes.get(HealthStatus.YELLOW).size() : 0); diff --git a/server/src/main/java/org/elasticsearch/health/node/LocalHealthMonitor.java b/server/src/main/java/org/elasticsearch/health/node/LocalHealthMonitor.java index 8d25233a1d6e5..709ac83d65553 100644 --- a/server/src/main/java/org/elasticsearch/health/node/LocalHealthMonitor.java +++ b/server/src/main/java/org/elasticsearch/health/node/LocalHealthMonitor.java @@ -212,7 +212,7 @@ public void clusterChanged(ClusterChangedEvent event) { } } - private boolean hasMasterNodeChanged(DiscoveryNode currentMasterNode, ClusterChangedEvent event) { + private static boolean hasMasterNodeChanged(DiscoveryNode currentMasterNode, ClusterChangedEvent event) { DiscoveryNode previousMasterNode = event.previousState().nodes().getMasterNode(); if (currentMasterNode == null || previousMasterNode == null) { return currentMasterNode != previousMasterNode; diff --git a/server/src/main/java/org/elasticsearch/health/node/action/TransportHealthNodeAction.java b/server/src/main/java/org/elasticsearch/health/node/action/TransportHealthNodeAction.java index 35a5374551da7..18c009deb8840 100644 --- a/server/src/main/java/org/elasticsearch/health/node/action/TransportHealthNodeAction.java +++ b/server/src/main/java/org/elasticsearch/health/node/action/TransportHealthNodeAction.java @@ -152,7 +152,7 @@ public void handleException(final TransportException exception) { } } - private boolean isTaskCancelled(Task task) { + private static boolean isTaskCancelled(Task task) { return (task instanceof CancellableTask t) && t.isCancelled(); } } diff --git a/server/src/main/java/org/elasticsearch/health/node/selection/HealthNodeTaskExecutor.java b/server/src/main/java/org/elasticsearch/health/node/selection/HealthNodeTaskExecutor.java index c52f69d232c87..53941937cbf3c 100644 --- a/server/src/main/java/org/elasticsearch/health/node/selection/HealthNodeTaskExecutor.java +++ b/server/src/main/java/org/elasticsearch/health/node/selection/HealthNodeTaskExecutor.java @@ -185,7 +185,7 @@ void abortTaskIfApplicable(String reason) { } } - private boolean isNodeShuttingDown(ClusterChangedEvent event, String nodeId) { + private static boolean isNodeShuttingDown(ClusterChangedEvent event, String nodeId) { return event.previousState().metadata().nodeShutdowns().contains(nodeId) == false && event.state().metadata().nodeShutdowns().contains(nodeId); } diff --git a/server/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java b/server/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java index c96c0f149a972..8b087f5a302db 100644 --- a/server/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java +++ b/server/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java @@ -244,7 +244,7 @@ public void onStoreClosed(ShardId shardId) { } } - private void callListeners( + private static void callListeners( IndexShard indexShard, Iterator>> iterator, ActionListener outerListener diff --git a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java index 0e71fdca06b0d..df1aca3dc7b53 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java +++ b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java @@ -128,11 +128,11 @@ private boolean isCounterOrGaugeMetricType(String field) { return false; } - private boolean isTimestampField(String field) { + private static boolean isTimestampField(String field) { return "@timestamp".equals(field); } - private boolean isNotSpecialField(String field) { + private static boolean isNotSpecialField(String field) { return field.startsWith("_") == false; } } diff --git a/server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesEncoder.java b/server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesEncoder.java index b4c0f70ad8c99..e3877e65581f2 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesEncoder.java +++ b/server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesEncoder.java @@ -217,20 +217,20 @@ void decode(DataInput in, long[] out) throws IOException { } // this loop should auto-vectorize - private void mul(long[] arr, long m) { + private static void mul(long[] arr, long m) { for (int i = 0; i < ES87TSDBDocValuesFormat.NUMERIC_BLOCK_SIZE; ++i) { arr[i] *= m; } } // this loop should auto-vectorize - private void add(long[] arr, long min) { + private static void add(long[] arr, long min) { for (int i = 0; i < ES87TSDBDocValuesFormat.NUMERIC_BLOCK_SIZE; ++i) { arr[i] += min; } } - private void deltaDecode(long[] arr) { + private static void deltaDecode(long[] arr) { for (int i = 1; i < ES87TSDBDocValuesFormat.NUMERIC_BLOCK_SIZE; ++i) { arr[i] += arr[i - 1]; } diff --git a/server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesProducer.java b/server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesProducer.java index 174c3fbc9f0b9..4c691d84e2b4d 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesProducer.java +++ b/server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesProducer.java @@ -158,13 +158,13 @@ private void readFields(IndexInput meta, FieldInfos infos) throws IOException { } } - private NumericEntry readNumeric(IndexInput meta) throws IOException { + private static NumericEntry readNumeric(IndexInput meta) throws IOException { NumericEntry entry = new NumericEntry(); readNumeric(meta, entry); return entry; } - private void readNumeric(IndexInput meta, NumericEntry entry) throws IOException { + private static void readNumeric(IndexInput meta, NumericEntry entry) throws IOException { entry.docsWithFieldOffset = meta.readLong(); entry.docsWithFieldLength = meta.readLong(); entry.jumpTableEntryCount = meta.readShort(); @@ -184,13 +184,13 @@ private void readNumeric(IndexInput meta, NumericEntry entry) throws IOException } } - private SortedNumericEntry readSortedNumeric(IndexInput meta) throws IOException { + private static SortedNumericEntry readSortedNumeric(IndexInput meta) throws IOException { SortedNumericEntry entry = new SortedNumericEntry(); readSortedNumeric(meta, entry); return entry; } - private SortedNumericEntry readSortedNumeric(IndexInput meta, SortedNumericEntry entry) throws IOException { + private static SortedNumericEntry readSortedNumeric(IndexInput meta, SortedNumericEntry entry) throws IOException { readNumeric(meta, entry); entry.numDocsWithField = meta.readInt(); if (entry.numDocsWithField != entry.numValues) { diff --git a/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java b/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java index 6f5716c880313..1a1e470519213 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java +++ b/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java @@ -271,7 +271,7 @@ private static int indexOfKeptCommits(List commits, long return 0; } - private Set listOfNewFileNames(IndexCommit previous, IndexCommit current) throws IOException { + private static Set listOfNewFileNames(IndexCommit previous, IndexCommit current) throws IOException { final Set previousFiles = previous != null ? new HashSet<>(previous.getFileNames()) : Set.of(); return current.getFileNames().stream().filter(f -> previousFiles.contains(f) == false).collect(Collectors.toUnmodifiableSet()); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java index 4cc5e41d86f0c..f97817570838c 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -443,7 +443,7 @@ public Query geoShapeQuery(SearchExecutionContext context, String fieldName, Sha return query; } - private boolean isPointGeometry(LatLonGeometry[] geometries) { + private static boolean isPointGeometry(LatLonGeometry[] geometries) { return geometries.length == 1 && geometries[0] instanceof org.apache.lucene.geo.Point; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IgnoreMalformedStoredValues.java b/server/src/main/java/org/elasticsearch/index/mapper/IgnoreMalformedStoredValues.java index 691d0a3f6c4d0..f9e2c55e5085a 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IgnoreMalformedStoredValues.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IgnoreMalformedStoredValues.java @@ -145,7 +145,7 @@ public void write(XContentBuilder b) throws IOException { values = emptyList(); } - private void decodeAndWrite(XContentBuilder b, BytesRef r) throws IOException { + private static void decodeAndWrite(XContentBuilder b, BytesRef r) throws IOException { switch (r.bytes[r.offset]) { case 'b': b.value(r.bytes, r.offset + 1, r.length - 1); @@ -189,7 +189,7 @@ private void decodeAndWrite(XContentBuilder b, BytesRef r) throws IOException { } } - private void decodeAndWriteXContent(XContentBuilder b, XContentType type, BytesRef r) throws IOException { + private static void decodeAndWriteXContent(XContentBuilder b, XContentType type, BytesRef r) throws IOException { BytesReference ref = new BytesArray(r.bytes, r.offset + 1, r.length - 1); try (XContentParser parser = type.xContent().createParser(XContentParserConfiguration.EMPTY, ref.streamInput())) { b.copyCurrentStructure(parser); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java index 07dab213c13bb..70f4d2d901b45 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java @@ -382,7 +382,7 @@ private TextFieldType buildFieldType( return ft; } - private KeywordFieldMapper.KeywordFieldType syntheticSourceDelegate(FieldType fieldType, MultiFields multiFields) { + private static KeywordFieldMapper.KeywordFieldType syntheticSourceDelegate(FieldType fieldType, MultiFields multiFields) { if (fieldType.stored()) { return null; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSyntheticWriterHelper.java b/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSyntheticWriterHelper.java index 7dc32901be0e0..a79b37796bbe9 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSyntheticWriterHelper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSyntheticWriterHelper.java @@ -252,7 +252,7 @@ void write(final XContentBuilder b) throws IOException { } } - private void writeObject( + private static void writeObject( final XContentBuilder b, final KeyValue currKeyValue, final KeyValue nextKeyValue, diff --git a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java index 06c0a8f6d494b..deb178ff724bb 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java @@ -591,7 +591,7 @@ void checkNanAndInfinite(float[] vector) { } } - StringBuilder appendErrorElements(StringBuilder errorBuilder, float[] vector) { + static StringBuilder appendErrorElements(StringBuilder errorBuilder, float[] vector) { // Include the first five elements of the invalid vector in the error message errorBuilder.append(" Preview of invalid vector: ["); for (int i = 0; i < Math.min(5, vector.length); i++) { @@ -607,7 +607,7 @@ StringBuilder appendErrorElements(StringBuilder errorBuilder, float[] vector) { return errorBuilder; } - StringBuilder appendErrorElements(StringBuilder errorBuilder, byte[] vector) { + static StringBuilder appendErrorElements(StringBuilder errorBuilder, byte[] vector) { // Include the first five elements of the invalid vector in the error message errorBuilder.append(" Preview of invalid vector: ["); for (int i = 0; i < Math.min(5, vector.length); i++) { @@ -623,11 +623,11 @@ StringBuilder appendErrorElements(StringBuilder errorBuilder, byte[] vector) { return errorBuilder; } - Function errorFloatElementsAppender(float[] vector) { + static Function errorFloatElementsAppender(float[] vector) { return sb -> appendErrorElements(sb, vector); } - Function errorByteElementsAppender(byte[] vector) { + static Function errorByteElementsAppender(byte[] vector) { return sb -> appendErrorElements(sb, vector); } } @@ -851,7 +851,7 @@ public Query createKnnQuery( if (similarity == VectorSimilarity.DOT_PRODUCT || similarity == VectorSimilarity.COSINE) { float squaredMagnitude = VectorUtil.dotProduct(queryVector, queryVector); - elementType.checkVectorMagnitude(similarity, elementType.errorByteElementsAppender(queryVector), squaredMagnitude); + elementType.checkVectorMagnitude(similarity, ElementType.errorByteElementsAppender(queryVector), squaredMagnitude); } Query knnQuery = parentFilter != null ? new DiversifyingChildrenByteKnnVectorQuery(name(), queryVector, filter, numCands, parentFilter) @@ -888,7 +888,7 @@ public Query createKnnQuery( if (similarity == VectorSimilarity.DOT_PRODUCT || similarity == VectorSimilarity.COSINE) { float squaredMagnitude = VectorUtil.dotProduct(queryVector, queryVector); - elementType.checkVectorMagnitude(similarity, elementType.errorFloatElementsAppender(queryVector), squaredMagnitude); + elementType.checkVectorMagnitude(similarity, ElementType.errorFloatElementsAppender(queryVector), squaredMagnitude); } Query knnQuery = switch (elementType) { case BYTE -> { diff --git a/server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java index ac67c3c95719c..a19e02ea91cfb 100644 --- a/server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java @@ -121,7 +121,7 @@ protected AbstractGeometryQueryBuilder(String fieldName, Geometry shape, String this.supplier = null; } - private void checkGeometry(Geometry geometry) { + private static void checkGeometry(Geometry geometry) { // linear ring geometries are not serializable, fail at construction time. if (geometry.type() == ShapeType.LINEARRING) { throw new IllegalArgumentException("[" + ShapeType.LINEARRING + "] geometries are not supported"); diff --git a/server/src/main/java/org/elasticsearch/indices/analysis/wrappers/StableApiWrappers.java b/server/src/main/java/org/elasticsearch/indices/analysis/wrappers/StableApiWrappers.java index e3d4b02c52ee7..86304f1a5b362 100644 --- a/server/src/main/java/org/elasticsearch/indices/analysis/wrappers/StableApiWrappers.java +++ b/server/src/main/java/org/elasticsearch/indices/analysis/wrappers/StableApiWrappers.java @@ -136,7 +136,7 @@ public org.elasticsearch.index.analysis.AnalysisMode getAnalysisMode() { return mapAnalysisMode(f.getAnalysisMode()); } - private org.elasticsearch.index.analysis.AnalysisMode mapAnalysisMode(AnalysisMode analysisMode) { + private static org.elasticsearch.index.analysis.AnalysisMode mapAnalysisMode(AnalysisMode analysisMode) { return org.elasticsearch.index.analysis.AnalysisMode.valueOf(analysisMode.name()); } }; diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestService.java b/server/src/main/java/org/elasticsearch/ingest/IngestService.java index 3db40ef018f98..cbc985ea4215c 100644 --- a/server/src/main/java/org/elasticsearch/ingest/IngestService.java +++ b/server/src/main/java/org/elasticsearch/ingest/IngestService.java @@ -941,7 +941,7 @@ private void executePipelines( } } - private void executePipeline( + private static void executePipeline( final IngestDocument ingestDocument, final Pipeline pipeline, final BiConsumer handler diff --git a/server/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java index 59f914d27382d..1b970fc3283db 100644 --- a/server/src/main/java/org/elasticsearch/node/Node.java +++ b/server/src/main/java/org/elasticsearch/node/Node.java @@ -1298,7 +1298,7 @@ private static ReloadablePlugin wrapPlugins(List reloadablePlu }; } - private TelemetryProvider getTelemetryProvider(PluginsService pluginsService, Settings settings) { + private static TelemetryProvider getTelemetryProvider(PluginsService pluginsService, Settings settings) { final List telemetryPlugins = pluginsService.filterPlugins(TelemetryPlugin.class); if (telemetryPlugins.size() > 1) { @@ -1329,7 +1329,7 @@ private HealthService createHealthService( return new HealthService(concatLists(serverHealthIndicatorServices, pluginHealthIndicatorServices), threadPool); } - private HealthPeriodicLogger createHealthPeriodicLogger( + private static HealthPeriodicLogger createHealthPeriodicLogger( ClusterService clusterService, Settings settings, NodeClient client, diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginIntrospector.java b/server/src/main/java/org/elasticsearch/plugins/PluginIntrospector.java index 92a58a809c59d..8b7e4faa1f226 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginIntrospector.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginIntrospector.java @@ -111,7 +111,7 @@ Map deprecatedMethods(final Class pluginClass) { // finds the subset of given methods that are overridden by the given class // returns a map of method name to interface name the method was declared in - private Map findOverriddenMethods(final Class pluginClass, Map, List> methodsMap) { + private static Map findOverriddenMethods(final Class pluginClass, Map, List> methodsMap) { assert Plugin.class.isAssignableFrom(pluginClass); List> clazzes = Stream.concat(Stream.of(Plugin.class), interfaceClasses(pluginClass, methodsMap::containsKey)).toList(); if (clazzes.isEmpty()) { diff --git a/server/src/main/java/org/elasticsearch/plugins/scanners/NamedComponentReader.java b/server/src/main/java/org/elasticsearch/plugins/scanners/NamedComponentReader.java index 609a7b104f271..e007cac442f89 100644 --- a/server/src/main/java/org/elasticsearch/plugins/scanners/NamedComponentReader.java +++ b/server/src/main/java/org/elasticsearch/plugins/scanners/NamedComponentReader.java @@ -72,7 +72,7 @@ Map findNamedComponents(Path pluginDir, ClassLoader pl return emptyMap(); } - private Path findNamedComponentCacheFile(Path pluginDir) throws IOException { + private static Path findNamedComponentCacheFile(Path pluginDir) throws IOException { try (Stream list = Files.list(pluginDir)) { return list.filter(p -> p.getFileName().toString().equals(NAMED_COMPONENTS_FILE_NAME)).findFirst().orElse(null); } diff --git a/server/src/main/java/org/elasticsearch/reservedstate/action/ReservedClusterSettingsAction.java b/server/src/main/java/org/elasticsearch/reservedstate/action/ReservedClusterSettingsAction.java index e34830dc3b355..5bead071cb4b6 100644 --- a/server/src/main/java/org/elasticsearch/reservedstate/action/ReservedClusterSettingsAction.java +++ b/server/src/main/java/org/elasticsearch/reservedstate/action/ReservedClusterSettingsAction.java @@ -48,7 +48,7 @@ public String name() { } @SuppressWarnings("unchecked") - private ClusterUpdateSettingsRequest prepare(Object input, Set previouslySet) { + private static ClusterUpdateSettingsRequest prepare(Object input, Set previouslySet) { // load the new settings into a builder so their paths are normalized @SuppressWarnings("unchecked") Settings.Builder newSettings = Settings.builder().loadFromMap((Map) input); diff --git a/server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java b/server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java index 6677b17b9f810..e780b36568190 100644 --- a/server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java +++ b/server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java @@ -124,7 +124,7 @@ protected void processFileChanges() throws ExecutionException, InterruptedExcept completion.get(); } - private void completeProcessing(Exception e, PlainActionFuture completion) { + private static void completeProcessing(Exception e, PlainActionFuture completion) { if (e != null) { completion.onFailure(e); } else { diff --git a/server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java b/server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java index 51102504e9dc2..3adf32454cc20 100644 --- a/server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java +++ b/server/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java @@ -344,7 +344,7 @@ TrialRunResult trialRun( * * Package private for testing */ - void executeNonStateTransformationSteps( + static void executeNonStateTransformationSteps( List>> nonStateTransforms, ActionListener> listener ) { diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java index 5f9be1acf4537..189bd9c2b9551 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java @@ -61,7 +61,7 @@ public String getName() { return "cluster_get_settings_action"; } - private void setUpRequestParams(MasterNodeReadRequest clusterRequest, RestRequest request) { + private static void setUpRequestParams(MasterNodeReadRequest clusterRequest, RestRequest request) { clusterRequest.local(request.paramAsBoolean("local", clusterRequest.local())); clusterRequest.masterNodeTimeout(request.paramAsTime("master_timeout", clusterRequest.masterNodeTimeout())); } diff --git a/server/src/main/java/org/elasticsearch/script/field/vectors/ByteBinaryDenseVector.java b/server/src/main/java/org/elasticsearch/script/field/vectors/ByteBinaryDenseVector.java index 9d031267d61f3..a986b62ce8496 100644 --- a/server/src/main/java/org/elasticsearch/script/field/vectors/ByteBinaryDenseVector.java +++ b/server/src/main/java/org/elasticsearch/script/field/vectors/ByteBinaryDenseVector.java @@ -73,7 +73,7 @@ public double dotProduct(List queryVector) { } @SuppressForbidden(reason = "used only for bytes so it cannot overflow") - private int abs(int value) { + private static int abs(int value) { return Math.abs(value); } diff --git a/server/src/main/java/org/elasticsearch/script/field/vectors/ByteKnnDenseVector.java b/server/src/main/java/org/elasticsearch/script/field/vectors/ByteKnnDenseVector.java index d982a94148516..b00b6703872ab 100644 --- a/server/src/main/java/org/elasticsearch/script/field/vectors/ByteKnnDenseVector.java +++ b/server/src/main/java/org/elasticsearch/script/field/vectors/ByteKnnDenseVector.java @@ -70,7 +70,7 @@ public double dotProduct(List queryVector) { } @SuppressForbidden(reason = "used only for bytes so it cannot overflow") - private int abs(int value) { + private static int abs(int value) { return Math.abs(value); } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalHDRPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalHDRPercentiles.java index ee81039569f92..9b4656ee7cf7e 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalHDRPercentiles.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalHDRPercentiles.java @@ -180,7 +180,7 @@ public AbstractInternalHDRPercentiles reduce(List aggregati * @param histogram2 The second histogram to merge * @return One of the input histograms such that the one with higher numberOfSignificantValueDigits is used as the one for merging */ - private DoubleHistogram merge(final DoubleHistogram histogram1, final DoubleHistogram histogram2) { + private static DoubleHistogram merge(final DoubleHistogram histogram1, final DoubleHistogram histogram2) { DoubleHistogram moreDigits = histogram1; DoubleHistogram lessDigits = histogram2; if (histogram2.getNumberOfSignificantValueDigits() > histogram1.getNumberOfSignificantValueDigits()) { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalTDigestPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalTDigestPercentiles.java index 0faa01c8c4410..08588473c61d1 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalTDigestPercentiles.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractInternalTDigestPercentiles.java @@ -159,7 +159,7 @@ public AbstractInternalTDigestPercentiles reduce(List aggre * @param digest2 The second histogram to merge * @return One of the input histograms such that the one with larger compression is used as the one for merging */ - private TDigestState merge(final TDigestState digest1, final TDigestState digest2) { + private static TDigestState merge(final TDigestState digest1, final TDigestState digest2) { TDigestState largerCompression = digest1; TDigestState smallerCompression = digest2; if (digest2.compression() > digest1.compression()) { diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java index eb199752f6fed..66ccae1746197 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java +++ b/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java @@ -171,7 +171,7 @@ private static Timer maybeStartTimer(DfsProfiler profiler, DfsTimingType dtt) { return null; }; - private void executeKnnVectorQuery(SearchContext context) throws IOException { + private static void executeKnnVectorQuery(SearchContext context) throws IOException { SearchSourceBuilder source = context.request().source(); if (source == null || source.knnSearch().isEmpty()) { return; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/StoredFieldSourceProvider.java b/server/src/main/java/org/elasticsearch/search/lookup/StoredFieldSourceProvider.java index 7db23b8823382..7516ab93f75a5 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/StoredFieldSourceProvider.java +++ b/server/src/main/java/org/elasticsearch/search/lookup/StoredFieldSourceProvider.java @@ -38,7 +38,7 @@ public Source getSource(LeafReaderContext ctx, int doc) throws IOException { return leaves[ctx.ord].getSource(doc); } - private IndexReaderContext findParentContext(LeafReaderContext ctx) { + private static IndexReaderContext findParentContext(LeafReaderContext ctx) { if (ctx.parent != null) { return ctx.parent; } diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java index 4ecb33a907f1e..13ca1d3dc1db2 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java @@ -100,7 +100,7 @@ protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws return super.doRewrite(queryRewriteContext); } - private int[] findSegmentStarts(IndexReader reader, int[] docs) { + private static int[] findSegmentStarts(IndexReader reader, int[] docs) { int[] starts = new int[reader.leaves().size() + 1]; starts[starts.length - 1] = docs.length; if (starts.length == 2) { diff --git a/server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java b/server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java index 35655f6260461..e1f6e561a047f 100644 --- a/server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java +++ b/server/src/main/java/org/elasticsearch/transport/ProxyConnectionStrategy.java @@ -271,7 +271,7 @@ public void onFailure(Exception e) { if (countDown.countDown()) { if (attemptNumber >= MAX_CONNECT_ATTEMPTS_PER_RUN && connectionManager.size() == 0) { logger.warn(() -> "failed to open any proxy connections to cluster [" + clusterAlias + "]", e); - if (exceptions.values().stream().allMatch(ProxyConnectionStrategy.this::isRetryableException)) { + if (exceptions.values().stream().allMatch(RemoteConnectionStrategy::isRetryableException)) { finished.onFailure(getNoSeedNodeLeftException(exceptions.values())); } else { exceptions.values().stream().filter(e1 -> e1 != e).forEach(e::addSuppressed); diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java index 802b703494792..32cd3fadad0a8 100644 --- a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java +++ b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java @@ -383,7 +383,7 @@ boolean assertNoRunningConnections() { protected abstract RemoteConnectionInfo.ModeInfo getModeInfo(); - protected boolean isRetryableException(Exception e) { + protected static boolean isRetryableException(Exception e) { // ISE if we fail the handshake with a version incompatible node return e instanceof ConnectTransportException || e instanceof IOException || e instanceof IllegalStateException; } diff --git a/server/src/main/java/org/elasticsearch/upgrades/MigrationResultsUpdateTask.java b/server/src/main/java/org/elasticsearch/upgrades/MigrationResultsUpdateTask.java index b7fc51ead8cf5..7db4c7b8da651 100644 --- a/server/src/main/java/org/elasticsearch/upgrades/MigrationResultsUpdateTask.java +++ b/server/src/main/java/org/elasticsearch/upgrades/MigrationResultsUpdateTask.java @@ -61,7 +61,7 @@ public void submit(ClusterService clusterService) { } @SuppressForbidden(reason = "legacy usage of unbatched task") // TODO add support for batching here - private void submitUnbatchedTask( + private static void submitUnbatchedTask( ClusterService clusterService, @SuppressWarnings("SameParameterValue") String source, ClusterStateUpdateTask task diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java index 72dca43ce796b..d6df8e26721c0 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java @@ -19,8 +19,6 @@ public class LinearizabilityCheckerTests extends ESTestCase { - final LinearizabilityChecker checker = new LinearizabilityChecker(); - /** * Simple specification of a lock that can be exactly locked once. There is no unlocking. * Input is always null (and represents lock acquisition), output is a boolean whether lock was acquired. @@ -66,7 +64,7 @@ public void testLockWithLinearizableHistory1() { history.respond(call0, true); // 0: lock acquisition succeeded int call1 = history.invoke(null); // 1: acquire lock history.respond(call1, false); // 0: lock acquisition failed - assertTrue(checker.isLinearizable(lockSpec, history)); + assertTrue(LinearizabilityChecker.isLinearizable(lockSpec, history)); } public void testLockWithLinearizableHistory2() { @@ -75,7 +73,7 @@ public void testLockWithLinearizableHistory2() { int call1 = history.invoke(null); // 1: acquire lock history.respond(call0, false); // 0: lock acquisition failed history.respond(call1, true); // 0: lock acquisition succeeded - assertTrue(checker.isLinearizable(lockSpec, history)); + assertTrue(LinearizabilityChecker.isLinearizable(lockSpec, history)); } public void testLockWithLinearizableHistory3() { @@ -84,7 +82,7 @@ public void testLockWithLinearizableHistory3() { int call1 = history.invoke(null); // 1: acquire lock history.respond(call0, true); // 0: lock acquisition succeeded history.respond(call1, false); // 0: lock acquisition failed - assertTrue(checker.isLinearizable(lockSpec, history)); + assertTrue(LinearizabilityChecker.isLinearizable(lockSpec, history)); } public void testLockWithNonLinearizableHistory() { @@ -93,7 +91,7 @@ public void testLockWithNonLinearizableHistory() { history.respond(call0, false); // 0: lock acquisition failed int call1 = history.invoke(null); // 1: acquire lock history.respond(call1, true); // 0: lock acquisition succeeded - assertFalse(checker.isLinearizable(lockSpec, history)); + assertFalse(LinearizabilityChecker.isLinearizable(lockSpec, history)); } /** @@ -137,11 +135,11 @@ public void testRegisterWithLinearizableHistory() { history.respond(call2, 0); // 2: read returns 0 history.respond(call1, 42); // 1: read returns 42 - expectThrows(IllegalArgumentException.class, () -> checker.isLinearizable(registerSpec, history)); - assertTrue(checker.isLinearizable(registerSpec, history, i -> null)); + expectThrows(IllegalArgumentException.class, () -> LinearizabilityChecker.isLinearizable(registerSpec, history)); + assertTrue(LinearizabilityChecker.isLinearizable(registerSpec, history, i -> null)); history.respond(call0, null); // 0: write returns - assertTrue(checker.isLinearizable(registerSpec, history)); + assertTrue(LinearizabilityChecker.isLinearizable(registerSpec, history)); } public void testRegisterWithNonLinearizableHistory() { @@ -152,11 +150,11 @@ public void testRegisterWithNonLinearizableHistory() { int call2 = history.invoke(null); // 2: invoke read history.respond(call2, 0); // 2: read returns 0, not allowed - expectThrows(IllegalArgumentException.class, () -> checker.isLinearizable(registerSpec, history)); - assertFalse(checker.isLinearizable(registerSpec, history, i -> null)); + expectThrows(IllegalArgumentException.class, () -> LinearizabilityChecker.isLinearizable(registerSpec, history)); + assertFalse(LinearizabilityChecker.isLinearizable(registerSpec, history, i -> null)); history.respond(call0, null); // 0: write returns - assertFalse(checker.isLinearizable(registerSpec, history)); + assertFalse(LinearizabilityChecker.isLinearizable(registerSpec, history)); } public void testRegisterObservedSequenceOfUpdatesWitLinearizableHistory() { @@ -173,7 +171,7 @@ public void testRegisterObservedSequenceOfUpdatesWitLinearizableHistory() { history.respond(call0, null); // 0: write returns history.respond(call1, null); // 1: write returns - assertTrue(checker.isLinearizable(registerSpec, history)); + assertTrue(LinearizabilityChecker.isLinearizable(registerSpec, history)); } public void testRegisterObservedSequenceOfUpdatesWithNonLinearizableHistory() { @@ -190,7 +188,7 @@ public void testRegisterObservedSequenceOfUpdatesWithNonLinearizableHistory() { history.respond(call0, null); // 0: write returns history.respond(call1, null); // 1: write returns - assertFalse(checker.isLinearizable(registerSpec, history)); + assertFalse(LinearizabilityChecker.isLinearizable(registerSpec, history)); } final SequentialSpec multiRegisterSpec = new KeyedSpec() { @@ -229,12 +227,12 @@ public void testMultiRegisterWithLinearizableHistory() { history.respond(callY1, 42); // 1: read returns 42 on key y history.respond(callX1, 42); // 1: read returns 42 on key x - expectThrows(IllegalArgumentException.class, () -> checker.isLinearizable(multiRegisterSpec, history)); - assertTrue(checker.isLinearizable(multiRegisterSpec, history, i -> null)); + expectThrows(IllegalArgumentException.class, () -> LinearizabilityChecker.isLinearizable(multiRegisterSpec, history)); + assertTrue(LinearizabilityChecker.isLinearizable(multiRegisterSpec, history, i -> null)); history.respond(callX0, null); // 0: write returns on key x history.respond(callY0, null); // 0: write returns on key y - assertTrue(checker.isLinearizable(multiRegisterSpec, history)); + assertTrue(LinearizabilityChecker.isLinearizable(multiRegisterSpec, history)); } public void testMultiRegisterWithNonLinearizableHistory() { @@ -250,11 +248,11 @@ public void testMultiRegisterWithNonLinearizableHistory() { history.respond(callY2, 0); // 2: read returns 0 on key y, not allowed history.respond(callX1, 42); // 1: read returns 42 on key x - expectThrows(IllegalArgumentException.class, () -> checker.isLinearizable(multiRegisterSpec, history)); - assertFalse(checker.isLinearizable(multiRegisterSpec, history, i -> null)); + expectThrows(IllegalArgumentException.class, () -> LinearizabilityChecker.isLinearizable(multiRegisterSpec, history)); + assertFalse(LinearizabilityChecker.isLinearizable(multiRegisterSpec, history, i -> null)); history.respond(callX0, null); // 0: write returns on key x history.respond(callY0, null); // 0: write returns on key y - assertFalse(checker.isLinearizable(multiRegisterSpec, history)); + assertFalse(LinearizabilityChecker.isLinearizable(multiRegisterSpec, history)); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java index 993146362acad..014834e98600a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java @@ -2334,14 +2334,14 @@ public void testV2TemplateOverlaps() throws Exception { ); // when validating is false, we return the conflicts instead of throwing an exception - var overlaps = metadataIndexTemplateService.v2TemplateOverlaps(state, "foo2", newTemplate, false); + var overlaps = MetadataIndexTemplateService.v2TemplateOverlaps(state, "foo2", newTemplate, false); assertThat(overlaps, allOf(aMapWithSize(1), hasKey("foo"))); // try now the same thing with validation on IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> metadataIndexTemplateService.v2TemplateOverlaps(state, "foo2", newTemplate, true) + () -> MetadataIndexTemplateService.v2TemplateOverlaps(state, "foo2", newTemplate, true) ); assertThat( e.getMessage(), @@ -2363,7 +2363,7 @@ public void testV2TemplateOverlaps() throws Exception { null ); - overlaps = metadataIndexTemplateService.v2TemplateOverlaps(state, "no-conflict", nonConflict, true); + overlaps = MetadataIndexTemplateService.v2TemplateOverlaps(state, "no-conflict", nonConflict, true); assertTrue(overlaps.isEmpty()); } @@ -2392,7 +2392,7 @@ public void testV2TemplateOverlaps() throws Exception { ); IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> metadataIndexTemplateService.v2TemplateOverlaps(state, "foo2", newTemplate, true) + () -> MetadataIndexTemplateService.v2TemplateOverlaps(state, "foo2", newTemplate, true) ); assertThat( e.getMessage(), diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java index bfdef69a5275a..b758d32d6149f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java @@ -131,17 +131,17 @@ public void testHasVisibleAliases() { .build(); // non-system indices should not require update - assertThat(service.hasVisibleAlias(nonSystemHiddenAlias), equalTo(false)); + assertThat(SystemIndexMetadataUpgradeService.hasVisibleAlias(nonSystemHiddenAlias), equalTo(false)); assertThat(service.requiresUpdate(nonSystemHiddenAlias), equalTo(false)); - assertThat(service.hasVisibleAlias(nonSystemVisibleAlias), equalTo(true)); + assertThat(SystemIndexMetadataUpgradeService.hasVisibleAlias(nonSystemVisibleAlias), equalTo(true)); assertThat(service.requiresUpdate(nonSystemVisibleAlias), equalTo(false)); // hidden system alias should not require update - assertThat(service.hasVisibleAlias(systemHiddenAlias), equalTo(false)); + assertThat(SystemIndexMetadataUpgradeService.hasVisibleAlias(systemHiddenAlias), equalTo(false)); assertThat(service.requiresUpdate(systemHiddenAlias), equalTo(false)); // visible system alias should require update - assertThat(service.hasVisibleAlias(systemVisibleAlias), equalTo(true)); + assertThat(SystemIndexMetadataUpgradeService.hasVisibleAlias(systemVisibleAlias), equalTo(true)); assertThat(service.requiresUpdate(systemVisibleAlias), equalTo(true)); } @@ -195,17 +195,17 @@ public void testIsVisible() { .build(); // non-system indices should not require update - assertThat(service.isVisible(nonSystemHiddenIndex), equalTo(false)); + assertThat(SystemIndexMetadataUpgradeService.isVisible(nonSystemHiddenIndex), equalTo(false)); assertThat(service.requiresUpdate(nonSystemHiddenIndex), equalTo(false)); - assertThat(service.isVisible(nonSystemVisibleIndex), equalTo(true)); + assertThat(SystemIndexMetadataUpgradeService.isVisible(nonSystemVisibleIndex), equalTo(true)); assertThat(service.requiresUpdate(nonSystemVisibleIndex), equalTo(false)); // hidden system index should not require update - assertThat(service.isVisible(systemHiddenIndex), equalTo(false)); + assertThat(SystemIndexMetadataUpgradeService.isVisible(systemHiddenIndex), equalTo(false)); assertThat(service.requiresUpdate(systemHiddenIndex), equalTo(false)); // visible system index should require update - assertThat(service.isVisible(systemVisibleIndex), equalTo(true)); + assertThat(SystemIndexMetadataUpgradeService.isVisible(systemVisibleIndex), equalTo(true)); assertThat(service.requiresUpdate(systemVisibleIndex), equalTo(true)); } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java index e05be91c651c1..cd04f81f0f355 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java @@ -34,7 +34,7 @@ public class DynamicMappingTests extends MapperServiceTestCase { - private XContentBuilder dynamicMapping(String dynamicValue, CheckedConsumer buildFields) + private static XContentBuilder dynamicMapping(String dynamicValue, CheckedConsumer buildFields) throws IOException { return topMapping(b -> { b.field("dynamic", dynamicValue); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapperTests.java index f7bac4f303e5a..07c224fc561d1 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapperTests.java @@ -58,7 +58,8 @@ private DocumentMapper createDocumentMapper(String routingPath, XContentBuilder ).documentMapper(); } - private ParsedDocument parseDocument(DocumentMapper docMapper, CheckedConsumer f) throws IOException { + private static ParsedDocument parseDocument(DocumentMapper docMapper, CheckedConsumer f) + throws IOException { // Add the @timestamp field required by DataStreamTimestampFieldMapper for all time series indices return docMapper.parse(source(null, b -> { f.accept(b); @@ -66,7 +67,7 @@ private ParsedDocument parseDocument(DocumentMapper docMapper, CheckedConsumer f) throws IOException { + private static BytesRef parseAndGetTsid(DocumentMapper docMapper, CheckedConsumer f) throws IOException { return parseDocument(docMapper, f).rootDoc().getBinaryValue(TimeSeriesIdFieldMapper.NAME); } diff --git a/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java index 4896f118a1327..1540d3223ae72 100644 --- a/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java +++ b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java @@ -146,11 +146,11 @@ public void testResetRecovery() throws Exception { } } - long startRecovery(RecoveriesCollection collection, DiscoveryNode sourceNode, IndexShard shard) { + static long startRecovery(RecoveriesCollection collection, DiscoveryNode sourceNode, IndexShard shard) { return startRecovery(collection, sourceNode, shard, listener, TimeValue.timeValueMinutes(60)); } - long startRecovery( + static long startRecovery( RecoveriesCollection collection, DiscoveryNode sourceNode, IndexShard indexShard, diff --git a/server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java b/server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java index f280e0556ae72..e8f5a71ad6fcb 100644 --- a/server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java @@ -641,7 +641,7 @@ public Map fromXContent(XContentParser parser) throws IOExceptio ); assertEquals(count, trialRunResult.nonStateTransforms().size()); - controller.executeNonStateTransformationSteps(trialRunResult.nonStateTransforms(), new ActionListener<>() { + ReservedClusterStateService.executeNonStateTransformationSteps(trialRunResult.nonStateTransforms(), new ActionListener<>() { @Override public void onResponse(Collection nonStateTransformResults) { assertEquals(count, nonStateTransformResults.size()); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceTypeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceTypeTests.java index 2c8c6965152a0..07f41f2ae788b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceTypeTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceTypeTests.java @@ -143,7 +143,7 @@ private MapperService dateMapperService() throws IOException { return createMapperService(fieldMapping(b -> b.field("type", "date"))); } - private List docsWithDatesBetween(long min, long max) throws IOException { + private static List docsWithDatesBetween(long min, long max) throws IOException { return List.of(source(b -> b.field("field", min)), source(b -> b.field("field", max))); } } diff --git a/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java b/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java index 27da5ff17af2d..964cb178b386f 100644 --- a/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java +++ b/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java @@ -275,7 +275,7 @@ public Map blobs() { return blobs; } - private String httpServerUrl(final HttpExchange exchange) { + private static String httpServerUrl(final HttpExchange exchange) { return "http://" + exchange.getRequestHeaders().get("HOST").get(0); } diff --git a/test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpFixtureWithEC2.java b/test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpFixtureWithEC2.java index 8e9ddbd7d8189..05b931817fea4 100644 --- a/test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpFixtureWithEC2.java +++ b/test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpFixtureWithEC2.java @@ -65,7 +65,7 @@ protected HttpHandler createHandler(final String[] args) { }; } - protected String buildCredentialResponse(final String ec2AccessKey, final String ec2SessionToken) { + protected static String buildCredentialResponse(final String ec2AccessKey, final String ec2SessionToken) { return String.format(Locale.ROOT, """ { "AccessKeyId": "%s", diff --git a/test/framework/src/integTest/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java b/test/framework/src/integTest/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java index eb82f8b60c6fb..6d4fe25705688 100644 --- a/test/framework/src/integTest/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java +++ b/test/framework/src/integTest/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java @@ -144,7 +144,7 @@ public void testTransportRespondsEventually() throws InterruptedException { assertEquals("All requests must respond, requests: " + requests, 0, latch.getCount()); } - private Tuple findDisruptedPair(NetworkDisruption.DisruptedLinks disruptedLinks) { + private static Tuple findDisruptedPair(NetworkDisruption.DisruptedLinks disruptedLinks) { Optional> disruptedPair = disruptedLinks.nodes() .stream() .flatMap(n1 -> disruptedLinks.nodes().stream().map(n2 -> Tuple.tuple(n1, n2))) @@ -161,7 +161,7 @@ private Tuple findDisruptedPair(NetworkDisru return disruptedPair.get(); } - private void sendRequest(TransportService source, TransportService target, CountDownLatch latch) { + private static void sendRequest(TransportService source, TransportService target, CountDownLatch latch) { source.sendRequest(target.getLocalNode(), ClusterHealthAction.NAME, new ClusterHealthRequest(), new TransportResponseHandler<>() { private AtomicBoolean responded = new AtomicBoolean(); diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java index f93cc91602b34..57523d4a47e0b 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java @@ -278,7 +278,6 @@ public class Cluster implements Releasable { private final Set blackholedNodes = new HashSet<>(); private final Set> blackholedConnections = new HashSet<>(); private final Map committedStatesByVersion = new HashMap<>(); - private final LinearizabilityChecker linearizabilityChecker = new LinearizabilityChecker(); private final History history = new History(); private final CountingPageCacheRecycler countingPageCacheRecycler; private final Recycler recycler; @@ -757,7 +756,7 @@ private void stabilise(long stabilisationDurationMillis, boolean expectIdleJoinV if (history.size() > 300) { scheduler.schedule(() -> abort.set(true), 10, TimeUnit.SECONDS); } - final boolean linearizable = linearizabilityChecker.isLinearizable(spec, history, i -> null, abort::get); + final boolean linearizable = LinearizabilityChecker.isLinearizable(spec, history, i -> null, abort::get); if (abort.get() == false) { assertTrue("history not linearizable: " + history, linearizable); } diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/LinearizabilityChecker.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/LinearizabilityChecker.java index 042a59179a751..ceca88ef7573e 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/LinearizabilityChecker.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/LinearizabilityChecker.java @@ -214,7 +214,7 @@ public String toString() { * @param missingResponseGenerator used to complete the history with missing responses * @return true iff the history is linearizable w.r.t. the given spec */ - public boolean isLinearizable(SequentialSpec spec, History history, Function missingResponseGenerator) { + public static boolean isLinearizable(SequentialSpec spec, History history, Function missingResponseGenerator) { return isLinearizable(spec, history, missingResponseGenerator, () -> false); } @@ -227,7 +227,7 @@ public boolean isLinearizable(SequentialSpec spec, History history, Function missingResponseGenerator, @@ -239,7 +239,7 @@ public boolean isLinearizable( return partitions.stream().allMatch(h -> isLinearizable(spec, h, terminateEarly)); } - private boolean isLinearizable(SequentialSpec spec, List history, BooleanSupplier terminateEarly) { + private static boolean isLinearizable(SequentialSpec spec, List history, BooleanSupplier terminateEarly) { logger.debug("Checking history of size: {}: {}", history.size(), history); Object state = spec.initialState(); // the current state of the datatype final FixedBitSet linearized = new FixedBitSet(history.size() / 2); // the linearized prefix of the history @@ -290,7 +290,7 @@ private boolean isLinearizable(SequentialSpec spec, List history, Boolean /** * Convenience method for {@link #isLinearizable(SequentialSpec, History, Function)} that requires the history to be complete */ - public boolean isLinearizable(SequentialSpec spec, History history) { + public static boolean isLinearizable(SequentialSpec spec, History history) { return isLinearizable(spec, history, o -> { throw new IllegalArgumentException("history is not complete"); }); } diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/metadata/DataStreamTestHelper.java b/test/framework/src/main/java/org/elasticsearch/cluster/metadata/DataStreamTestHelper.java index 8c60045b13ede..825325c00a70b 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/metadata/DataStreamTestHelper.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/metadata/DataStreamTestHelper.java @@ -455,11 +455,11 @@ public void describeTo(Description description) { .appendValue(generation); } - private String parseDataStreamName(String backingIndexName, int indexOfLastDash) { + private static String parseDataStreamName(String backingIndexName, int indexOfLastDash) { return backingIndexName.substring(4, backingIndexName.lastIndexOf('-', indexOfLastDash - 1)); } - private int parseGeneration(String backingIndexName, int indexOfLastDash) { + private static int parseGeneration(String backingIndexName, int indexOfLastDash) { return Integer.parseInt(backingIndexName.substring(indexOfLastDash + 1)); } }; diff --git a/test/framework/src/main/java/org/elasticsearch/common/inject/ModuleTestCase.java b/test/framework/src/main/java/org/elasticsearch/common/inject/ModuleTestCase.java index 99b0235f772cf..df8c0e9ad4b32 100644 --- a/test/framework/src/main/java/org/elasticsearch/common/inject/ModuleTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/common/inject/ModuleTestCase.java @@ -25,7 +25,7 @@ public abstract class ModuleTestCase extends ESTestCase { * Configures the module, and ensures an instance is bound to the "to" class, and the * provided tester returns true on the instance. */ - public void assertInstanceBinding(Module module, Class to, Predicate tester) { + public static void assertInstanceBinding(Module module, Class to, Predicate tester) { assertInstanceBindingWithAnnotation(module, to, tester, null); } @@ -33,7 +33,7 @@ public void assertInstanceBinding(Module module, Class to, Predicate t * Like {@link #assertInstanceBinding(Module, Class, Predicate)}, but filters the * classes checked by the given annotation. */ - private void assertInstanceBindingWithAnnotation( + private static void assertInstanceBindingWithAnnotation( Module module, Class to, Predicate tester, diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java b/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java index ee878b6eff4e0..d4e9b1ad3b84c 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java @@ -60,7 +60,7 @@ public TranslogHandler(NamedXContentRegistry xContentRegistry, IndexSettings ind ); } - private void applyOperation(Engine engine, Engine.Operation operation) throws IOException { + private static void applyOperation(Engine engine, Engine.Operation operation) throws IOException { switch (operation.operationType()) { case INDEX -> engine.index((Engine.Index) operation); case DELETE -> engine.delete((Engine.Delete) operation); diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java index bab885bd1053f..168ab8663a153 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java @@ -129,7 +129,7 @@ protected static IndexAnalyzers createIndexAnalyzers() { return IndexAnalyzers.of(Map.of("default", new NamedAnalyzer("default", AnalyzerScope.INDEX, new StandardAnalyzer()))); } - protected final String randomIndexOptions() { + protected static String randomIndexOptions() { return randomFrom("docs", "freqs", "positions", "offsets"); } @@ -239,7 +239,7 @@ protected static IndexSettings createIndexSettings(IndexVersion version, Setting return new IndexSettings(meta, settings); } - protected final void withLuceneIndex( + protected static void withLuceneIndex( MapperService mapperService, CheckedConsumer builder, CheckedConsumer test @@ -258,22 +258,25 @@ protected final void withLuceneIndex( /** * Build a {@link SourceToParse} with the id {@code "1"} and without any dynamic templates. */ - protected final SourceToParse source(CheckedConsumer build) throws IOException { + protected static SourceToParse source(CheckedConsumer build) throws IOException { return source("1", build, null); } /** * Build a {@link SourceToParse} without any dynamic templates. */ - protected final SourceToParse source(@Nullable String id, CheckedConsumer build, @Nullable String routing) - throws IOException { + protected static SourceToParse source( + @Nullable String id, + CheckedConsumer build, + @Nullable String routing + ) throws IOException { return source(id, build, routing, Map.of()); } /** * Build a {@link SourceToParse}. */ - protected final SourceToParse source( + protected static SourceToParse source( @Nullable String id, CheckedConsumer build, @Nullable String routing, @@ -295,35 +298,35 @@ protected static SourceToParse source(String source) { /** * Merge a new mapping into the one in the provided {@link MapperService}. */ - protected final void merge(MapperService mapperService, XContentBuilder mapping) throws IOException { + protected static void merge(MapperService mapperService, XContentBuilder mapping) throws IOException { merge(mapperService, MapperService.MergeReason.MAPPING_UPDATE, mapping); } /** * Merge a new mapping into the one in the provided {@link MapperService}. */ - protected final void merge(MapperService mapperService, String mapping) throws IOException { + protected static void merge(MapperService mapperService, String mapping) throws IOException { mapperService.merge(null, new CompressedXContent(mapping), MapperService.MergeReason.MAPPING_UPDATE); } - protected final void merge(MapperService mapperService, MapperService.MergeReason reason, String mapping) throws IOException { + protected static void merge(MapperService mapperService, MapperService.MergeReason reason, String mapping) throws IOException { mapperService.merge(null, new CompressedXContent(mapping), reason); } /** * Merge a new mapping into the one in the provided {@link MapperService} with a specific {@code MergeReason} */ - protected final void merge(MapperService mapperService, MapperService.MergeReason reason, XContentBuilder mapping) throws IOException { + protected static void merge(MapperService mapperService, MapperService.MergeReason reason, XContentBuilder mapping) throws IOException { mapperService.merge(null, new CompressedXContent(BytesReference.bytes(mapping)), reason); } - protected final XContentBuilder topMapping(CheckedConsumer buildFields) throws IOException { + protected static XContentBuilder topMapping(CheckedConsumer buildFields) throws IOException { XContentBuilder builder = XContentFactory.jsonBuilder().startObject().startObject("_doc"); buildFields.accept(builder); return builder.endObject().endObject(); } - protected final XContentBuilder mappingNoSubobjects(CheckedConsumer buildFields) throws IOException { + protected static XContentBuilder mappingNoSubobjects(CheckedConsumer buildFields) throws IOException { return topMapping(xContentBuilder -> { xContentBuilder.field("subobjects", false); xContentBuilder.startObject("properties"); @@ -332,19 +335,19 @@ protected final XContentBuilder mappingNoSubobjects(CheckedConsumer buildFields) throws IOException { + protected static XContentBuilder mapping(CheckedConsumer buildFields) throws IOException { XContentBuilder builder = XContentFactory.jsonBuilder().startObject().startObject("_doc").startObject("properties"); buildFields.accept(builder); return builder.endObject().endObject().endObject(); } - protected final XContentBuilder dynamicMapping(Mapping dynamicMapping) throws IOException { + protected static XContentBuilder dynamicMapping(Mapping dynamicMapping) throws IOException { XContentBuilder builder = XContentFactory.jsonBuilder().startObject(); dynamicMapping.toXContent(builder, ToXContent.EMPTY_PARAMS); return builder.endObject(); } - protected final XContentBuilder fieldMapping(CheckedConsumer buildField) throws IOException { + protected static XContentBuilder fieldMapping(CheckedConsumer buildField) throws IOException { return mapping(b -> { b.startObject("field"); buildField.accept(b); @@ -352,7 +355,7 @@ protected final XContentBuilder fieldMapping(CheckedConsumer buildField) throws IOException { + protected static XContentBuilder runtimeFieldMapping(CheckedConsumer buildField) throws IOException { return runtimeMapping(b -> { b.startObject("field"); buildField.accept(b); @@ -360,7 +363,7 @@ protected final XContentBuilder runtimeFieldMapping(CheckedConsumer buildFields) throws IOException { + protected static XContentBuilder runtimeMapping(CheckedConsumer buildFields) throws IOException { XContentBuilder builder = XContentFactory.jsonBuilder().startObject().startObject("_doc").startObject("runtime"); buildFields.accept(builder); return builder.endObject().endObject().endObject(); @@ -723,7 +726,7 @@ private void roundTripSyntheticSource(DocumentMapper mapper, String syntheticSou } } - private String syntheticSource(DocumentMapper mapper, IndexReader reader, int docId) throws IOException { + private static String syntheticSource(DocumentMapper mapper, IndexReader reader, int docId) throws IOException { SourceProvider provider = SourceProvider.fromSyntheticSource(mapper.mapping()); Source synthetic = provider.getSource(getOnlyLeafReader(reader).getContext(), docId); return synthetic.internalSourceRef().utf8ToString(); @@ -752,7 +755,7 @@ protected void validateRoundTripReader(String syntheticSource, DirectoryReader r ); } - protected final XContentBuilder syntheticSourceMapping(CheckedConsumer buildFields) throws IOException { + protected static XContentBuilder syntheticSourceMapping(CheckedConsumer buildFields) throws IOException { return topMapping(b -> { b.startObject("_source").field("mode", "synthetic").endObject(); b.startObject("properties"); @@ -761,7 +764,7 @@ protected final XContentBuilder syntheticSourceMapping(CheckedConsumer buildField) + protected static XContentBuilder syntheticSourceFieldMapping(CheckedConsumer buildField) throws IOException { return syntheticSourceMapping(b -> { b.startObject("field"); diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java index bc58a792cefc6..692f7c6810254 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java @@ -556,7 +556,7 @@ protected final List fetchFromDocValues(MapperService mapperService, MappedFi return result.get(); } - protected final void assertScriptDocValues(MapperService mapperService, Object sourceValue, Matcher> dvMatcher) + protected static void assertScriptDocValues(MapperService mapperService, Object sourceValue, Matcher> dvMatcher) throws IOException { withLuceneIndex(mapperService, iw -> { iw.addDocument(mapperService.documentMapper().parse(source(b -> b.field("field", sourceValue))).rootDoc()); diff --git a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java index a05b2510bc056..ad515078fc1c5 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java @@ -142,7 +142,7 @@ protected IndexMetadata buildIndexMetadata(int replicas, Settings indexSettings, return metadata.build(); } - IndexRequest copyIndexRequest(IndexRequest inRequest) throws IOException { + static IndexRequest copyIndexRequest(IndexRequest inRequest) throws IOException { try (BytesStreamOutput out = new BytesStreamOutput()) { inRequest.writeTo(out); try (StreamInput in = out.bytes().streamInput()) { @@ -151,7 +151,7 @@ IndexRequest copyIndexRequest(IndexRequest inRequest) throws IOException { } } - protected DiscoveryNode getDiscoveryNode(String id) { + protected static DiscoveryNode getDiscoveryNode(String id) { return DiscoveryNodeUtils.builder(id).name(id).roles(Collections.singleton(DiscoveryNodeRole.DATA_ROLE)).build(); } diff --git a/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java index 05828a572418c..d5d8057b72405 100644 --- a/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java @@ -468,7 +468,7 @@ public void sendRequest( // We only use this method in IndexRecoveryWithSnapshotsIT that's located in the x-pack plugin // that implements snapshot based recoveries. - private void createSnapshotThatCanBeUsedDuringRecovery(String indexName) throws Exception { + private static void createSnapshotThatCanBeUsedDuringRecovery(String indexName) throws Exception { // Ensure that the safe commit == latest commit assertBusy(() -> { ShardStats stats = indicesAdmin().prepareStats(indexName) diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java index 38a44bae48543..c0377f8ef1b9a 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java @@ -223,7 +223,7 @@ protected void assertCleanupResponse(CleanupRepositoryResponse response, long by assertThat(response.result().bytes(), equalTo(3L + 2 * 3L)); } - private void createDanglingIndex(final BlobStoreRepository repo, final Executor genericExec) throws Exception { + private static void createDanglingIndex(final BlobStoreRepository repo, final Executor genericExec) throws Exception { final PlainActionFuture future = PlainActionFuture.newFuture(); genericExec.execute(ActionRunnable.run(future, () -> { final BlobStore blobStore = repo.blobStore(); diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java index e45c962c9960c..7842f2fb9dfd7 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java @@ -141,7 +141,7 @@ public void tearDownHttpServer() { } } - protected void assertEmptyRepo(Map blobsMap) { + protected static void assertEmptyRepo(Map blobsMap) { List blobs = blobsMap.keySet().stream().filter(blob -> blob.contains("index") == false).collect(Collectors.toList()); assertThat("Only index blobs should remain in repository but found " + blobs, blobs, hasSize(0)); } diff --git a/test/framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java b/test/framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java index bd313a7d9e0ee..130eca43e7a33 100644 --- a/test/framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java +++ b/test/framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java @@ -415,7 +415,7 @@ public Set> getSupportedContexts() { ); } - private Map createVars(Map params) { + private static Map createVars(Map params) { Map vars = new HashMap<>(); vars.put("params", params); return vars; diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java index 5a28bd8b0ea6d..c5a9a9ae7c6de 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java @@ -416,7 +416,7 @@ protected List objectMappers() { /** * Build a {@link SubSearchContext}s to power {@code top_hits}. */ - private SubSearchContext buildSubSearchContext( + private static SubSearchContext buildSubSearchContext( IndexSettings indexSettings, SearchExecutionContext searchExecutionContext, BitsetFilterCache bitsetFilterCache @@ -834,7 +834,7 @@ protected void debugTestCase( } } - private void collectDebugInfo(String prefix, Aggregator aggregator, Map> allDebug) { + private static void collectDebugInfo(String prefix, Aggregator aggregator, Map> allDebug) { Map debug = new HashMap<>(); aggregator.collectDebugInfo((key, value) -> { Object old = debug.put(key, value); @@ -869,7 +869,7 @@ protected void withAggregator( } } - private void verifyMetricNames( + private static void verifyMetricNames( ValuesSourceAggregationBuilder.MetricsAggregationBuilder aggregationBuilder, InternalAggregation agg ) { @@ -1111,7 +1111,7 @@ public void testSupportedFieldTypes() throws IOException { } } - private ValuesSourceType fieldToVST(MappedFieldType fieldType) { + private static ValuesSourceType fieldToVST(MappedFieldType fieldType) { return fieldType.fielddataBuilder(FieldDataContext.noRuntimeFields("test")).build(null, null).getValuesSourceType(); } @@ -1121,7 +1121,7 @@ private ValuesSourceType fieldToVST(MappedFieldType fieldType) { * Throws an exception if it encounters an unknown field type, to prevent new ones from sneaking in without * being tested. */ - private void writeTestDoc(MappedFieldType fieldType, String fieldName, RandomIndexWriter iw) throws IOException { + private static void writeTestDoc(MappedFieldType fieldType, String fieldName, RandomIndexWriter iw) throws IOException { String typeName = fieldType.typeName(); ValuesSourceType vst = fieldToVST(fieldType); diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java index 4901b94b6dab3..d3012c4779024 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java @@ -264,7 +264,7 @@ private double[] randomLatLng() { return new double[] { lat, lon }; } - private boolean validPoint(double x, double y, GeoBoundingBox bbox) { + private static boolean validPoint(double x, double y, GeoBoundingBox bbox) { if (bbox == null) { return true; } @@ -279,7 +279,7 @@ private boolean validPoint(double x, double y, GeoBoundingBox bbox) { return false; } - private boolean intersectsBounds(Rectangle pointTile, GeoBoundingBox bbox) { + private static boolean intersectsBounds(Rectangle pointTile, GeoBoundingBox bbox) { if (bbox == null) { return true; } diff --git a/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java index 3e650faa82b87..fecaeac1c85a2 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java @@ -459,7 +459,7 @@ public void testBulk() throws Exception { protected abstract void doDistanceAndBoundingBoxTest(String key); - private String findNodeName(String index) { + private static String findNodeName(String index) { ClusterState state = clusterAdmin().prepareState().get().getState(); IndexShardRoutingTable shard = state.getRoutingTable().index(index).shard(0); String nodeId = shard.assignedShards().get(0).currentNodeId(); diff --git a/test/framework/src/main/java/org/elasticsearch/search/geo/GeoShapeIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/geo/GeoShapeIntegTestCase.java index d451689350a43..029a9f753a365 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/geo/GeoShapeIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/geo/GeoShapeIntegTestCase.java @@ -99,7 +99,7 @@ protected void doDistanceAndBoundingBoxTest(String key) { } } - private double distance(double lat1, double lon1, double lat2, double lon2) { + private static double distance(double lat1, double lon1, double lat2, double lon2) { return SloppyMath.haversinMeters(lat1, lon1, lat2, lon2); } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 4956985c78a97..a557841ba34bd 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -844,7 +844,7 @@ public static void setReplicaCount(int replicas, String index) { updateIndexSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, replicas), index); } - private Settings.Builder getExcludeSettings(int num, Settings.Builder builder) { + private static Settings.Builder getExcludeSettings(int num, Settings.Builder builder) { String exclude = String.join(",", internalCluster().allDataNodesButN(num)); builder.put("index.routing.allocation.exclude._name", exclude); return builder; @@ -1308,7 +1308,7 @@ protected void ensureClusterStateCanBeReadByNodeTool() throws IOException { } } - private void ensureClusterInfoServiceRunning() { + private static void ensureClusterInfoServiceRunning() { if (isInternalCluster() && cluster().size() > 0) { // ensures that the cluster info service didn't leak its async task, which would prevent future refreshes refreshClusterInfo(); diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java index 530eafb84d47b..c913214a54718 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java @@ -392,7 +392,7 @@ private AggregationBuilder mockBuilder(String name, Map subNames return b; } - private void collectSubBuilderNames(Map names, InternalAggregation result) { + private static void collectSubBuilderNames(Map names, InternalAggregation result) { result.forEachBucket(ia -> { for (InternalAggregation a : ia.copyResults()) { @SuppressWarnings("unchecked") diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java index 3690750d94b70..18898e72c110c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java @@ -188,7 +188,7 @@ public boolean isDisruptedNodeThread(String threadName) { return threadName.contains("[" + disruptedNode + "]"); } - private String stackTrace(StackTraceElement[] stackTraceElements) { + private static String stackTrace(StackTraceElement[] stackTraceElements) { return Arrays.stream(stackTraceElements).map(Object::toString).collect(Collectors.joining("\n")); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index 0a94edb0527f6..5844dcbd66471 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -102,7 +102,7 @@ public void testFailure(Failure failure) throws Exception { printToErr(b.toString()); } - private boolean isRestApiCompatibilityTest() { + private static boolean isRestApiCompatibilityTest() { return Boolean.parseBoolean(System.getProperty("tests.restCompat", "false")); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 9a3c03810c943..ba125b020eb02 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -872,7 +872,7 @@ private void checkForUnexpectedlyRecreatedObjects() throws IOException { ); } - private Set getAllUnexpectedIlmPolicies(Set exclusions) throws IOException { + private static Set getAllUnexpectedIlmPolicies(Set exclusions) throws IOException { Map policies; try { Response response = adminClient().performRequest(new Request("GET", "/_ilm/policy")); @@ -1057,7 +1057,7 @@ protected void deleteRepository(String repoName) throws IOException { /** * Remove any cluster settings. */ - private void wipeClusterSettings() throws IOException { + private static void wipeClusterSettings() throws IOException { Map getResponse = entityAsMap(adminClient().performRequest(new Request("GET", "/_cluster/settings"))); boolean mustClear = false; @@ -1163,7 +1163,7 @@ protected static RefreshResponse refresh(RestClient client, String index) throws return RefreshResponse.fromXContent(responseAsParser(response)); } - private void waitForPendingRollupTasks() throws Exception { + private static void waitForPendingRollupTasks() throws Exception { waitForPendingTasks(adminClient(), taskName -> taskName.startsWith("xpack/rollup/job") == false); } @@ -1271,7 +1271,7 @@ private void logIfThereAreRunningTasks() throws IOException { * Waits for the cluster state updates to have been processed, so that no cluster * state updates are still in-progress when the next test starts. */ - private void waitForClusterStateUpdatesToFinish() throws Exception { + private static void waitForClusterStateUpdatesToFinish() throws Exception { assertBusy(() -> { try { Response response = adminClient().performRequest(new Request("GET", "/_cluster/pending_tasks")); @@ -1432,7 +1432,7 @@ protected static void doConfigureClient(RestClientBuilder builder, Settings sett } @SuppressWarnings("unchecked") - private Set runningTasks(Response response) throws IOException { + private static Set runningTasks(Response response) throws IOException { Set runningTasks = new HashSet<>(); Map nodes = (Map) entityAsMap(response).get("nodes"); @@ -2036,7 +2036,7 @@ protected static IndexVersion minimumIndexVersion() throws IOException { } @SuppressWarnings("unchecked") - private void ensureGlobalCheckpointSynced(String index) throws Exception { + private static void ensureGlobalCheckpointSynced(String index) throws Exception { assertBusy(() -> { Map stats = entityAsMap(client().performRequest(new Request("GET", index + "/_stats?level=shards"))); List> shardStats = (List>) XContentMapValues.extractValue("indices." + index + ".shards.0", stats); diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ObjectPath.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ObjectPath.java index 94c9dc338496a..dcd6f0e7f2e26 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ObjectPath.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ObjectPath.java @@ -82,7 +82,7 @@ public T evaluate(String path, Stash stash) throws IOException { } @SuppressWarnings("unchecked") - private Object evaluate(String key, Object objectToEvaluate, Stash stash) throws IOException { + private static Object evaluate(String key, Object objectToEvaluate, Stash stash) throws IOException { if (stash.containsStashedValue(key)) { key = stash.getValue(key).toString(); } @@ -119,7 +119,7 @@ private Object evaluate(String key, Object objectToEvaluate, Stash stash) throws ); } - private String[] parsePath(String path) { + private static String[] parsePath(String path) { List list = new ArrayList<>(); StringBuilder current = new StringBuilder(); boolean escape = false; diff --git a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryFactory.java b/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryFactory.java index bb84d1dfd321c..1892f76628a79 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryFactory.java +++ b/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryFactory.java @@ -116,7 +116,7 @@ public static void checkIndex(Logger logger, Store store, ShardId shardId) { } } - private Directory wrap(Directory dir, Random random, Settings indexSettings, ShardId shardId) { + private static Directory wrap(Directory dir, Random random, Settings indexSettings, ShardId shardId) { double randomIOExceptionRate = RANDOM_IO_EXCEPTION_RATE_SETTING.get(indexSettings); double randomIOExceptionRateOnOpen = RANDOM_IO_EXCEPTION_RATE_ON_OPEN_SETTING.get(indexSettings); @@ -135,7 +135,7 @@ private Directory wrap(Directory dir, Random random, Settings indexSettings, Sha return w; } - private Directory randomDirectoryService(Random random, IndexSettings indexSettings, ShardPath path) throws IOException { + private static Directory randomDirectoryService(Random random, IndexSettings indexSettings, ShardPath path) throws IOException { final IndexMetadata build = IndexMetadata.builder(indexSettings.getIndexMetadata()) .settings( Settings.builder() diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/CapturingTransport.java b/test/framework/src/main/java/org/elasticsearch/test/transport/CapturingTransport.java index 2f03303115e5c..dd766cd86cd7f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/CapturingTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/test/transport/CapturingTransport.java @@ -49,7 +49,7 @@ public CapturedRequest[] getCapturedRequestsAndClear() { return requests.toArray(new CapturedRequest[0]); } - private Map> groupRequestsByTargetNode(Collection requests) { + private static Map> groupRequestsByTargetNode(Collection requests) { Map> result = new HashMap<>(); for (CapturedRequest request : requests) { result.computeIfAbsent(request.node.getId(), node -> new ArrayList<>()).add(request); diff --git a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java index 672fd33ccb2af..3b42181216bcb 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java @@ -3367,7 +3367,7 @@ public void writeTo(StreamOutput out) throws IOException { } } - private long[] getConstantMessageSizeHistogram(int count, long size) { + private static long[] getConstantMessageSizeHistogram(int count, long size) { final var histogram = new long[29]; int bucket = 0; long bucketLowerBound = 8; diff --git a/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java b/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java index bbf578429a138..bd51c74ee8e47 100644 --- a/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java +++ b/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java @@ -467,7 +467,7 @@ private void checkArrayArgs( } // counts how many times argAndField was called on the method chain - private int getChainedParams(AbstractInsnNode startNode) { + private static int getChainedParams(AbstractInsnNode startNode) { int c = 0; AbstractInsnNode current = startNode; while (current.getNext() != null) { diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/WaitForHttpResource.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/WaitForHttpResource.java index f00e6f13cb314..0c839aeddd189 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/WaitForHttpResource.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/WaitForHttpResource.java @@ -197,7 +197,7 @@ private KeyStore buildTrustStoreFromCA() throws GeneralSecurityException, IOExce return store; } - private SSLContext createSslContext(KeyStore trustStore) throws GeneralSecurityException { + private static SSLContext createSslContext(KeyStore trustStore) throws GeneralSecurityException { checkForTrustEntry(trustStore); TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); tmf.init(trustStore); @@ -206,7 +206,7 @@ private SSLContext createSslContext(KeyStore trustStore) throws GeneralSecurityE return sslContext; } - private void checkForTrustEntry(KeyStore trustStore) throws KeyStoreException { + private static void checkForTrustEntry(KeyStore trustStore) throws KeyStoreException { Enumeration enumeration = trustStore.aliases(); while (enumeration.hasMoreElements()) { if (trustStore.isCertificateEntry(enumeration.nextElement())) { diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/util/ProcessReaper.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/util/ProcessReaper.java index 7d3d19a204cbe..2c0eb9d2cea3d 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/util/ProcessReaper.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/util/ProcessReaper.java @@ -146,7 +146,7 @@ private void ensureReaperAlive() { } } - private Path findJavaHome() { + private static Path findJavaHome() { Path javaBase = Path.of(System.getProperty("java.home")); return javaBase.endsWith("jre") && Files.exists(javaBase.getParent().resolve("bin/java")) ? javaBase.getParent() : javaBase; } diff --git a/test/x-content/src/main/java/org/elasticsearch/test/xcontent/AbstractSchemaValidationTestCase.java b/test/x-content/src/main/java/org/elasticsearch/test/xcontent/AbstractSchemaValidationTestCase.java index 8ac2783c170b9..44ebb89b6c2c0 100644 --- a/test/x-content/src/main/java/org/elasticsearch/test/xcontent/AbstractSchemaValidationTestCase.java +++ b/test/x-content/src/main/java/org/elasticsearch/test/xcontent/AbstractSchemaValidationTestCase.java @@ -129,7 +129,7 @@ private JsonSchemaFactory initializeSchemaFactory() { * Note: we might not catch all places, but at least it works for nested objects and * array items. */ - private void assertSchemaStrictness(Collection validatorSet, String path) { + private static void assertSchemaStrictness(Collection validatorSet, String path) { boolean additionalPropertiesValidatorFound = false; boolean subSchemaFound = false; diff --git a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java index a4879701fa966..b09250e1527f3 100644 --- a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java +++ b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java @@ -68,7 +68,7 @@ public ClientYamlTestResponse(Response response) throws IOException { * Also in testing there is no access to media types defined outside of XContentType. * Therefore a null has to be returned if a response content-type has a mediatype not defined in XContentType. */ - private XContentType getContentTypeIgnoreExceptions(String contentType) { + private static XContentType getContentTypeIgnoreExceptions(String contentType) { try { return XContentType.fromMediaType(contentType); } catch (IllegalArgumentException e) { diff --git a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java index 5ef863285fbbc..d135c56cdde01 100644 --- a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java +++ b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java @@ -267,7 +267,7 @@ public ClientYamlSuiteRestApi parse(String location, XContentParser parser) thro return restApi; } - private List getStringsFromArray(XContentParser parser, String key) throws IOException { + private static List getStringsFromArray(XContentParser parser, String key) throws IOException { return parser.list().stream().filter(Objects::nonNull).map(o -> { if (o instanceof String) { return (String) o; diff --git a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java index 79ec4825fca21..0220c0931bca1 100644 --- a/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java +++ b/test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java @@ -510,7 +510,7 @@ void checkWarningHeaders(final List warningHeaders, String testPath) { } } - private void appendBadHeaders(final StringBuilder sb, final List headers, final String message) { + private static void appendBadHeaders(final StringBuilder sb, final List headers, final String message) { if (headers.isEmpty() == false) { sb.append(message).append(" [\n"); for (final String header : headers) { diff --git a/x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java b/x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java index 4ca1dc2f1d092..25065b6ced6e2 100644 --- a/x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java +++ b/x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/LicenseSigner.java @@ -96,7 +96,7 @@ public License sign(License licenseSpec) throws IOException { return License.builder().fromLicenseSpec(licenseSpec, Base64.getEncoder().encodeToString(bytes)).build(); } - private byte[] getPublicKeyFingerprint(byte[] keyBytes) { + private static byte[] getPublicKeyFingerprint(byte[] keyBytes) { MessageDigest sha256 = MessageDigests.sha256(); sha256.update(keyBytes); return sha256.digest(); diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityPipelineAggregator.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityPipelineAggregator.java index db9e10c167209..ce152577864a4 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityPipelineAggregator.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityPipelineAggregator.java @@ -73,7 +73,7 @@ public InternalAggregation reduce(InternalAggregation aggregation, AggregationRe } } - private AbstractHyperLogLogPlusPlus resolveBucketValue( + private static AbstractHyperLogLogPlusPlus resolveBucketValue( MultiBucketsAggregation agg, InternalMultiBucketAggregation.InternalBucket bucket, String aggPath diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesPipelineAggregator.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesPipelineAggregator.java index 6e9c9812e9e95..90f22340edb0d 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesPipelineAggregator.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesPipelineAggregator.java @@ -164,7 +164,7 @@ private void reduceHDR( } } - private PercentileConfig resolvePercentileConfig( + private static PercentileConfig resolvePercentileConfig( MultiBucketsAggregation agg, InternalMultiBucketAggregation.InternalBucket bucket, String aggPath @@ -194,7 +194,7 @@ private PercentileConfig resolvePercentileConfig( throw buildResolveError(agg, aggPathsList, propertyValue, "percentiles"); } - private TDigestState resolveTDigestBucketValue( + private static TDigestState resolveTDigestBucketValue( MultiBucketsAggregation agg, InternalMultiBucketAggregation.InternalBucket bucket, String aggPath @@ -207,7 +207,7 @@ private TDigestState resolveTDigestBucketValue( return ((InternalTDigestPercentiles) propertyValue).getState(); } - private DoubleHistogram resolveHDRBucketValue( + private static DoubleHistogram resolveHDRBucketValue( MultiBucketsAggregation agg, InternalMultiBucketAggregation.InternalBucket bucket, String aggPath @@ -220,7 +220,7 @@ private DoubleHistogram resolveHDRBucketValue( return ((InternalHDRPercentiles) propertyValue).getState(); } - private IllegalArgumentException buildResolveError( + private static IllegalArgumentException buildResolveError( MultiBucketsAggregation agg, List aggPathsList, Object propertyValue, @@ -253,7 +253,7 @@ private IllegalArgumentException buildResolveError( } } - private int clamp(int index, int length) { + private static int clamp(int index, int length) { if (index < 0) { return 0; } diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregator.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregator.java index 5d6b0ec760acd..7633d38d7ebba 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregator.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregator.java @@ -144,7 +144,7 @@ List termValuesList(LeafReaderContext ctx) throws IOException { return termValuesList; } - List> docTerms(List termValuesList, int doc) throws IOException { + static List> docTerms(List termValuesList, int doc) throws IOException { List> terms = new ArrayList<>(); for (TermValues termValues : termValuesList) { List collectValues = termValues.collectValues(doc); diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/ttest/UnpairedTTestAggregator.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/ttest/UnpairedTTestAggregator.java index df53a40a0870c..0f74e3466dd0a 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/ttest/UnpairedTTestAggregator.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/ttest/UnpairedTTestAggregator.java @@ -86,7 +86,7 @@ public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, return new LeafBucketCollectorBase(sub, docAValues) { - private void processValues( + private static void processValues( int doc, long bucket, SortedNumericDoubleValues docValues, @@ -116,7 +116,7 @@ public void collect(int doc, long bucket) throws IOException { }; } - private Bits getBits(LeafReaderContext ctx, Weight weight) throws IOException { + private static Bits getBits(LeafReaderContext ctx, Weight weight) throws IOException { if (weight == null) { return null; } diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCalculateCapacityService.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCalculateCapacityService.java index 1c20ab8ee62a3..672ddad9ea189 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCalculateCapacityService.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCalculateCapacityService.java @@ -75,7 +75,7 @@ private void validate(final String deciderName, final Settings configuration, So configuration.keySet().forEach(key -> validateSetting(key, configuration, deciderSettings, deciderName)); } - private void validateSetting(String key, Settings configuration, Map> deciderSettings, String decider) { + private static void validateSetting(String key, Settings configuration, Map> deciderSettings, String decider) { Setting setting = deciderSettings.get(key); if (setting == null) { throw new IllegalArgumentException("unknown setting [" + key + "] for decider [" + decider + "]"); @@ -212,7 +212,7 @@ DefaultAutoscalingDeciderContext createContext( * Check if the policy has unknown roles. This can only happen in mixed clusters, where one master can accept a policy but if it fails * over to an older master before it is also upgraded, one of the roles might not be known. */ - private boolean hasUnknownRoles(AutoscalingPolicy policy) { + private static boolean hasUnknownRoles(AutoscalingPolicy policy) { return DiscoveryNodeRole.roleNames().containsAll(policy.roles()) == false; } @@ -338,7 +338,7 @@ private AutoscalingCapacity.AutoscalingResources resourcesFor(DiscoveryNode node ); } - private long totalStorage(Map diskUsages, DiscoveryNode node) { + private static long totalStorage(Map diskUsages, DiscoveryNode node) { DiskUsage diskUsage = diskUsages.get(node.getId()); return diskUsage != null ? diskUsage.getTotalBytes() : -1; } diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/nodeinfo/AutoscalingNodeInfoService.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/nodeinfo/AutoscalingNodeInfoService.java index 578689828de6b..2380082fbf66e 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/nodeinfo/AutoscalingNodeInfoService.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/nodeinfo/AutoscalingNodeInfoService.java @@ -191,7 +191,7 @@ private void sendToMissingNodes(Function nodeLookup, Set< ); } - private Set> calculateAutoscalingRoleSets(ClusterState state) { + private static Set> calculateAutoscalingRoleSets(ClusterState state) { AutoscalingMetadata autoscalingMetadata = state.metadata().custom(AutoscalingMetadata.NAME); if (autoscalingMetadata != null) { return autoscalingMetadata.policies() @@ -199,13 +199,13 @@ private Set> calculateAutoscalingRoleSets(ClusterState st .stream() .map(AutoscalingPolicyMetadata::policy) .map(AutoscalingPolicy::roles) - .map(this::toRoles) + .map(AutoscalingNodeInfoService::toRoles) .collect(Collectors.toSet()); } return Set.of(); } - private Set toRoles(SortedSet roleNames) { + private static Set toRoles(SortedSet roleNames) { return roleNames.stream().map(DiscoveryNodeRole::getRoleFromRoleName).collect(Collectors.toSet()); } diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/existence/FrozenExistenceDeciderService.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/existence/FrozenExistenceDeciderService.java index 80c626e8b24d7..c1221f371076f 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/existence/FrozenExistenceDeciderService.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/existence/FrozenExistenceDeciderService.java @@ -48,7 +48,7 @@ public AutoscalingDeciderResult scale(Settings configuration, AutoscalingDecider List indicesNeedingFrozen = context.state() .metadata() .stream() - .filter(this::needsTier) + .filter(FrozenExistenceDeciderService::isFrozenPhase) .map(imd -> imd.getIndex().getName()) .limit(10) .collect(Collectors.toList()); @@ -63,10 +63,6 @@ public AutoscalingDeciderResult scale(Settings configuration, AutoscalingDecider return new AutoscalingDeciderResult(builder.build(), new FrozenExistenceReason(indicesNeedingFrozen)); } - boolean needsTier(IndexMetadata idxMeta) { - return isFrozenPhase(idxMeta); - } - @Override public List> deciderSettings() { return Collections.emptyList(); diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderService.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderService.java index c94ffd5b20798..fc8eedbe1ca75 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderService.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderService.java @@ -544,7 +544,14 @@ boolean needsThisTier(ShardRouting shard, RoutingAllocation allocation) { IndexMetadata indexMetadata = indexMetadata(shard, allocation); Set decisionTypes = allocation.routingNodes() .stream() - .map(node -> DataTierAllocationDecider.shouldFilter(indexMetadata, node.node(), this::highestPreferenceTier, allocation)) + .map( + node -> DataTierAllocationDecider.shouldFilter( + indexMetadata, + node.node(), + AllocationState::highestPreferenceTier, + allocation + ) + ) .map(Decision::type) .collect(Collectors.toSet()); if (decisionTypes.contains(Decision.Type.NO)) { @@ -579,11 +586,11 @@ private static boolean isAssignedToTier(IndexMetadata indexMetadata, Set highestPreferenceTier( + private static Optional highestPreferenceTier( List preferredTiers, DiscoveryNodes unused, DesiredNodes desiredNodes, diff --git a/x-pack/plugin/blob-cache/src/main/java/org/elasticsearch/blobcache/common/SparseFileTracker.java b/x-pack/plugin/blob-cache/src/main/java/org/elasticsearch/blobcache/common/SparseFileTracker.java index 96b1848f40597..5eb146102cd76 100644 --- a/x-pack/plugin/blob-cache/src/main/java/org/elasticsearch/blobcache/common/SparseFileTracker.java +++ b/x-pack/plugin/blob-cache/src/main/java/org/elasticsearch/blobcache/common/SparseFileTracker.java @@ -319,7 +319,7 @@ public boolean waitForRangeIfPending(final ByteRange range, final ActionListener return true; } - private void subscribeToCompletionListeners(List requiredRanges, long rangeEnd, ActionListener listener) { + private static void subscribeToCompletionListeners(List requiredRanges, long rangeEnd, ActionListener listener) { // NB we work with ranges outside the mutex here, but only to interact with their completion listeners which are `final` so // there is no risk of concurrent modification. switch (requiredRanges.size()) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java index 39979d89ed8b8..891e8343ffe0f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java @@ -266,7 +266,7 @@ private void submitUnbatchedTask(@SuppressWarnings("SameParameterValue") String clusterService.submitUnbatchedStateUpdateTask(source, task); } - private boolean licenseIsCompatible(License license, Version version) { + private static boolean licenseIsCompatible(License license, Version version) { final int maxVersion = LicenseUtils.getMaxLicenseVersion(version); return license.version() <= maxVersion; } @@ -276,7 +276,7 @@ private boolean isAllowedLicenseType(License.LicenseType type) { return allowedLicenseTypes.contains(type); } - private TimeValue days(int days) { + private static TimeValue days(int days) { return TimeValue.timeValueHours(days * 24); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/StartBasicClusterTask.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/StartBasicClusterTask.java index d51059ec7810f..adc0d66353608 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/StartBasicClusterTask.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/StartBasicClusterTask.java @@ -97,7 +97,7 @@ public void onFailure(@Nullable Exception e) { listener.onFailure(e); } - private boolean shouldGenerateNewBasicLicense(License currentLicense) { + private static boolean shouldGenerateNewBasicLicense(License currentLicense) { return currentLicense == null || License.LicenseType.isBasic(currentLicense.type()) == false || LicenseSettings.SELF_GENERATED_LICENSE_MAX_NODES != currentLicense.maxNodes() diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshot.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshot.java index cb22b11a5be98..50485ecc21d9a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshot.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshot.java @@ -166,7 +166,7 @@ private LiveDocs getLiveDocs(LeafReader reader) throws IOException { return new LiveDocs(reader.numDeletedDocs(), reader.getLiveDocs()); } - private int apply(DocIdSetIterator iterator, FixedBitSet bits) throws IOException { + private static int apply(DocIdSetIterator iterator, FixedBitSet bits) throws IOException { int docID = -1; int newDeletes = 0; while ((docID = iterator.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { @@ -321,7 +321,7 @@ private SegmentCommitInfo syncSegment( } } - private boolean assertLiveDocs(Bits liveDocs, int deletes) { + private static boolean assertLiveDocs(Bits liveDocs, int deletes) { int actualDeletes = 0; for (int i = 0; i < liveDocs.length(); i++) { if (liveDocs.get(i) == false) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java index 13b659c95c1f5..a0aaf7f3bfeb5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java @@ -86,7 +86,7 @@ public ValueFetcher valueFetcher(SearchExecutionContext context, String format) * Retrieve the first tier preference from the index setting. If the setting is not * present, then return null. */ - private String getTierPreference(QueryRewriteContext context) { + private static String getTierPreference(QueryRewriteContext context) { Settings settings = context.getIndexSettings().getSettings(); String value = DataTier.TIER_PREFERENCE_SETTING.get(settings); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ExplainDataFrameAnalyticsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ExplainDataFrameAnalyticsAction.java index ec969538b0733..1e8bd2e8107b8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ExplainDataFrameAnalyticsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ExplainDataFrameAnalyticsAction.java @@ -82,7 +82,7 @@ public ActionRequestValidationException validate() { return error; } - private ActionRequestValidationException checkConfigIdIsValid( + private static ActionRequestValidationException checkConfigIdIsValid( DataFrameAnalyticsConfig analyticsConfig, ActionRequestValidationException error ) { @@ -106,7 +106,7 @@ private ActionRequestValidationException checkConfigIdIsValid( return error; } - private ActionRequestValidationException checkNoIncludedAnalyzedFieldsAreExcludedBySourceFiltering( + private static ActionRequestValidationException checkNoIncludedAnalyzedFieldsAreExcludedBySourceFiltering( DataFrameAnalyticsConfig analyticsConfig, ActionRequestValidationException error ) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsAction.java index ebe8f74829997..67cf1865efb78 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsAction.java @@ -84,7 +84,7 @@ public ActionRequestValidationException validate() { return error; } - private ActionRequestValidationException checkConfigIdIsValid( + private static ActionRequestValidationException checkConfigIdIsValid( DataFrameAnalyticsConfig analyticsConfig, ActionRequestValidationException error ) { @@ -108,7 +108,7 @@ private ActionRequestValidationException checkConfigIdIsValid( return error; } - private ActionRequestValidationException checkNoIncludedAnalyzedFieldsAreExcludedBySourceFiltering( + private static ActionRequestValidationException checkNoIncludedAnalyzedFieldsAreExcludedBySourceFiltering( DataFrameAnalyticsConfig analyticsConfig, ActionRequestValidationException error ) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java index cacc4a6a33196..db1b66982f105 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java @@ -725,7 +725,7 @@ public TimeValue defaultFrequency(TimeValue bucketSpan, NamedXContentRegistry xC return defaultFrequency; } - private TimeValue defaultFrequencyTarget(TimeValue bucketSpan) { + private static TimeValue defaultFrequencyTarget(TimeValue bucketSpan) { long bucketSpanSeconds = bucketSpan.seconds(); if (bucketSpanSeconds <= 0) { throw new IllegalArgumentException("Bucket span has to be > 0"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java index ff3e765508daf..6b34277ac49ba 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java @@ -255,7 +255,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - private void addOptionalField(XContentBuilder builder, ParseField field, Object value) throws IOException { + private static void addOptionalField(XContentBuilder builder, ParseField field, Object value) throws IOException { if (value != null) { builder.field(field.getPreferredName(), value); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/common/AbstractAucRoc.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/common/AbstractAucRoc.java index c45b10e9decf6..a43cf3da4bbae 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/common/AbstractAucRoc.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/common/AbstractAucRoc.java @@ -162,7 +162,7 @@ protected static double calculateAucScore(List rocCurve) { private record RateThresholdCurve(double[] percentiles, boolean isTp) { - private double getRate(int index) { + private static double getRate(int index) { return 1 - 0.01 * (index + 1); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/inference/EnsembleInferenceModel.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/inference/EnsembleInferenceModel.java index 10f0cc6770a9c..c0e8610a357b0 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/inference/EnsembleInferenceModel.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/inference/EnsembleInferenceModel.java @@ -181,7 +181,7 @@ private InferenceResults innerInfer(double[] features, InferenceConfig config, M return featureInfluence; } - private void addFeatureImportance(double[][] featureInfluence, RawInferenceResults inferenceResult) { + private static void addFeatureImportance(double[][] featureInfluence, RawInferenceResults inferenceResult) { double[][] modelFeatureImportance = inferenceResult.getFeatureImportance(); assert modelFeatureImportance.length == featureInfluence.length; for (int j = 0; j < modelFeatureImportance.length; j++) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/tree/TreeNode.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/tree/TreeNode.java index ba5ef0ae663e4..b0e82568d8b3d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/tree/TreeNode.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/tree/TreeNode.java @@ -203,7 +203,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - private void addOptionalDouble(XContentBuilder builder, ParseField field, double value) throws IOException { + private static void addOptionalDouble(XContentBuilder builder, ParseField field, double value) throws IOException { if (Numbers.isValidDouble(value)) { builder.field(field.getPreferredName(), value); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Detector.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Detector.java index 1aff73cadd54a..52fd74e572200 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Detector.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Detector.java @@ -719,7 +719,7 @@ private void validateRule(DetectionRule rule, DetectorFunction detectorFunction) checkScoping(rule); } - private void checkFunctionHasRuleSupport(DetectionRule rule, DetectorFunction detectorFunction) { + private static void checkFunctionHasRuleSupport(DetectionRule rule, DetectorFunction detectorFunction) { if (ruleHasConditionOnResultValue(rule) && FUNCTIONS_WITHOUT_RULE_CONDITION_SUPPORT.contains(detectorFunction)) { String msg = Messages.getMessage(Messages.JOB_CONFIG_DETECTION_RULE_NOT_SUPPORTED_BY_FUNCTION, detectorFunction); throw ExceptionsHelper.badRequestException(msg); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecord.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecord.java index 54f77655e2822..ca1fd98b7bfb3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecord.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecord.java @@ -360,7 +360,7 @@ private Map> inputFieldMap() { return result; } - private void addInputFieldsToMap(Map> inputFields, String inputFieldName, String fieldValue) { + private static void addInputFieldsToMap(Map> inputFields, String inputFieldName, String fieldValue) { if (Strings.isNullOrEmpty(inputFieldName) == false && fieldValue != null) { if (ReservedFieldNames.isValidFieldName(inputFieldName)) { inputFields.computeIfAbsent(inputFieldName, k -> new LinkedHashSet<>()).add(fieldValue); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/Cron.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/Cron.java index 0483e8d302940..b9d39aa665848 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/Cron.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/Cron.java @@ -1347,7 +1347,7 @@ private TreeSet getSet(int type) { }; } - private ValueSet getValue(int v, String s, int i) { + private static ValueSet getValue(int v, String s, int i) { char c = s.charAt(i); StringBuilder s1 = new StringBuilder(String.valueOf(v)); while (c >= '0' && c <= '9') { @@ -1365,13 +1365,13 @@ private ValueSet getValue(int v, String s, int i) { return val; } - private int getNumericValue(String s, int i) { + private static int getNumericValue(String s, int i) { int endOfVal = findNextWhiteSpace(i, s); String val = s.substring(i, endOfVal); return Integer.parseInt(val); } - private int getMonthNumber(String s) { + private static int getMonthNumber(String s) { Integer integer = MONTH_MAP.get(s); if (integer == null) { @@ -1381,7 +1381,7 @@ private int getMonthNumber(String s) { return integer; } - private int getDayOfWeekNumber(String s) { + private static int getDayOfWeekNumber(String s) { Integer integer = DAY_MAP.get(s); if (integer == null) { @@ -1409,7 +1409,7 @@ private static boolean isLeapYear(int year) { return ((year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)); } - private int getLastDayOfMonth(int monthNum, int year) { + private static int getLastDayOfMonth(int monthNum, int year) { return switch (monthNum) { case 1 -> 31; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequest.java index bb5b364005395..43908b6cf13fb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequest.java @@ -249,7 +249,7 @@ public int hashCode() { return Objects.hash(realmName, userName, ids, name, ownedByAuthenticatedUser); } - private void validateIds(@Nullable String[] idsToValidate) { + private static void validateIds(@Nullable String[] idsToValidate) { if (idsToValidate != null) { if (idsToValidate.length == 0) { final ActionRequestValidationException validationException = new ActionRequestValidationException(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequestBuilder.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequestBuilder.java index 98d40deaf7f1e..c011bd8af6c51 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequestBuilder.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequestBuilder.java @@ -35,7 +35,8 @@ public PutPrivilegesRequestBuilder(ElasticsearchClient client) { super(client, PutPrivilegesAction.INSTANCE, new PutPrivilegesRequest()); } - ApplicationPrivilegeDescriptor parsePrivilege(XContentParser parser, String applicationName, String privilegeName) throws IOException { + static ApplicationPrivilegeDescriptor parsePrivilege(XContentParser parser, String applicationName, String privilegeName) + throws IOException { ApplicationPrivilegeDescriptor privilege = ApplicationPrivilegeDescriptor.parse(parser, applicationName, privilegeName, false); checkPrivilegeName(privilege, applicationName, privilegeName); return privilege; @@ -99,7 +100,7 @@ public PutPrivilegesRequestBuilder source(BytesReference source, XContentType xC return this; } - private void checkPrivilegeName(ApplicationPrivilegeDescriptor privilege, String applicationName, String providedName) { + private static void checkPrivilegeName(ApplicationPrivilegeDescriptor privilege, String applicationName, String providedName) { final String privilegeName = privilege.getName(); if (Strings.isNullOrEmpty(applicationName) == false && applicationName.equals(privilege.getApplication()) == false) { throw new IllegalArgumentException( diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/expressiondsl/ExpressionParser.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/expressiondsl/ExpressionParser.java index 50d15672ae80d..5ec28dc68181e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/expressiondsl/ExpressionParser.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/expressiondsl/ExpressionParser.java @@ -124,12 +124,12 @@ private RoleMapperExpression parseExpression(XContentParser parser, String field } } - private RoleMapperExpression parseFieldExpression(XContentParser parser) throws IOException { + private static RoleMapperExpression parseFieldExpression(XContentParser parser) throws IOException { checkStartObject(parser); final String fieldName = readFieldName(Fields.FIELD.getPreferredName(), parser); final List values; if (parser.nextToken() == XContentParser.Token.START_ARRAY) { - values = parseArray(Fields.FIELD, parser, this::parseFieldValue); + values = parseArray(Fields.FIELD, parser, ExpressionParser::parseFieldValue); } else { values = Collections.singletonList(parseFieldValue(parser)); } @@ -147,14 +147,14 @@ private RoleMapperExpression parseExceptExpression(XContentParser parser) throws return new ExceptExpression(parseRulesObject(Fields.EXCEPT.getPreferredName(), parser, false)); } - private void checkStartObject(XContentParser parser) throws IOException { + private static void checkStartObject(XContentParser parser) throws IOException { final XContentParser.Token token = parser.nextToken(); if (token != XContentParser.Token.START_OBJECT) { throw new ElasticsearchParseException("failed to parse rules expression. expected an object but found [{}] instead", token); } } - private String readFieldName(String objectName, XContentParser parser) throws IOException { + private static String readFieldName(String objectName, XContentParser parser) throws IOException { if (parser.nextToken() != XContentParser.Token.FIELD_NAME) { throw new ElasticsearchParseException("failed to parse rules expression. object [{}] does not contain any fields", objectName); } @@ -167,8 +167,11 @@ private List parseExpressionArray(ParseField field, XConte return parseArray(field, parser, p -> parseRulesObject(field.getPreferredName(), p, allowExcept)); } - private List parseArray(ParseField field, XContentParser parser, CheckedFunction elementParser) - throws IOException { + private static List parseArray( + ParseField field, + XContentParser parser, + CheckedFunction elementParser + ) throws IOException { final XContentParser.Token token = parser.currentToken(); if (token == XContentParser.Token.START_ARRAY) { List list = new ArrayList<>(); @@ -181,7 +184,7 @@ private List parseArray(ParseField field, XContentParser parser, CheckedF } } - private FieldExpression.FieldValue parseFieldValue(XContentParser parser) throws IOException { + private static FieldExpression.FieldValue parseFieldValue(XContentParser parser) throws IOException { return switch (parser.currentToken()) { case VALUE_STRING -> new FieldExpression.FieldValue(parser.text()); case VALUE_BOOLEAN -> new FieldExpression.FieldValue(parser.booleanValue()); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java index 69edb7151e324..ec99301b92357 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java @@ -272,7 +272,7 @@ public BitSet getBitSet(final Query query, final LeafReaderContext context) thro } @Nullable - private BitSet computeBitSet(Query query, LeafReaderContext context) throws IOException { + private static BitSet computeBitSet(Query query, LeafReaderContext context) throws IOException { final IndexReaderContext topLevelContext = ReaderUtil.getTopLevelContext(context); final IndexSearcher searcher = new IndexSearcher(topLevelContext); searcher.setQueryCache(null); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/IndicesPermission.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/IndicesPermission.java index 9e26ff5e2bf38..13558175afaa3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/IndicesPermission.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/IndicesPermission.java @@ -613,7 +613,7 @@ private boolean isActionGranted(final String action, final Map usageStats() { return Collections.emptyMap(); } - public RoleDescriptor roleDescriptor(String role) { + public static RoleDescriptor roleDescriptor(String role) { return RESERVED_ROLES.get(role); } - public Collection roleDescriptors() { + public static Collection roleDescriptors() { return RESERVED_ROLES.values(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java index ae47fff47f82e..0ca489b32eb6d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java @@ -673,7 +673,7 @@ private void addIngestPipelinesIfMissing(ClusterState state) { } } - private boolean pipelineDependenciesExist(ClusterState state, List dependencies) { + private static boolean pipelineDependenciesExist(ClusterState state, List dependencies) { for (String dependency : dependencies) { if (findInstalledPipeline(state, dependency) == null) { return false; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/TransportTermsEnumAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/TransportTermsEnumAction.java index a630358775d4e..78406929c2cf7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/TransportTermsEnumAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/TransportTermsEnumAction.java @@ -150,7 +150,7 @@ protected void doExecute(Task task, TermsEnumRequest request, ActionListener shardIds, @@ -165,7 +165,7 @@ protected NodeTermsEnumRequest newNodeRequest( return new NodeTermsEnumRequest(originalIndices, nodeId, shardIds, request, taskStartMillis); } - private NodeTermsEnumResponse readShardResponse(StreamInput in) throws IOException { + private static NodeTermsEnumResponse readShardResponse(StreamInput in) throws IOException { return new NodeTermsEnumResponse(in); } @@ -207,7 +207,7 @@ protected Map> getNodeBundles(ClusterState clusterState, St return fastNodeBundles; } - private TermsEnumResponse mergeResponses( + private static TermsEnumResponse mergeResponses( TermsEnumRequest request, AtomicReferenceArray atomicResponses, boolean complete, @@ -274,7 +274,7 @@ private TermsEnumResponse mergeResponses( return new TermsEnumResponse(ans, (failedShards + successfulShards), successfulShards, failedShards, shardFailures, complete); } - private List mergeResponses(List> termsList, int size) { + private static List mergeResponses(List> termsList, int size) { final PriorityQueue pq = new PriorityQueue<>(termsList.size()) { @Override protected boolean lessThan(TermIterator a, TermIterator b) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java index beecea3b9f054..af13fcbcb7139 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java @@ -240,7 +240,7 @@ public boolean changesHeaders(TransformConfig config) { return isNullOrEqual(headers, config.getHeaders()) == false; } - private boolean isNullOrEqual(Object lft, Object rgt) { + private static boolean isNullOrEqual(Object lft, Object rgt) { return lft == null || lft.equals(rgt); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java index 1ef90ea55170e..7cf84ac3ecea8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java @@ -261,7 +261,7 @@ public void incrementCheckpointExponentialAverages(long checkpointDurationMs, lo } } - private double calculateExpAvg(double previousExpValue, double alpha, long observedValue) { + private static double calculateExpAvg(double previousExpValue, double alpha, long observedValue) { return alpha * observedValue + (1 - alpha) * previousExpValue; } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java index 3d21a7f2f14bb..a0ae881919d81 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java @@ -183,7 +183,7 @@ public String toString() { } } - private Interval readInterval(StreamInput in) throws IOException { + private static Interval readInterval(StreamInput in) throws IOException { byte id = in.readByte(); return switch (id) { case FIXED_INTERVAL_ID -> new FixedInterval(in); @@ -192,7 +192,7 @@ private Interval readInterval(StreamInput in) throws IOException { }; } - private void writeInterval(Interval anInterval, StreamOutput out) throws IOException { + private static void writeInterval(Interval anInterval, StreamOutput out) throws IOException { out.write(anInterval.getIntervalTypeId()); anInterval.writeTo(out); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionWrapper.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionWrapper.java index de7cd4f78e2be..daad2fcdbfbdd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionWrapper.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionWrapper.java @@ -237,7 +237,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws } } - private Map toMap(WatchExecutionContext ctx) { + private static Map toMap(WatchExecutionContext ctx) { Map model = new HashMap<>(); model.put("id", ctx.id().value()); model.put("watch_id", ctx.id().watchId()); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoService.java index c65710d38fd38..49e00588746fd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoService.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoService.java @@ -156,7 +156,7 @@ public char[] decrypt(char[] chars) { * @param chars the chars to check if they are encrypted * @return true is data is encrypted */ - protected boolean isEncrypted(char[] chars) { + protected static boolean isEncrypted(char[] chars) { return CharArrays.charsBeginsWith(ENCRYPTED_TEXT_PREFIX, chars); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java index b30a7f5360f0a..41e89a4403d17 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java @@ -297,7 +297,7 @@ public void testSnapshotUserRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("snapshot_user"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("snapshot_user"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -372,7 +372,7 @@ public void testIngestAdminRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("ingest_admin"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("ingest_admin"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -414,7 +414,7 @@ public void testKibanaSystemRole() { () -> AuthenticationTestHelper.builder().build() ); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("kibana_system"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("kibana_system"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -1339,7 +1339,7 @@ public void testKibanaAdminRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("kibana_admin"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("kibana_admin"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); assertThat(roleDescriptor.getMetadata(), not(hasEntry("_deprecated", true))); @@ -1400,7 +1400,7 @@ public void testKibanaUserRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("kibana_user"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("kibana_user"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); assertThat(roleDescriptor.getMetadata(), hasEntry("_deprecated", true)); @@ -1470,7 +1470,7 @@ public void testMonitoringUserRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("monitoring_user"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("monitoring_user"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -1598,7 +1598,7 @@ public void testRemoteMonitoringAgentRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("remote_monitoring_agent"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("remote_monitoring_agent"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -1777,7 +1777,7 @@ public void testRemoteMonitoringCollectorRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("remote_monitoring_collector"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("remote_monitoring_collector"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2046,7 +2046,7 @@ public void testReportingUserRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("reporting_user"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("reporting_user"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); assertThat(roleDescriptor.getMetadata(), hasEntry("_deprecated", true)); @@ -2102,7 +2102,7 @@ public void testSuperuserRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("superuser"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("superuser"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2229,7 +2229,7 @@ public void testLogstashSystemRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("logstash_system"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("logstash_system"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2267,7 +2267,7 @@ public void testBeatsAdminRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - final RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("beats_admin"); + final RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("beats_admin"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2318,7 +2318,7 @@ public void testBeatsSystemRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor(UsernamesField.BEATS_ROLE); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor(UsernamesField.BEATS_ROLE); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2360,7 +2360,7 @@ public void testAPMSystemRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor(UsernamesField.APM_ROLE); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor(UsernamesField.APM_ROLE); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2413,7 +2413,7 @@ public void testAPMUserRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - final RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("apm_user"); + final RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("apm_user"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2496,7 +2496,7 @@ public void testMachineLearningAdminRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("machine_learning_admin"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("machine_learning_admin"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2636,7 +2636,7 @@ public void testMachineLearningUserRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("machine_learning_user"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("machine_learning_user"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2761,8 +2761,8 @@ public void testTransformAdminRole() { final Authentication authentication = AuthenticationTestHelper.builder().build(); RoleDescriptor[] roleDescriptors = { - new ReservedRolesStore().roleDescriptor("data_frame_transforms_admin"), - new ReservedRolesStore().roleDescriptor("transform_admin") }; + ReservedRolesStore.roleDescriptor("data_frame_transforms_admin"), + ReservedRolesStore.roleDescriptor("transform_admin") }; for (RoleDescriptor roleDescriptor : roleDescriptors) { assertNotNull(roleDescriptor); @@ -2850,8 +2850,8 @@ public void testTransformUserRole() { final Authentication authentication = AuthenticationTestHelper.builder().build(); RoleDescriptor[] roleDescriptors = { - new ReservedRolesStore().roleDescriptor("data_frame_transforms_user"), - new ReservedRolesStore().roleDescriptor("transform_user") }; + ReservedRolesStore.roleDescriptor("data_frame_transforms_user"), + ReservedRolesStore.roleDescriptor("transform_user") }; for (RoleDescriptor roleDescriptor : roleDescriptors) { assertNotNull(roleDescriptor); @@ -2943,7 +2943,7 @@ public void testWatcherAdminRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("watcher_admin"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("watcher_admin"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -2974,7 +2974,7 @@ public void testWatcherUserRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("watcher_user"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("watcher_user"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -3009,7 +3009,7 @@ public void testPredefinedViewerRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("viewer"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("viewer"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -3080,7 +3080,7 @@ public void testPredefinedEditorRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("editor"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("editor"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -3150,7 +3150,7 @@ public void testPredefinedEditorRole() { } public void testRemoteIndicesPrivilegesForSuperuserRole() { - final RoleDescriptor superuserRoleDescriptor = new ReservedRolesStore().roleDescriptor("superuser"); + final RoleDescriptor superuserRoleDescriptor = ReservedRolesStore.roleDescriptor("superuser"); final Role superuserRole = Role.buildFromRoleDescriptor( superuserRoleDescriptor, new FieldPermissionsCache(Settings.EMPTY), @@ -3172,7 +3172,7 @@ public void testRemoteIndicesPrivilegesForSuperuserRole() { public void testRemoteIndicesPrivileges() { final List rolesWithRemoteIndicesPrivileges = new ArrayList<>(); - for (RoleDescriptor roleDescriptor : new ReservedRolesStore().roleDescriptors()) { + for (RoleDescriptor roleDescriptor : ReservedRolesStore.roleDescriptors()) { if (roleDescriptor.getName().equals("superuser")) { continue; // superuser is tested separately } @@ -3296,7 +3296,7 @@ public void testLogstashAdminRole() { final TransportRequest request = mock(TransportRequest.class); final Authentication authentication = AuthenticationTestHelper.builder().build(); - RoleDescriptor roleDescriptor = new ReservedRolesStore().roleDescriptor("logstash_admin"); + RoleDescriptor roleDescriptor = ReservedRolesStore.roleDescriptor("logstash_admin"); assertNotNull(roleDescriptor); assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true)); @@ -3397,7 +3397,7 @@ public void testIncludeReservedRoles() { assertThat(roleRetrievalResult.isSuccess(), is(true)); assertThat(roleRetrievalResult.getDescriptors().stream().map(RoleDescriptor::getName).toList(), contains(roleName)); - assertThat(reservedRolesStore.roleDescriptor(roleName), notNullValue()); + assertThat(ReservedRolesStore.roleDescriptor(roleName), notNullValue()); } else { assertThat(ReservedRolesStore.isReserved(roleName), is(false)); assertThat(ReservedRolesStore.names(), not(hasItem(roleName))); @@ -3407,12 +3407,12 @@ public void testIncludeReservedRoles() { assertThat(roleRetrievalResult.isSuccess(), is(true)); assertThat(roleRetrievalResult.getDescriptors(), emptyIterable()); - assertThat(reservedRolesStore.roleDescriptor(roleName), nullValue()); + assertThat(ReservedRolesStore.roleDescriptor(roleName), nullValue()); } } assertThat( - reservedRolesStore.roleDescriptors().stream().map(RoleDescriptor::getName).collect(Collectors.toUnmodifiableSet()), + ReservedRolesStore.roleDescriptors().stream().map(RoleDescriptor::getName).collect(Collectors.toUnmodifiableSet()), equalTo(includedRoles) ); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoServiceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoServiceTests.java index d23c21f88c9c3..f48a02189ab8e 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoServiceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoServiceTests.java @@ -45,12 +45,12 @@ public void testEncryptionAndDecryptionChars() throws Exception { public void testEncryptedChar() throws Exception { CryptoService service = new CryptoService(settings); - assertThat(service.isEncrypted((char[]) null), is(false)); - assertThat(service.isEncrypted(new char[0]), is(false)); - assertThat(service.isEncrypted(new char[CryptoService.ENCRYPTED_TEXT_PREFIX.length()]), is(false)); - assertThat(service.isEncrypted(CryptoService.ENCRYPTED_TEXT_PREFIX.toCharArray()), is(true)); - assertThat(service.isEncrypted(randomAlphaOfLengthBetween(0, 100).toCharArray()), is(false)); - assertThat(service.isEncrypted(service.encrypt(randomAlphaOfLength(10).toCharArray())), is(true)); + assertThat(CryptoService.isEncrypted((char[]) null), is(false)); + assertThat(CryptoService.isEncrypted(new char[0]), is(false)); + assertThat(CryptoService.isEncrypted(new char[CryptoService.ENCRYPTED_TEXT_PREFIX.length()]), is(false)); + assertThat(CryptoService.isEncrypted(CryptoService.ENCRYPTED_TEXT_PREFIX.toCharArray()), is(true)); + assertThat(CryptoService.isEncrypted(randomAlphaOfLengthBetween(0, 100).toCharArray()), is(false)); + assertThat(CryptoService.isEncrypted(service.encrypt(randomAlphaOfLength(10).toCharArray())), is(true)); } public void testErrorMessageWhenSecureEncryptionKeySettingDoesNotExist() throws Exception { diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/RestDeprecationInfoAction.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/RestDeprecationInfoAction.java index 8aeac3d3881c6..92a2242d114f9 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/RestDeprecationInfoAction.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/RestDeprecationInfoAction.java @@ -45,7 +45,7 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client } } - private RestChannelConsumer handleGet(final RestRequest request, NodeClient client) { + private static RestChannelConsumer handleGet(final RestRequest request, NodeClient client) { Request infoRequest = new Request(Strings.splitStringByCommaToArray(request.param("index"))); return channel -> client.execute(DeprecationInfoAction.INSTANCE, infoRequest, new RestToXContentListener<>(channel)); } diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TransformDeprecationChecker.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TransformDeprecationChecker.java index df2c6c1d247d4..45384afbec59e 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TransformDeprecationChecker.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TransformDeprecationChecker.java @@ -43,7 +43,7 @@ public String getName() { return TRANSFORM_DEPRECATION_KEY; } - private void recursiveGetTransformsAndCollectDeprecations( + private static void recursiveGetTransformsAndCollectDeprecations( Components components, List issues, PageParams page, diff --git a/x-pack/plugin/enrich/qa/common/src/main/java/org/elasticsearch/test/enrich/CommonEnrichRestTestCase.java b/x-pack/plugin/enrich/qa/common/src/main/java/org/elasticsearch/test/enrich/CommonEnrichRestTestCase.java index 86624cdd5cec9..2878b36b0248c 100644 --- a/x-pack/plugin/enrich/qa/common/src/main/java/org/elasticsearch/test/enrich/CommonEnrichRestTestCase.java +++ b/x-pack/plugin/enrich/qa/common/src/main/java/org/elasticsearch/test/enrich/CommonEnrichRestTestCase.java @@ -77,7 +77,7 @@ public void deletePipelinesAndPolicies() throws Exception { } @SuppressWarnings("unchecked") - private Property unsafeGetProperty(Map map, String key) { + private static Property unsafeGetProperty(Map map, String key) { return (Property) map.get(key); } diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichCache.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichCache.java index abc811afa8be4..749bce59a4bbb 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichCache.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichCache.java @@ -95,7 +95,7 @@ private String getEnrichIndexKey(SearchRequest searchRequest) { return ia.getIndices().get(0).getName(); } - List> toCacheValue(SearchResponse response) { + static List> toCacheValue(SearchResponse response) { List> result = new ArrayList<>(response.getHits().getHits().length); for (SearchHit hit : response.getHits()) { result.add(deepCopy(hit.getSourceAsMap(), true)); diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyMaintenanceService.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyMaintenanceService.java index 7d1c52cf8a1f6..502f71d0f225a 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyMaintenanceService.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyMaintenanceService.java @@ -165,7 +165,11 @@ void cleanUpEnrichIndices() { deleteIndices(removeIndices); } - private boolean indexUsedByPolicy(IndexMetadata indexMetadata, Map policies, Set inflightPolicyIndices) { + private static boolean indexUsedByPolicy( + IndexMetadata indexMetadata, + Map policies, + Set inflightPolicyIndices + ) { String indexName = indexMetadata.getIndex().getName(); logger.debug("Checking if should remove enrich index [{}]", indexName); // First ignore the index entirely if it is in the inflightPolicyIndices set as it is actively being worked on diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunner.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunner.java index 3f77dc9d722ab..48b9e94cb71e9 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunner.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunner.java @@ -143,7 +143,7 @@ public void run() { } } - private List> toMappings(GetIndexResponse response) { + private static List> toMappings(GetIndexResponse response) { return response.mappings().values().stream().map(MappingMetadata::getSourceAsMap).collect(Collectors.toList()); } diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichProcessorFactory.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichProcessorFactory.java index 9675d7e3e36b6..907ebb0c9ce3a 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichProcessorFactory.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichProcessorFactory.java @@ -136,7 +136,7 @@ public void accept(ClusterState state) { handler.accept(response, null); } else { originClient.execute(EnrichCoordinatorProxyAction.INSTANCE, req, ActionListener.wrap(resp -> { - List> value = enrichCache.toCacheValue(resp); + List> value = EnrichCache.toCacheValue(resp); enrichCache.put(req, value); handler.accept(EnrichCache.deepCopy(value, false), null); }, e -> { handler.accept(null, e); })); diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java index 08cd87a78d874..df8ea5344708d 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java @@ -155,7 +155,7 @@ private boolean assertSearchSource() { return true; } - private SearchSourceBuilder copy(SearchSourceBuilder source) { + private static SearchSourceBuilder copy(SearchSourceBuilder source) { NamedWriteableRegistry registry = new NamedWriteableRegistry(new SearchModule(Settings.EMPTY, List.of()).getNamedWriteables()); try (BytesStreamOutput output = new BytesStreamOutput()) { source.writeTo(output); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java index 4d5ea0b5a3d01..be0d38acf323e 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java @@ -204,12 +204,15 @@ public void onFailure(Exception e) { ); } - private void addSearchApplicationsUsage(ListSearchApplicationAction.Response response, Map searchApplicationsUsage) { + private static void addSearchApplicationsUsage( + ListSearchApplicationAction.Response response, + Map searchApplicationsUsage + ) { long count = response.queryPage().count(); searchApplicationsUsage.put(EnterpriseSearchFeatureSetUsage.COUNT, count); } - private void addAnalyticsCollectionsUsage( + private static void addAnalyticsCollectionsUsage( GetAnalyticsCollectionAction.Response response, Map analyticsCollectionsUsage ) { diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/AnalyticsCollectionResolver.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/AnalyticsCollectionResolver.java index 13e2b9528c1a0..72ffc1b978304 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/AnalyticsCollectionResolver.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/AnalyticsCollectionResolver.java @@ -104,7 +104,7 @@ public List collections(ClusterState state, String... expre return new ArrayList<>(collections.values()); } - private boolean matchExpression(String collectionName, String expression) { + private static boolean matchExpression(String collectionName, String expression) { if (Strings.isNullOrEmpty(expression)) { return false; } @@ -120,7 +120,7 @@ private boolean matchExpression(String collectionName, String expression) { return collectionName.equals(expression); } - private boolean matchAnyExpression(String collectionName, String... expressions) { + private static boolean matchAnyExpression(String collectionName, String... expressions) { if (expressions.length < 1) { return true; } @@ -128,7 +128,7 @@ private boolean matchAnyExpression(String collectionName, String... expressions) return Arrays.stream(expressions).anyMatch(expression -> matchExpression(collectionName, expression)); } - private boolean matchAnyExpression(AnalyticsCollection collection, String... expressions) { + private static boolean matchAnyExpression(AnalyticsCollection collection, String... expressions) { return matchAnyExpression(collection.getName(), expressions); } } diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/RestPostAnalyticsEventAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/RestPostAnalyticsEventAction.java index 0e3bb7150c45e..34292c4669333 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/RestPostAnalyticsEventAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/RestPostAnalyticsEventAction.java @@ -56,7 +56,7 @@ protected RestChannelConsumer innerPrepareRequest(RestRequest restRequest, NodeC ); } - private InetAddress getClientAddress(RestRequest restRequest, Map> headers) { + private static InetAddress getClientAddress(RestRequest restRequest, Map> headers) { InetAddress remoteAddress = restRequest.getHttpChannel().getRemoteAddress().getAddress(); if (headers.containsKey(X_FORWARDED_FOR_HEADER)) { final List addresses = headers.get(X_FORWARDED_FOR_HEADER); @@ -71,7 +71,7 @@ private InetAddress getClientAddress(RestRequest restRequest, Map sourceTuple = restRequest.contentOrSourceParam(); PostAnalyticsEventAction.RequestBuilder builder = PostAnalyticsEventAction.Request.builder( diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesIndexService.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesIndexService.java index 01807fd986947..a2ad6a59e54fe 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesIndexService.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRulesIndexService.java @@ -211,7 +211,7 @@ public void onFailure(Exception e) { } @SuppressWarnings("unchecked") - private List parseCriteria(List> rawCriteria) { + private static List parseCriteria(List> rawCriteria) { List criteria = new ArrayList<>(rawCriteria.size()); for (Map entry : rawCriteria) { criteria.add( diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplicationIndexService.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplicationIndexService.java index 51b55a0a1c033..46e4d45f2c146 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplicationIndexService.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplicationIndexService.java @@ -206,12 +206,7 @@ public void getSearchApplication(String resourceName, ActionListener index.getName()) - .toArray(String[]::new); + return clusterService.state().metadata().aliasedIndices(searchApplicationName).stream().map(Index::getName).toArray(String[]::new); } private static String getSearchAliasName(SearchApplication app) { diff --git a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/BaseEqlSpecTestCase.java b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/BaseEqlSpecTestCase.java index 11dc831e8e846..e11d1cab8eaa7 100644 --- a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/BaseEqlSpecTestCase.java +++ b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/BaseEqlSpecTestCase.java @@ -70,7 +70,7 @@ public void setup() throws Exception { } } - private boolean doWithRequest(Request request, RestClient client, Function consumer) { + private static boolean doWithRequest(Request request, RestClient client, Function consumer) { try { return consumer.apply(client.performRequest(request)); } catch (IOException e) { @@ -228,7 +228,7 @@ public String toString() { } - private String eventsToString(List> events) { + private static String eventsToString(List> events) { StringJoiner sj = new StringJoiner(",", "[", "]"); for (Map event : events) { sj.add(event.get("_id") + "|" + event.get("_index")); @@ -301,7 +301,7 @@ public String toString() { ); } - private String keysToString(List keys) { + private static String keysToString(List keys) { StringJoiner sj = new StringJoiner(",", "[", "]"); for (Object key : keys) { sj.add(key.toString()); diff --git a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/EqlRestTestCase.java b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/EqlRestTestCase.java index 074fce78e6b93..65ed174f55625 100644 --- a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/EqlRestTestCase.java +++ b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/EqlRestTestCase.java @@ -185,7 +185,7 @@ public void testUnicodeChars() throws Exception { deleteIndexWithProvisioningClient("test"); } - private void bulkIndex(String bulk) throws IOException { + private static void bulkIndex(String bulk) throws IOException { Request bulkRequest = new Request("POST", "/_bulk"); bulkRequest.setJsonEntity(bulk); bulkRequest.addParameter("refresh", "true"); diff --git a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/stats/EqlUsageRestTestCase.java b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/stats/EqlUsageRestTestCase.java index 7c1804f2a5a32..2626fcfda1ef1 100644 --- a/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/stats/EqlUsageRestTestCase.java +++ b/x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/stats/EqlUsageRestTestCase.java @@ -103,7 +103,7 @@ public void getBaseMetrics() throws UnsupportedOperationException, IOException { * } */ @SuppressWarnings({ "unchecked", "rawtypes" }) - private Map getFeaturesMetrics(Map perNodeStats) { + private static Map getFeaturesMetrics(Map perNodeStats) { Map featuresMetrics = (Map) ((Map) perNodeStats.get("stats")).get("features"); featuresMetrics.putAll((Map) featuresMetrics.get("keys")); featuresMetrics.putAll((Map) featuresMetrics.get("sequences")); @@ -306,7 +306,7 @@ private void assertAllFailedQueryMetrics(int allFailedQueries, Map getStats() throws UnsupportedOperationException, IOException { + private static Map getStats() throws UnsupportedOperationException, IOException { Request request = new Request("GET", "/_eql/stats"); Map responseAsMap; try (InputStream content = client().performRequest(request).getEntity().getContent()) { @@ -349,7 +349,7 @@ private void assertFeatureMetric(int expected, Map responseAsMap } @SuppressWarnings({ "unchecked", "rawtypes" }) - private void assertQueryMetric(int expected, Map responseAsMap, String queryType, String metric) { + private static void assertQueryMetric(int expected, Map responseAsMap, String queryType, String metric) { List>> nodesListStats = (List) responseAsMap.get("stats"); int actualMetricValue = 0; for (Map perNodeStats : nodesListStats) { @@ -360,7 +360,7 @@ private void assertQueryMetric(int expected, Map responseAsMap, assertEquals(expected, actualMetricValue); } - private void assertAllQueryMetric(int expected, Map responseAsMap, String metric) { + private static void assertAllQueryMetric(int expected, Map responseAsMap, String metric) { assertQueryMetric(expected, responseAsMap, "_all", metric); } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/analysis/Verifier.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/analysis/Verifier.java index c39d850d69ed9..cbede5871f275 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/analysis/Verifier.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/analysis/Verifier.java @@ -234,7 +234,7 @@ Collection verify(LogicalPlan plan) { return failures; } - private void checkJoinKeyTypes(LogicalPlan plan, Set localFailures) { + private static void checkJoinKeyTypes(LogicalPlan plan, Set localFailures) { if (plan instanceof Join join) { List queries = join.queries(); KeyedFilter until = join.until(); diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/assembler/ExecutionManager.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/assembler/ExecutionManager.java index 508dac362e028..dea45e4b9d766 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/assembler/ExecutionManager.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/assembler/ExecutionManager.java @@ -238,7 +238,7 @@ public Executable assemble(List> listOfKeys, List ); } - private boolean[] toMissing(List criteria) { + private static boolean[] toMissing(List criteria) { boolean[] result = new boolean[criteria.size()]; for (int i = 0; i < criteria.size(); i++) { result[i] = criteria.get(i).missing(); @@ -246,7 +246,7 @@ private boolean[] toMissing(List criteria) { return result; } - private HitExtractor timestampExtractor(HitExtractor hitExtractor) { + private static HitExtractor timestampExtractor(HitExtractor hitExtractor) { if (hitExtractor instanceof FieldHitExtractor fe) { return (fe instanceof TimestampFieldHitExtractor) ? hitExtractor : new TimestampFieldHitExtractor(fe); } @@ -265,7 +265,7 @@ private List hitExtractors(List exps, FieldE return extractors; } - private List compositeKeyExtractors(List exps, FieldExtractorRegistry registry) { + private static List compositeKeyExtractors(List exps, FieldExtractorRegistry registry) { List extractors = new ArrayList<>(exps.size()); for (Expression exp : exps) { extractors.add(RuntimeUtils.createBucketExtractor(registry.compositeKeyExtraction(exp))); diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/assembler/SampleQueryRequest.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/assembler/SampleQueryRequest.java index 4a7f521c20050..873eda29dcdbf 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/assembler/SampleQueryRequest.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/assembler/SampleQueryRequest.java @@ -187,7 +187,7 @@ public void withCompositeAggregation() { searchSource.aggregation(agg); } - private boolean isOptionalAttribute(Attribute a) { + private static boolean isOptionalAttribute(Attribute a) { return a instanceof OptionalMissingAttribute || a instanceof OptionalResolvedAttribute; } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/TumblingWindow.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/TumblingWindow.java index 04c64202fd3e4..bbee76e976f92 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/TumblingWindow.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/sequence/TumblingWindow.java @@ -627,7 +627,7 @@ private void secondaryCriterion(WindowInfo window, int currentStage, ActionListe /** * Trim hits outside the (upper) limit. */ - private List trim(List searchHits, SequenceCriterion criterion, Ordinal boundary) { + private static List trim(List searchHits, SequenceCriterion criterion, Ordinal boundary) { int offset = 0; for (int i = searchHits.size() - 1; i >= 0; i--) { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/optimizer/Optimizer.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/optimizer/Optimizer.java index 3396222d9c2c6..5bccf013bc789 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/optimizer/Optimizer.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/optimizer/Optimizer.java @@ -403,7 +403,7 @@ protected LogicalPlan rule(AbstractJoin join) { return join; } - private List detectKeyConstraints(Expression condition, KeyedFilter filter) { + private static List detectKeyConstraints(Expression condition, KeyedFilter filter) { List constraints = new ArrayList<>(); List keys = filter.keys(); @@ -430,7 +430,7 @@ private List detectKeyConstraints(Expression condition, KeyedFilter } // adapt constraint to the given filter by replacing the keys accordingly in the expressions - private KeyedFilter addConstraint(KeyedFilter k, List constraints) { + private static KeyedFilter addConstraint(KeyedFilter k, List constraints) { Expression constraint = Predicates.combineAnd( constraints.stream().map(c -> c.constraintFor(k)).filter(Objects::nonNull).collect(toList()) ); diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/plan/physical/EsQueryExec.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/plan/physical/EsQueryExec.java index cedd4ec8d035c..4877b4d909a72 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/plan/physical/EsQueryExec.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/plan/physical/EsQueryExec.java @@ -75,7 +75,7 @@ public void execute(EqlSession session, ActionListener listener) { new BasicQueryClient(session).query(request, new AsEventListener(listener)); } - private boolean shouldReverse(QueryRequest query) { + private static boolean shouldReverse(QueryRequest query) { SearchSourceBuilder searchSource = query.searchSource(); // since all results need to be ASC, use this hack to figure out whether the results need to be flipped for (SortBuilder sort : searchSource.sorts()) { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/querydsl/container/FieldExtractorRegistry.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/querydsl/container/FieldExtractorRegistry.java index d15326e9da0ea..30b827c87603d 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/querydsl/container/FieldExtractorRegistry.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/querydsl/container/FieldExtractorRegistry.java @@ -34,7 +34,7 @@ public FieldExtraction compositeKeyExtraction(Expression expression) { return cache.computeIfAbsent(Expressions.id(expression), k -> createKeyExtractionFor(expression)); } - private FieldExtraction createKeyExtractionFor(Expression expression) { + private static FieldExtraction createKeyExtractionFor(Expression expression) { if (expression instanceof FieldAttribute fieldAttribute) { FieldAttribute fa = fieldAttribute.exactAttribute(); if (fa.isNested()) { @@ -48,7 +48,7 @@ private FieldExtraction createKeyExtractionFor(Expression expression) { throw new EqlIllegalArgumentException("Unsupported expression [{}]", expression); } - private FieldExtraction createFieldExtractionFor(Expression expression) { + private static FieldExtraction createFieldExtractionFor(Expression expression) { if (expression instanceof FieldAttribute fieldAttribute) { FieldAttribute fa = fieldAttribute.exactAttribute(); if (fa.isNested()) { @@ -66,7 +66,7 @@ private FieldExtraction createFieldExtractionFor(Expression expression) { throw new EqlIllegalArgumentException("Unsupported expression [{}]", expression); } - private FieldExtraction topHitFieldExtractor(FieldAttribute fieldAttr) { + private static FieldExtraction topHitFieldExtractor(FieldAttribute fieldAttr) { return new SearchHitFieldRef(fieldAttr.name(), fieldAttr.field().getDataType(), fieldAttr.field().isAlias()); } } diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/session/EqlSession.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/session/EqlSession.java index 2882d083532e8..ff64b4c3e2a0f 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/session/EqlSession.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/session/EqlSession.java @@ -146,7 +146,7 @@ private LogicalPlan postAnalyze(LogicalPlan verified) { return postAnalyzer.postAnalyze(verified, configuration); } - private LogicalPlan doParse(String eql, ParserParams params) { + private static LogicalPlan doParse(String eql, ParserParams params) { return new EqlParser().createStatement(eql, params); } } diff --git a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java index 2073d2067445b..21f0e846ebfa6 100644 --- a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java +++ b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/Fleet.java @@ -156,7 +156,7 @@ public String getFeatureDescription() { return "Manages configuration for Fleet"; } - private SystemIndexDescriptor fleetActionsSystemIndexDescriptor() { + private static SystemIndexDescriptor fleetActionsSystemIndexDescriptor() { PutIndexTemplateRequest request = new PutIndexTemplateRequest(); request.source(loadTemplateSource("/fleet-actions.json", FLEET_ACTIONS_MAPPINGS_VERSION), XContentType.JSON); @@ -174,7 +174,7 @@ private SystemIndexDescriptor fleetActionsSystemIndexDescriptor() { .build(); } - private SystemIndexDescriptor fleetAgentsSystemIndexDescriptor() { + private static SystemIndexDescriptor fleetAgentsSystemIndexDescriptor() { PutIndexTemplateRequest request = new PutIndexTemplateRequest(); request.source(loadTemplateSource("/fleet-agents.json", FLEET_AGENTS_MAPPINGS_VERSION), XContentType.JSON); @@ -192,7 +192,7 @@ private SystemIndexDescriptor fleetAgentsSystemIndexDescriptor() { .build(); } - private SystemIndexDescriptor fleetEnrollmentApiKeysSystemIndexDescriptor() { + private static SystemIndexDescriptor fleetEnrollmentApiKeysSystemIndexDescriptor() { PutIndexTemplateRequest request = new PutIndexTemplateRequest(); request.source( loadTemplateSource("/fleet-enrollment-api-keys.json", FLEET_ENROLLMENT_API_KEYS_MAPPINGS_VERSION), @@ -213,7 +213,7 @@ private SystemIndexDescriptor fleetEnrollmentApiKeysSystemIndexDescriptor() { .build(); } - private SystemIndexDescriptor fleetSecretsSystemIndexDescriptor() { + private static SystemIndexDescriptor fleetSecretsSystemIndexDescriptor() { PutIndexTemplateRequest request = new PutIndexTemplateRequest(); request.source(loadTemplateSource("/fleet-secrets.json", FLEET_SECRETS_MAPPINGS_VERSION), XContentType.JSON); return SystemIndexDescriptor.builder() @@ -229,7 +229,7 @@ private SystemIndexDescriptor fleetSecretsSystemIndexDescriptor() { .build(); } - private SystemIndexDescriptor fleetPoliciesSystemIndexDescriptor() { + private static SystemIndexDescriptor fleetPoliciesSystemIndexDescriptor() { PutIndexTemplateRequest request = new PutIndexTemplateRequest(); request.source(loadTemplateSource("/fleet-policies.json", FLEET_POLICIES_MAPPINGS_VERSION), XContentType.JSON); @@ -247,7 +247,7 @@ private SystemIndexDescriptor fleetPoliciesSystemIndexDescriptor() { .build(); } - private SystemIndexDescriptor fleetPoliciesLeaderSystemIndexDescriptor() { + private static SystemIndexDescriptor fleetPoliciesLeaderSystemIndexDescriptor() { PutIndexTemplateRequest request = new PutIndexTemplateRequest(); request.source(loadTemplateSource("/fleet-policies-leader.json", FLEET_POLICIES_LEADER_MAPPINGS_VERSION), XContentType.JSON); @@ -265,7 +265,7 @@ private SystemIndexDescriptor fleetPoliciesLeaderSystemIndexDescriptor() { .build(); } - private SystemIndexDescriptor fleetServersSystemIndexDescriptors() { + private static SystemIndexDescriptor fleetServersSystemIndexDescriptors() { PutIndexTemplateRequest request = new PutIndexTemplateRequest(); request.source(loadTemplateSource("/fleet-servers.json", FLEET_SERVERS_MAPPINGS_VERSION), XContentType.JSON); @@ -283,7 +283,7 @@ private SystemIndexDescriptor fleetServersSystemIndexDescriptors() { .build(); } - private SystemIndexDescriptor fleetArtifactsSystemIndexDescriptors() { + private static SystemIndexDescriptor fleetArtifactsSystemIndexDescriptors() { PutIndexTemplateRequest request = new PutIndexTemplateRequest(); request.source(loadTemplateSource("/fleet-artifacts.json", FLEET_ARTIFACTS_MAPPINGS_VERSION), XContentType.JSON); @@ -301,7 +301,7 @@ private SystemIndexDescriptor fleetArtifactsSystemIndexDescriptors() { .build(); } - private SystemDataStreamDescriptor fleetActionsResultsDescriptor() { + private static SystemDataStreamDescriptor fleetActionsResultsDescriptor() { final String source = loadTemplateSource("/fleet-actions-results.json", FLEET_ACTIONS_RESULTS_MAPPINGS_VERSION); try (XContentParser parser = XContentType.JSON.xContent().createParser(XContentParserConfiguration.EMPTY, source)) { ComposableIndexTemplate composableIndexTemplate = ComposableIndexTemplate.parse(parser); @@ -357,7 +357,7 @@ public void cleanUpFeature(ClusterService clusterService, Client client, ActionL } } - private String loadTemplateSource(String resource, int mappingsVersion) { + private static String loadTemplateSource(String resource, int mappingsVersion) { return TemplateUtils.loadTemplate( resource, Version.CURRENT.toString(), diff --git a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsShardAction.java b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsShardAction.java index 8728c63d7df01..a43f0fe94e1b7 100644 --- a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsShardAction.java +++ b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsShardAction.java @@ -206,7 +206,7 @@ private void globalCheckpointAdvanced(final ShardId shardId, final Request reque } } - private void globalCheckpointAdvancementFailure( + private static void globalCheckpointAdvancementFailure( final IndexShard indexShard, final Request request, final Exception e, diff --git a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java index 16a6b98964eab..db825182e4621 100644 --- a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java +++ b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java @@ -550,7 +550,7 @@ private double getExpandTotalSignalStrength(Hop lastHop, Hop currentHop, Sampler }); } - private void addUserDefinedIncludesToQuery(Hop hop, BoolQueryBuilder sourceTermsOrClause) { + private static void addUserDefinedIncludesToQuery(Hop hop, BoolQueryBuilder sourceTermsOrClause) { for (int i = 0; i < hop.getNumberVertexRequests(); i++) { VertexRequest vr = hop.getVertexRequest(i); if (vr.hasIncludeClauses()) { @@ -559,7 +559,7 @@ private void addUserDefinedIncludesToQuery(Hop hop, BoolQueryBuilder sourceTerms } } - private void addBigOrClause(Map> lastHopFindings, BoolQueryBuilder sourceTermsOrClause) { + private static void addBigOrClause(Map> lastHopFindings, BoolQueryBuilder sourceTermsOrClause) { int numClauses = sourceTermsOrClause.should().size(); for (Entry> entry : lastHopFindings.entrySet()) { numClauses += entry.getValue().size(); @@ -752,7 +752,7 @@ private double getInitialTotalSignalStrength(Hop rootHop, Sampler sample) { } } - private void addNormalizedBoosts(BoolQueryBuilder includesContainer, VertexRequest vr) { + private static void addNormalizedBoosts(BoolQueryBuilder includesContainer, VertexRequest vr) { TermBoost[] termBoosts = vr.includeValues(); if ((includesContainer.should().size() + termBoosts.length) > BooleanQuery.getMaxClauseCount()) { diff --git a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java index 342d359d94d80..472b6f8087a56 100644 --- a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java +++ b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java @@ -126,7 +126,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC return channel -> client.execute(INSTANCE, graphRequest, new RestToXContentListener<>(channel)); } - private void parseHop(XContentParser parser, Hop currentHop, GraphExploreRequest graphRequest) throws IOException { + private static void parseHop(XContentParser parser, Hop currentHop, GraphExploreRequest graphRequest) throws IOException { String fieldName = null; XContentParser.Token token; @@ -163,7 +163,7 @@ private void parseHop(XContentParser parser, Hop currentHop, GraphExploreRequest } } - private void parseVertices(XContentParser parser, Hop currentHop) throws IOException { + private static void parseVertices(XContentParser parser, Hop currentHop) throws IOException { XContentParser.Token token; String fieldName = null; @@ -320,7 +320,7 @@ private void parseVertices(XContentParser parser, Hop currentHop) throws IOExcep } - private void parseControls(XContentParser parser, GraphExploreRequest graphRequest) throws IOException { + private static void parseControls(XContentParser parser, GraphExploreRequest graphRequest) throws IOException { XContentParser.Token token; String fieldName = null; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportPutSamlServiceProviderAction.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportPutSamlServiceProviderAction.java index 7a1e66b3c1e78..31bcf6f428fe2 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportPutSamlServiceProviderAction.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/TransportPutSamlServiceProviderAction.java @@ -153,7 +153,7 @@ private void writeDocument( ); } - private String deriveDocumentId(SamlServiceProviderDocument document) { + private static String deriveDocumentId(SamlServiceProviderDocument document) { final byte[] sha256 = MessageDigests.sha256().digest(document.entityId.getBytes(StandardCharsets.UTF_8)); return Base64.getUrlEncoder().withoutPadding().encodeToString(sha256); } diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolver.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolver.java index 03e1351dbd782..4ee2b91c5f2f7 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolver.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolver.java @@ -104,7 +104,7 @@ public void resolve(ServiceProviderPrivileges service, ActionListener appPrivileges = response.getApplicationPrivileges().get(service.getApplicationName()); if (appPrivileges == null || appPrivileges.isEmpty()) { return UserPrivileges.noAccess(response.getUsername()); diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SamlAuthnRequestValidator.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SamlAuthnRequestValidator.java index 29b95263e07e8..5c83da57f84a8 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SamlAuthnRequestValidator.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SamlAuthnRequestValidator.java @@ -96,11 +96,11 @@ public void processQueryString(String queryString, ActionListener { try { validateAuthnRequest(authnRequest, sp, parsedQueryString, listener); @@ -180,7 +180,7 @@ private void validateAuthnRequest( org.elasticsearch.core.Strings.format( "Unable to validate signature of authentication request [%s] using credentials [%s]", parsedQueryString.queryString, - samlFactory.describeCredentials(spSigningCredentials) + SamlFactory.describeCredentials(spSigningCredentials) ), listener ); @@ -223,7 +223,7 @@ private void validateAuthnRequest( listener.onResponse(response); } - private void validateNameIdPolicy(AuthnRequest request, SamlServiceProvider sp, Map authnState) { + private static void validateNameIdPolicy(AuthnRequest request, SamlServiceProvider sp, Map authnState) { final NameIDPolicy nameIDPolicy = request.getNameIDPolicy(); if (null != nameIDPolicy) { final String requestedFormat = nameIDPolicy.getFormat(); @@ -246,7 +246,7 @@ private void validateNameIdPolicy(AuthnRequest request, SamlServiceProvider sp, } private boolean validateSignature(ParsedQueryString queryString, Collection credentials) { - final String javaSigAlgorithm = samlFactory.getJavaAlorithmNameFromUri(queryString.sigAlg); + final String javaSigAlgorithm = SamlFactory.getJavaAlorithmNameFromUri(queryString.sigAlg); final byte[] contentBytes = queryString.reconstructQueryParameters().getBytes(StandardCharsets.UTF_8); final byte[] signatureBytes = Base64.getDecoder().decode(queryString.signature); return credentials.stream().anyMatch(credential -> { @@ -264,7 +264,7 @@ private boolean validateSignature(ParsedQueryString queryString, Collection format("Signature verification failed for credential [%s]", samlFactory.describeCredentials(Set.of(credential))), + () -> format("Signature verification failed for credential [%s]", SamlFactory.describeCredentials(Set.of(credential))), e ); return false; @@ -303,7 +303,7 @@ private void checkDestination(AuthnRequest request) { } } - private String checkAcs(AuthnRequest request, SamlServiceProvider sp, Map authnState) { + private static String checkAcs(AuthnRequest request, SamlServiceProvider sp, Map authnState) { final String acs = request.getAssertionConsumerServiceURL(); if (Strings.hasText(acs) == false) { final String message = request.getAssertionConsumerServiceIndex() == null @@ -347,7 +347,7 @@ private byte[] decodeBase64(String content) { } } - private byte[] inflate(byte[] bytes) { + private static byte[] inflate(byte[] bytes) { Inflater inflater = new Inflater(true); try ( ByteArrayInputStream in = new ByteArrayInputStream(bytes); @@ -361,7 +361,7 @@ private byte[] inflate(byte[] bytes) { } } - private String urlEncode(String param) { + private static String urlEncode(String param) { return URLEncoder.encode(param, StandardCharsets.UTF_8); } diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SuccessfulAuthenticationResponseMessageBuilder.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SuccessfulAuthenticationResponseMessageBuilder.java index 003eb3f2c1e75..c59d99c7171c4 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SuccessfulAuthenticationResponseMessageBuilder.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/authn/SuccessfulAuthenticationResponseMessageBuilder.java @@ -98,7 +98,7 @@ public Response build(UserServiceAuthentication user, @Nullable SamlAuthenticati private Response sign(Response response) { final SamlObjectSigner signer = new SamlObjectSigner(samlFactory, idp); - return samlFactory.buildXmlObject(signer.sign(response), Response.class); + return SamlFactory.buildXmlObject(signer.sign(response), Response.class); } private Conditions buildConditions(Instant now, SamlServiceProvider serviceProvider) { @@ -157,7 +157,7 @@ private AuthnStatement buildAuthnStatement(Instant now, UserServiceAuthenticatio return statement; } - private String resolveAuthnClass(Set authenticationMethods, Set networkControls) { + private static String resolveAuthnClass(Set authenticationMethods, Set networkControls) { if (authenticationMethods.contains(AuthenticationMethod.PASSWORD)) { if (networkControls.contains(NetworkControl.IP_FILTER)) { return AuthnContext.IP_PASSWORD_AUTHN_CTX; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlIdPMetadataBuilder.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlIdPMetadataBuilder.java index c580087daf183..58a43307d9b0e 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlIdPMetadataBuilder.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/idp/SamlIdPMetadataBuilder.java @@ -246,7 +246,7 @@ private Organization buildOrganization() { return org; } - private ContactPerson buildContact(SamlIdentityProvider.ContactInfo contact) { + private static ContactPerson buildContact(SamlIdentityProvider.ContactInfo contact) { final GivenName givenName = new GivenNameBuilder().buildObject(); givenName.setValue(contact.givenName); final SurName surName = new SurNameBuilder().buildObject(); diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderDocument.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderDocument.java index c16f27229c5a2..ba2c971f0e0d9 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderDocument.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderDocument.java @@ -163,7 +163,7 @@ public List getIdentityProviderX509MetadataSigningCertificates( return decodeCertificates(this.identityProviderMetadataSigning); } - private List encodeCertificates(Collection certificates) { + private static List encodeCertificates(Collection certificates) { return certificates == null ? List.of() : certificates.stream().map(cert -> { try { return cert.getEncoded(); @@ -173,14 +173,14 @@ private List encodeCertificates(Collection certificates }).map(Base64.getEncoder()::encodeToString).toList(); } - private List decodeCertificates(List encodedCertificates) { + private static List decodeCertificates(List encodedCertificates) { if (encodedCertificates == null || encodedCertificates.isEmpty()) { return List.of(); } - return encodedCertificates.stream().map(this::decodeCertificate).toList(); + return encodedCertificates.stream().map(Certificates::decodeCertificate).toList(); } - private X509Certificate decodeCertificate(String base64Cert) { + private static X509Certificate decodeCertificate(String base64Cert) { final byte[] bytes = base64Cert.getBytes(StandardCharsets.UTF_8); try (InputStream stream = new ByteArrayInputStream(bytes)) { final List certificates = CertParsingUtils.readCertificates(Base64.getDecoder().wrap(stream)); diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderFactory.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderFactory.java index ec8fc728c61f3..25a3ae59f17fd 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderFactory.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderFactory.java @@ -89,7 +89,7 @@ private ServiceProviderPrivileges buildPrivileges(SamlServiceProviderDocument.Pr return new ServiceProviderPrivileges(defaults.applicationName, resource, roleMapping); } - private URL parseUrl(SamlServiceProviderDocument document) { + private static URL parseUrl(SamlServiceProviderDocument document) { final URL acs; try { acs = new URL(document.acs); diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java index ec3973a4b5781..558ac9a20dc0c 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderIndex.java @@ -332,7 +332,7 @@ private void findDocuments(QueryBuilder query, ActionListener } } - private SamlServiceProviderDocument toServiceProviderDocument(String serviceJson) throws IOException { + private static SamlServiceProviderDocument toServiceProviderDocument(String serviceJson) throws IOException { try (XContentParser docParser = parser(new BytesArray(serviceJson))) { return SamlServiceProviderDocument.fromXContent(null, docParser); } @@ -195,7 +195,7 @@ private static XContentParser parser(BytesReference body) throws IOException { return XContentHelper.createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, body, XContentType.JSON); } - private String extractGroup(Matcher matcher, String name) { + private static String extractGroup(Matcher matcher, String name) { try { return matcher.group(name); } catch (IllegalArgumentException e) { diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/support/SamlFactory.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/support/SamlFactory.java index 59dfc0cefc913..a46bea16830f9 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/support/SamlFactory.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/support/SamlFactory.java @@ -78,7 +78,7 @@ public T object(Class type, QName elementName, QName sc return cast(type, elementName, obj); } - private T cast(Class type, QName elementName, XMLObject obj) { + private static T cast(Class type, QName elementName, XMLObject obj) { if (type.isInstance(obj)) { return type.cast(obj); } else { @@ -120,7 +120,7 @@ public String toString(Element element, boolean pretty) { } } - public T buildXmlObject(Element element, Class type) { + public static T buildXmlObject(Element element, Class type) { try { UnmarshallerFactory unmarshallerFactory = getUnmarshallerFactory(); Unmarshaller unmarshaller = unmarshallerFactory.getUnmarshaller(element); @@ -163,26 +163,14 @@ public String getXmlContent(SAMLObject object, boolean prettyPrint) { } } - public boolean elementNameMatches(Element element, String namespace, String localName) { + public static boolean elementNameMatches(Element element, String namespace, String localName) { return localName.equals(element.getLocalName()) && namespace.equals(element.getNamespaceURI()); } - public String text(Element dom, int length) { + public static String text(Element dom, int length) { return text(dom, length, 0); } - public String text(XMLObject xml, int prefixLength, int suffixLength) { - final Element dom = xml.getDOM(); - if (dom == null) { - return null; - } - return text(dom, prefixLength, suffixLength); - } - - public String text(XMLObject xml, int length) { - return text(xml, length, 0); - } - protected static String text(Element dom, int prefixLength, int suffixLength) { final String text = dom.getTextContent().trim(); @@ -202,7 +190,7 @@ protected static String text(Element dom, int prefixLength, int suffixLength) { } } - public String describeCredentials(Collection credentials) { + public static String describeCredentials(Collection credentials) { return credentials.stream().map(c -> { if (c == null) { return ""; @@ -221,7 +209,7 @@ public String describeCredentials(Collection credentials) }).collect(Collectors.joining(",")); } - public Element toDomElement(XMLObject object) { + public static Element toDomElement(XMLObject object) { try { return XMLObjectSupport.marshall(object); } catch (MarshallingException e) { @@ -230,7 +218,7 @@ public Element toDomElement(XMLObject object) { } @SuppressForbidden(reason = "This is the only allowed way to construct a Transformer") - public Transformer getHardenedXMLTransformer() throws TransformerConfigurationException { + public static Transformer getHardenedXMLTransformer() throws TransformerConfigurationException { final TransformerFactory tfactory = TransformerFactory.newInstance(); tfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); tfactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); @@ -282,7 +270,7 @@ public static DocumentBuilder getHardenedBuilder(String[] schemaFiles) throws Pa return documentBuilder; } - public String getJavaAlorithmNameFromUri(String sigAlg) { + public static String getJavaAlorithmNameFromUri(String sigAlg) { return switch (sigAlg) { case "http://www.w3.org/2000/09/xmldsig#dsa-sha1" -> "SHA1withDSA"; case "http://www.w3.org/2000/09/xmldsig#dsa-sha256" -> "SHA256withDSA"; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/support/SamlObjectSigner.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/support/SamlObjectSigner.java index fd4aca48a3b02..cf3c8627acb5c 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/support/SamlObjectSigner.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/support/SamlObjectSigner.java @@ -41,7 +41,7 @@ public Element sign(SignableXMLObject object) { signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256); signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS); object.setSignature(signature); - Element element = samlFactory.toDomElement(object); + Element element = SamlFactory.toDomElement(object); try { AccessController.doPrivileged((PrivilegedExceptionAction) () -> { try (RestorableContextClassLoader ignore = new RestorableContextClassLoader(SignerProvider.class)) { diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/idp/SamlMetadataGeneratorTests.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/idp/SamlMetadataGeneratorTests.java index 4395ada877337..b93e3fe9d7f7f 100644 --- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/idp/SamlMetadataGeneratorTests.java +++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/idp/SamlMetadataGeneratorTests.java @@ -117,7 +117,7 @@ public void testGenerateAndSignMetadata() throws Exception { SamlFactory factory = new SamlFactory(); SamlMetadataGenerator generator = new SamlMetadataGenerator(factory, idp); Element element = generator.possiblySignDescriptor(generator.buildEntityDescriptor(sp), signingCredential); - EntityDescriptor descriptor = factory.buildXmlObject(element, EntityDescriptor.class); + EntityDescriptor descriptor = SamlFactory.buildXmlObject(element, EntityDescriptor.class); Signature signature = descriptor.getSignature(); assertNotNull(signature); SAMLSignatureProfileValidator profileValidator = new SAMLSignatureProfileValidator(); diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java index d80e5d373fe5c..aa489b5d14717 100644 --- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java +++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java @@ -145,7 +145,7 @@ protected T domElementToXmlObject(Element element, Class { AllocateAction allocateAction = (AllocateAction) action; diff --git a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/Logstash.java b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/Logstash.java index ecba96432839b..204bebcff4499 100644 --- a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/Logstash.java +++ b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/Logstash.java @@ -103,7 +103,7 @@ public Collection getSystemIndexDescriptors(Settings sett ); } - private Settings getIndexSettings() { + private static Settings getIndexSettings() { return Settings.builder() .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-1") @@ -111,7 +111,7 @@ private Settings getIndexSettings() { .build(); } - private XContentBuilder getIndexMappings() { + private static XContentBuilder getIndexMappings() { try { final XContentBuilder builder = jsonBuilder(); { diff --git a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/TransportDeletePipelineAction.java b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/TransportDeletePipelineAction.java index b8e5ea26d01f3..4c0e90ce97b1b 100644 --- a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/TransportDeletePipelineAction.java +++ b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/TransportDeletePipelineAction.java @@ -46,7 +46,7 @@ protected void doExecute(Task task, DeletePipelineRequest request, ActionListene ); } - private void handleFailure(Exception e, ActionListener listener) { + private static void handleFailure(Exception e, ActionListener listener) { Throwable cause = ExceptionsHelper.unwrapCause(e); if (cause instanceof IndexNotFoundException) { listener.onResponse(new DeletePipelineResponse(false)); diff --git a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/TransportGetPipelineAction.java b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/TransportGetPipelineAction.java index d9cca1b59e58f..b4b9c4fabac54 100644 --- a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/TransportGetPipelineAction.java +++ b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/TransportGetPipelineAction.java @@ -72,7 +72,7 @@ protected void doExecute(Task task, GetPipelineRequest request, ActionListener wildcardPipelinePatterns = request.ids() .stream() .filter(pipeline -> pipeline.contains(WILDCARD)) - .map(this::toWildcardPipelineIdPattern) + .map(TransportGetPipelineAction::toWildcardPipelineIdPattern) .map(Pattern::compile) .collect(Collectors.toSet()); @@ -129,7 +129,7 @@ private void getPipelinesByIds(Set ids, ActionListener handleFailure(e, listener))); } - private void handleFailure(Exception e, ActionListener listener) { + private static void handleFailure(Exception e, ActionListener listener) { Throwable cause = ExceptionsHelper.unwrapCause(e); if (cause instanceof IndexNotFoundException) { listener.onResponse(new GetPipelineResponse(Map.of())); @@ -202,7 +202,7 @@ private void handleFilteringSearchResponse( } } - private void logFailures(MultiGetResponse multiGetResponse) { + private static void logFailures(MultiGetResponse multiGetResponse) { List ids = Arrays.stream(multiGetResponse.getResponses()) .filter(MultiGetItemResponse::isFailed) .filter(itemResponse -> itemResponse.getFailure() != null) @@ -213,7 +213,7 @@ private void logFailures(MultiGetResponse multiGetResponse) { } } - private String toWildcardPipelineIdPattern(String wildcardPipelineId) { + private static String toWildcardPipelineIdPattern(String wildcardPipelineId) { Matcher matcher = WILDCARD_PATTERN.matcher(wildcardPipelineId); StringBuilder stringBuilder = new StringBuilder(); while (matcher.find()) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java index d2d6bd4fcb443..323f2661d1098 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java @@ -868,7 +868,7 @@ private void disallowMlNodeAttributes(String... mlNodeAttributes) { } } - private void reportClashingNodeAttribute(String attrName) { + private static void reportClashingNodeAttribute(String attrName) { throw new IllegalArgumentException( "Directly setting [" + attrName 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 d16a445133ccb..76710b8eb16c6 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 @@ -249,7 +249,7 @@ private void addJobsUsage(GetJobsStatsAction.Response response, List jobs, List jobsStats = response.getResponse().results(); Map jobMap = jobs.stream().collect(Collectors.toMap(Job::getId, item -> item)); Map allJobsCreatedBy = jobs.stream() - .map(this::jobCreatedBy) + .map(MachineLearningUsageTransportAction::jobCreatedBy) .collect(Collectors.groupingBy(item -> item, Collectors.counting())); ; for (GetJobsStatsAction.Response.JobStats jobStats : jobsStats) { @@ -294,7 +294,7 @@ private void addJobsUsage(GetJobsStatsAction.Response response, List jobs, } } - private String jobCreatedBy(Job job) { + private static String jobCreatedBy(Job job) { Map customSettings = job.getCustomSettings(); if (customSettings == null || customSettings.containsKey(MachineLearningFeatureSetUsage.CREATED_BY) == false) { return "unknown"; @@ -304,7 +304,7 @@ private String jobCreatedBy(Job job) { return customSettings.get(MachineLearningFeatureSetUsage.CREATED_BY).toString().replaceAll("\\W", "_"); } - private Map createJobUsageEntry( + private static Map createJobUsageEntry( long count, StatsAccumulator detectorStats, StatsAccumulator modelSizeStats, @@ -320,7 +320,7 @@ private Map createJobUsageEntry( return usage; } - private void addDatafeedsUsage(GetDatafeedsStatsAction.Response response, Map datafeedsUsage) { + private static void addDatafeedsUsage(GetDatafeedsStatsAction.Response response, Map datafeedsUsage) { Map datafeedCountByState = new HashMap<>(); List datafeedsStats = response.getResponse().results(); @@ -337,13 +337,13 @@ private void addDatafeedsUsage(GetDatafeedsStatsAction.Response response, Map createCountUsageEntry(long count) { + private static Map createCountUsageEntry(long count) { Map usage = new HashMap<>(); usage.put(MachineLearningFeatureSetUsage.COUNT, count); return usage; } - private void addDataFrameAnalyticsStatsUsage( + private static void addDataFrameAnalyticsStatsUsage( GetDataFrameAnalyticsStatsAction.Response response, Map dataframeAnalyticsUsage ) { @@ -371,7 +371,10 @@ private void addDataFrameAnalyticsStatsUsage( } } - private void addDataFrameAnalyticsUsage(GetDataFrameAnalyticsAction.Response response, Map dataframeAnalyticsUsage) { + private static void addDataFrameAnalyticsUsage( + GetDataFrameAnalyticsAction.Response response, + Map dataframeAnalyticsUsage + ) { Map perAnalysisTypeCounterMap = new HashMap<>(); for (DataFrameAnalyticsConfig config : response.getResources().results()) { @@ -405,7 +408,7 @@ private void addInferenceUsage(ActionListener> listener) { } } - private void addDeploymentStats(GetTrainedModelsStatsAction.Response statsResponse, Map inferenceUsage) { + private static void addDeploymentStats(GetTrainedModelsStatsAction.Response statsResponse, Map inferenceUsage) { StatsAccumulator modelSizes = new StatsAccumulator(); int deploymentsCount = 0; double avgTimeSum = 0.0; @@ -442,7 +445,7 @@ private void addDeploymentStats(GetTrainedModelsStatsAction.Response statsRespon ); } - private void addTrainedModelStats( + private static void addTrainedModelStats( GetTrainedModelsAction.Response modelsResponse, GetTrainedModelsStatsAction.Response statsResponse, Map inferenceUsage @@ -492,7 +495,7 @@ private void addTrainedModelStats( } // TODO separate out ours and users models possibly regression vs classification - private void addInferenceIngestUsage(GetTrainedModelsStatsAction.Response statsResponse, Map inferenceUsage) { + private static void addInferenceIngestUsage(GetTrainedModelsStatsAction.Response statsResponse, Map inferenceUsage) { int pipelineCount = 0; StatsAccumulator docCountStats = new StatsAccumulator(); StatsAccumulator timeStats = new StatsAccumulator(); @@ -517,7 +520,7 @@ private void addInferenceIngestUsage(GetTrainedModelsStatsAction.Response statsR inferenceUsage.put("ingest_processors", Collections.singletonMap(MachineLearningFeatureSetUsage.ALL, ingestUsage)); } - private Map getMinMaxSumAsLongsFromStats(StatsAccumulator stats) { + private static Map getMinMaxSumAsLongsFromStats(StatsAccumulator stats) { Map asMap = Maps.newMapWithExpectedSize(3); asMap.put("sum", Double.valueOf(stats.getTotal()).longValue()); asMap.put("min", Double.valueOf(stats.getMin()).longValue()); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAssignmentNotifier.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAssignmentNotifier.java index 2378f0becd959..8f166a22c205b 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAssignmentNotifier.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlAssignmentNotifier.java @@ -75,7 +75,7 @@ public class MlAssignmentNotifier implements ClusterStateListener { clusterService.addListener(this); } - private String executorName() { + private static String executorName() { return ThreadPool.Names.GENERIC; } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportCloseJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportCloseJobAction.java index 178853ad4fa5b..62029e5e9cb98 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportCloseJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportCloseJobAction.java @@ -530,7 +530,7 @@ public void onFailure(Exception e) { } } - private void sendResponseOrFailure( + private static void sendResponseOrFailure( String jobId, ActionListener listener, AtomicArray failures diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteCalendarAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteCalendarAction.java index 407c8cc18ae22..e7afc79bd3644 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteCalendarAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteCalendarAction.java @@ -80,7 +80,7 @@ protected void doExecute(Task task, DeleteCalendarAction.Request request, Action jobResultsProvider.calendar(calendarId, calendarListener); } - private DeleteByQueryRequest buildDeleteByQuery(String calendarId) { + private static DeleteByQueryRequest buildDeleteByQuery(String calendarId) { DeleteByQueryRequest request = new DeleteByQueryRequest(MlMetaIndex.indexName()); request.setSlices(AbstractBulkByScrollRequest.AUTO_SLICES); request.setRefresh(true); 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 ead2d8cda30b3..10679f447db15 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 @@ -115,7 +115,7 @@ private void forceDelete( stopJob(parentTaskClient, request, stopListener); } - private void stopJob( + private static void stopJob( ParentTaskAssigningClient parentTaskClient, DeleteDataFrameAnalyticsAction.Request request, ActionListener listener diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteForecastAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteForecastAction.java index c8da075bc20db..11ad47c00ebd1 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteForecastAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteForecastAction.java @@ -216,7 +216,7 @@ private static Tuple getStatusAndReason(final BulkByScrol return new Tuple<>(status, reason); } - private DeleteByQueryRequest buildDeleteByQuery(String jobId, List forecastsToDelete) { + private static DeleteByQueryRequest buildDeleteByQuery(String jobId, List forecastsToDelete) { BoolQueryBuilder innerBoolQuery = QueryBuilders.boolQuery() .must( QueryBuilders.termsQuery( 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 6057493c95289..7842af8b12993 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 @@ -280,7 +280,7 @@ private void forceDeleteJob( killProcess(parentTaskClient, jobId, killJobListener); } - private void killProcess( + private static void killProcess( ParentTaskAssigningClient parentTaskClient, String jobId, ActionListener listener @@ -300,7 +300,7 @@ private void removePersistentTask(String jobId, ClusterState currentState, Actio } } - private void checkJobIsNotOpen(String jobId, ClusterState state) { + private static void checkJobIsNotOpen(String jobId, ClusterState state) { PersistentTasksCustomMetadata tasks = state.metadata().custom(PersistentTasksCustomMetadata.TYPE); PersistentTasksCustomMetadata.PersistentTask jobTask = MlTasks.getJobTask(jobId, tasks); if (jobTask != null) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportInternalInferModelAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportInternalInferModelAction.java index bc25afba066be..a58ead5cda680 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportInternalInferModelAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportInternalInferModelAction.java @@ -322,7 +322,7 @@ static TrainedModelAssignment pickAssignment(List assign throw new IllegalStateException(); } - private ActionListener collectingListener( + private static ActionListener collectingListener( AtomicInteger count, AtomicArray> results, AtomicReference failure, diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportMlInfoAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportMlInfoAction.java index fe4a341051ee5..6a67f942c0f19 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportMlInfoAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportMlInfoAction.java @@ -115,7 +115,7 @@ private ByteSizeValue defaultModelMemoryLimit() { return defaultLimit; } - private Map datafeedsDefaults() { + private static Map datafeedsDefaults() { Map anomalyDetectorsDefaults = new HashMap<>(); anomalyDetectorsDefaults.put(DatafeedConfig.SCROLL_SIZE.getPreferredName(), DatafeedConfig.DEFAULT_SCROLL_SIZE); return anomalyDetectorsDefaults; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportRevertModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportRevertModelSnapshotAction.java index 81287ce749d83..5450b2752ab97 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportRevertModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportRevertModelSnapshotAction.java @@ -259,7 +259,7 @@ private void revertSnapshot( }, listener::onFailure); } - private void getModelSnapshot( + private static void getModelSnapshot( RevertModelSnapshotAction.Request request, JobResultsProvider provider, Consumer handler, diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsAction.java index ab215106c8ed0..24f3ef90ad76d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsAction.java @@ -340,7 +340,7 @@ private void validateSourceIndexHasAnalyzableData(StartContext startContext, Act validateSourceIndexHasAtLeastOneAnalyzedField(startContext, validateAtLeastOneAnalyzedFieldListener); } - private void validateSourceIndexHasAtLeastOneAnalyzedField(StartContext startContext, ActionListener listener) { + private static void validateSourceIndexHasAtLeastOneAnalyzedField(StartContext startContext, ActionListener listener) { Set requiredFields = startContext.config.getAnalysis() .getRequiredFields() .stream() @@ -415,7 +415,7 @@ private void getProgress(DataFrameAnalyticsConfig config, ActionListener listener diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java index 475ca4ef2a7ce..b02f6339e49c0 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java @@ -431,7 +431,7 @@ public void onFailure(Exception e) { }); } - private ElasticsearchStatusException createUnlicensedError( + private static ElasticsearchStatusException createUnlicensedError( final String datafeedId, final RemoteClusterLicenseChecker.LicenseCheck licenseCheck ) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStopDataFrameAnalyticsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStopDataFrameAnalyticsAction.java index f339376d97a03..961331c33c2ce 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStopDataFrameAnalyticsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStopDataFrameAnalyticsAction.java @@ -290,7 +290,7 @@ private void forceStop( } } - private void sendResponseOrFailure( + private static void sendResponseOrFailure( String analyticsId, ActionListener listener, AtomicArray failures diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStopDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStopDatafeedAction.java index 614fcfaed6120..2c9668a504b55 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStopDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStopDatafeedAction.java @@ -456,7 +456,7 @@ protected void doRun() { })); } - private void sendResponseOrFailure( + private static void sendResponseOrFailure( String datafeedId, ActionListener listener, AtomicArray failures diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/EclatMapReducer.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/EclatMapReducer.java index f6affc3d12340..1a54533ae9262 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/EclatMapReducer.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/frequentitemsets/EclatMapReducer.java @@ -240,7 +240,7 @@ protected ImmutableTransactionStore mapFinalize(HashBasedTransactionStore transa /** * rewrites items that use ordinals to their real values */ - private ImmutableTransactionStore rewriteOrdinalItems( + private static ImmutableTransactionStore rewriteOrdinalItems( ImmutableTransactionStore transactionStore, List ordinalLookups ) throws IOException { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/heuristic/PValueScore.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/heuristic/PValueScore.java index 402f9d2eb9d22..36801d89b157a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/heuristic/PValueScore.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/aggs/heuristic/PValueScore.java @@ -199,7 +199,7 @@ public double getScore(long subsetFreq, long subsetSize, long supersetFreq, long return FastMath.max(-FastMath.log(FastMath.max(pValue, Double.MIN_NORMAL)), 0.0); } - private double eps(double value) { + private static double eps(double value) { return Math.max(0.05 * value + 0.5, 1.0); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlProcessorAutoscalingDecider.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlProcessorAutoscalingDecider.java index 9dc0604bb2e26..5605a80a7454c 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlProcessorAutoscalingDecider.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlProcessorAutoscalingDecider.java @@ -108,7 +108,10 @@ public MlProcessorAutoscalingCapacity scale( .build(); } - private boolean hasUnsatisfiedDeployments(TrainedModelAssignmentMetadata trainedModelAssignmentMetadata, List mlNodes) { + private static boolean hasUnsatisfiedDeployments( + TrainedModelAssignmentMetadata trainedModelAssignmentMetadata, + List mlNodes + ) { final Set mlNodeIds = mlNodes.stream().map(DiscoveryNode::getId).collect(Collectors.toSet()); return trainedModelAssignmentMetadata.allAssignments() .values() @@ -117,7 +120,9 @@ private boolean hasUnsatisfiedDeployments(TrainedModelAssignmentMetadata trained .anyMatch(deployment -> deployment.isSatisfied(mlNodeIds) == false); } - private MlProcessorAutoscalingCapacity.Builder computeRequiredCapacity(TrainedModelAssignmentMetadata trainedModelAssignmentMetadata) { + private static MlProcessorAutoscalingCapacity.Builder computeRequiredCapacity( + TrainedModelAssignmentMetadata trainedModelAssignmentMetadata + ) { int maxThreadsPerAllocation = 0; double processorCount = 0; boolean hasLowPriorityDeployments = false; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJob.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJob.java index d4757d5be9ce5..b32bdf6dcbccf 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJob.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJob.java @@ -482,7 +482,7 @@ private DataCounts postData(InputStream inputStream, XContentType xContentType) } } - private boolean isConflictException(Exception e) { + private static boolean isConflictException(Exception e) { return e instanceof ElasticsearchStatusException && ((ElasticsearchStatusException) e).status() == RestStatus.CONFLICT; } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManager.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManager.java index ef8b589735585..bdc143c7dde4c 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManager.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManager.java @@ -272,7 +272,7 @@ public void deleteDatafeed(DeleteDatafeedAction.Request request, ClusterState st } - private PersistentTasksCustomMetadata.PersistentTask getDatafeedTask(ClusterState state, String datafeedId) { + private static PersistentTasksCustomMetadata.PersistentTask getDatafeedTask(ClusterState state, String datafeedId) { PersistentTasksCustomMetadata tasks = state.getMetadata().custom(PersistentTasksCustomMetadata.TYPE); return MlTasks.getDatafeedTask(datafeedId, tasks); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedRunner.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedRunner.java index 799d884342226..99ad92ee2b91e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedRunner.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedRunner.java @@ -356,7 +356,7 @@ private String getJobIdIfDatafeedRunningOnThisNode(TransportStartDatafeedAction. return holder.getJobId(); } - private JobState getJobState(PersistentTasksCustomMetadata tasks, String jobId) { + private static JobState getJobState(PersistentTasksCustomMetadata tasks, String jobId) { return MlTasks.getJobStateModifiedForReassignments(jobId, tasks); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AbstractAggregationDataExtractor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AbstractAggregationDataExtractor.java index cb27cfe28a9bd..0d4ba9fd2086d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AbstractAggregationDataExtractor.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AbstractAggregationDataExtractor.java @@ -157,7 +157,7 @@ private SearchSourceBuilder buildBaseSearchSource() { protected abstract T buildSearchRequest(SearchSourceBuilder searchRequestBuilder); - private Aggregations validateAggs(@Nullable Aggregations aggs) { + private static Aggregations validateAggs(@Nullable Aggregations aggs) { if (aggs == null) { return null; } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationToJsonProcessor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationToJsonProcessor.java index 35e5ac4df0de1..ea70418a0c6a3 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationToJsonProcessor.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationToJsonProcessor.java @@ -300,7 +300,7 @@ private Collection processCompositeAggBucketKeys(Map buc * Date Histograms have a {@link ZonedDateTime} object as the key, * Histograms have either a Double or Long. */ - private long toHistogramKeyToEpoch(Object key) { + private static long toHistogramKeyToEpoch(Object key) { if (key instanceof ZonedDateTime) { return ((ZonedDateTime) key).toInstant().toEpochMilli(); } else if (key instanceof Double) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/persistence/DatafeedConfigProvider.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/persistence/DatafeedConfigProvider.java index 316e5707a48dd..211fd8743f49c 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/persistence/DatafeedConfigProvider.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/persistence/DatafeedConfigProvider.java @@ -520,7 +520,7 @@ public void expandDatafeedConfigs( } - private QueryBuilder buildDatafeedIdQuery(String[] tokens) { + private static QueryBuilder buildDatafeedIdQuery(String[] tokens) { QueryBuilder datafeedQuery = new TermQueryBuilder(DatafeedConfig.CONFIG_TYPE.getPreferredName(), DatafeedConfig.TYPE); if (Strings.isAllOrWildcard(tokens)) { // match all @@ -555,7 +555,7 @@ static Collection matchingDatafeedIdsWithTasks(String[] datafeedIdPatter return MlStrings.findMatching(datafeedIdPatterns, MlTasks.startedDatafeedIds(tasksMetadata)); } - private QueryBuilder buildDatafeedJobIdsQuery(Collection jobIds) { + private static QueryBuilder buildDatafeedJobIdsQuery(Collection jobIds) { BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder(); boolQueryBuilder.filter(new TermQueryBuilder(DatafeedConfig.CONFIG_TYPE.getPreferredName(), DatafeedConfig.TYPE)); boolQueryBuilder.filter(new TermsQueryBuilder(Job.ID.getPreferredName(), jobIds)); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetector.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetector.java index 618c0ec95ee01..e54fd50936ece 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetector.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetector.java @@ -249,7 +249,7 @@ private void addExcludedField(String field, String reason, Set f fieldSelection.add(FieldSelection.excluded(field, getMappingTypes(field), reason)); } - private void addExcludedNestedPattern(String pattern, Set fieldSelection) { + private static void addExcludedNestedPattern(String pattern, Set fieldSelection) { fieldSelection.add( FieldSelection.excluded(pattern, Collections.singleton(NestedObjectMapper.CONTENT_TYPE), "nested fields are not supported") ); @@ -344,7 +344,7 @@ private void includeAndExcludeFields(Set fields, Set fie } } - private Set expandFields(String[] fields, Set nameset, boolean allowNoMatch) { + private static Set expandFields(String[] fields, Set nameset, boolean allowNoMatch) { NameResolver nameResolver = NameResolver.newUnaliased( nameset, (ex) -> new ResourceNotFoundException(Messages.getMessage(Messages.DATA_FRAME_ANALYTICS_BAD_FIELD_FILTER, ex)) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetectorFactory.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetectorFactory.java index 13d233fd617bc..db68f49b78429 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetectorFactory.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetectorFactory.java @@ -144,7 +144,7 @@ private void getCardinalitiesForFieldsWithConstraints( ClientHelper.executeWithHeadersAsync(config.getHeaders(), ML_ORIGIN, client, SearchAction.INSTANCE, searchRequest, searchListener); } - private void buildFieldCardinalitiesMap( + private static void buildFieldCardinalitiesMap( DataFrameAnalyticsConfig config, SearchResponse searchResponse, ActionListener> listener diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/AnalyticsProcessManager.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/AnalyticsProcessManager.java index ed738acc2e63d..de306b2ece1a2 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/AnalyticsProcessManager.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/AnalyticsProcessManager.java @@ -235,8 +235,11 @@ private void processData( } } - private void writeDataRows(DataFrameDataExtractor dataExtractor, AnalyticsProcess process, DataFrameAnalyticsTask task) - throws IOException { + private static void writeDataRows( + DataFrameDataExtractor dataExtractor, + AnalyticsProcess process, + DataFrameAnalyticsTask task + ) throws IOException { ProgressTracker progressTracker = task.getStatsHolder().getProgressTracker(); DataCountsTracker dataCountsTracker = task.getStatsHolder().getDataCountsTracker(); @@ -270,7 +273,7 @@ private void writeDataRows(DataFrameDataExtractor dataExtractor, AnalyticsProces } } - private void writeHeaderRecord( + private static void writeHeaderRecord( DataFrameDataExtractor dataExtractor, AnalyticsProcess process, DataFrameAnalyticsTask task diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoiner.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoiner.java index f4b95ddbd451f..ee91b0637bfc7 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoiner.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoiner.java @@ -118,7 +118,7 @@ private void executeBulkRequest(BulkRequest bulkRequest) { ); } - private void checkChecksumsMatch(DataFrameDataExtractor.Row row, RowResults result) { + private static void checkChecksumsMatch(DataFrameDataExtractor.Row row, RowResults result) { if (row.getChecksum() != result.getChecksum()) { String msg = "Detected checksum mismatch for document with id [" + row.getHit().getId() + "]; "; msg += "expected [" + row.getChecksum() + "] but result had [" + result.getChecksum() + "]; "; @@ -186,7 +186,7 @@ public DataFrameDataExtractor.Row next() { return row; } - private boolean hasNoMatch(DataFrameDataExtractor.Row row) { + private static boolean hasNoMatch(DataFrameDataExtractor.Row row) { return row == null || row.shouldSkip() || row.isTraining() == false; } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/extractor/GeoPointField.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/extractor/GeoPointField.java index 03baf1528ee1e..9edc72ca38f73 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/extractor/GeoPointField.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/extractor/GeoPointField.java @@ -40,7 +40,7 @@ public Object[] value(SearchHit hit) { return value; } - private String handleString(String geoString) { + private static String handleString(String geoString) { if (geoString.contains(",")) { // Entry is of the form "38.897676, -77.03653" return geoString.replace(" ", ""); } else { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/extractor/GeoShapeField.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/extractor/GeoShapeField.java index 2c58d2b1be245..d7b8827add05a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/extractor/GeoShapeField.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/extractor/GeoShapeField.java @@ -54,7 +54,7 @@ public Object[] value(SearchHit hit) { return value; } - private String handleString(String geoString) { + private static String handleString(String geoString) { try { if (geoString.startsWith("POINT")) { // Entry is of the form "POINT (-77.03653 38.897676)" Geometry geometry = WellKnownText.fromWKT(StandardValidator.instance(true), true, geoString); @@ -71,7 +71,7 @@ private String handleString(String geoString) { } } - private String handleObject(Map geoObject) { + private static String handleObject(Map geoObject) { String geoType = (String) geoObject.get("type"); if (geoType != null && "point".equals(geoType.toLowerCase(Locale.ROOT))) { @SuppressWarnings("unchecked") diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentNodeService.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentNodeService.java index fe8366065dac7..44ead5ca35dd3 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentNodeService.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentNodeService.java @@ -603,7 +603,7 @@ private void updateNumberOfAllocations(TrainedModelAssignmentMetadata assignment } } - private boolean hasStartingAssignments(TrainedModelAssignment assignment) { + private static boolean hasStartingAssignments(TrainedModelAssignment assignment) { return assignment.getNodeRoutingTable() .values() .stream() diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentRebalancer.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentRebalancer.java index f9e9ebed5acc4..e1241dc8a93c3 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentRebalancer.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentRebalancer.java @@ -107,7 +107,7 @@ AssignmentPlan computeAssignmentPlan() { return mergePlans(nodesByZone, planForNormalPriorityModels, planForLowPriorityModels); } - private AssignmentPlan mergePlans( + private static AssignmentPlan mergePlans( Map, List> nodesByZone, AssignmentPlan planForNormalPriorityModels, AssignmentPlan planForLowPriorityModels @@ -249,7 +249,7 @@ private AssignmentPlan computePlanForLowPriorityModels(Set assignableNod return new AssignmentPlanner(planNodes, planDeployments).computePlan(); } - private Map findFittingAssignments( + private static Map findFittingAssignments( TrainedModelAssignment assignment, Set assignableNodeIds, Map remainingNodeMemory diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AllocationReducer.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AllocationReducer.java index 4dbc13fb233e0..a8b58b04ac22e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AllocationReducer.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AllocationReducer.java @@ -132,7 +132,7 @@ public TrainedModelAssignment.Builder reduceTo(int numberOfAllocations) { return buildUpdatedAssignment(numberOfAllocations, allocationsByNode); } - private boolean canAssignmentBeRemovedEntirely( + private static boolean canAssignmentBeRemovedEntirely( Map.Entry assignment, int minAllocationsInOtherZones, int zoneAllocations, diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AssignmentPlanner.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AssignmentPlanner.java index 985d012de5f95..73b713cced32a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AssignmentPlanner.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/AssignmentPlanner.java @@ -164,7 +164,7 @@ private AssignmentPlan solvePreservingAllAllocationsOnCurrentAssignments() { return solvePreservingCurrentAssignments(new PreserveAllAllocations(nodes, deployments)); } - private AssignmentPlan solvePreservingCurrentAssignments(AbstractPreserveAllocations preserveAllocations) { + private static AssignmentPlan solvePreservingCurrentAssignments(AbstractPreserveAllocations preserveAllocations) { List planNodes = preserveAllocations.nodesPreservingAllocations(); List planDeployments = preserveAllocations.modelsPreservingAllocations(); logger.trace(() -> format("Nodes after applying allocation preserving strategy = %s", planNodes)); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/LinearProgrammingPlanSolver.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/LinearProgrammingPlanSolver.java index 742bef2852caa..90c5a2257d94d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/LinearProgrammingPlanSolver.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/LinearProgrammingPlanSolver.java @@ -200,11 +200,11 @@ private static int distance(int x, int y) { return distance == Integer.MIN_VALUE ? Integer.MAX_VALUE : Math.abs(distance); } - private double minWeight(Deployment m, Node n, double w) { + private static double minWeight(Deployment m, Node n, double w) { return m.currentAllocationsByNodeId().containsKey(n.id()) ? w / 2 : 0; } - private double maxWeight(Deployment m, Node n, double w) { + private static double maxWeight(Deployment m, Node n, double w) { return m.currentAllocationsByNodeId().containsKey(n.id()) ? w : w / 2; } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/RandomizedAssignmentRounding.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/RandomizedAssignmentRounding.java index 99007110c8a50..dafc07099f850 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/RandomizedAssignmentRounding.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/planning/RandomizedAssignmentRounding.java @@ -194,7 +194,7 @@ private void assignExcessCores(Node n) { // assign any extra cores this node has to the models in descending size order. for (AssignmentPlan.Deployment m : deployments.stream() .filter(m -> assignments.get(Tuple.tuple(m, n)) == 1 && resourceTracker.remainingModelAllocations.get(m) > 0) - .sorted(Comparator.comparingDouble(this::remainingModelOrder)) + .sorted(Comparator.comparingDouble(AssignmentHolder::remainingModelOrder)) .toList()) { if (resourceTracker.remainingNodeCores.get(n) <= 0) { break; @@ -210,7 +210,7 @@ private void assignExcessCores(Node n) { zeroSoftAssignmentsOfSatisfiedModels(); } - private double remainingModelOrder(AssignmentPlan.Deployment m) { + private static double remainingModelOrder(AssignmentPlan.Deployment m) { return (m.currentAllocationsByNodeId().isEmpty() ? 1 : 2) * -m.memoryBytes(); } @@ -334,7 +334,7 @@ private Map, Integer> tryAssigningRemaini for (Deployment m : deployments.stream() .filter(m -> resourceTracker.remainingModelAllocations.get(m) > 0) - .sorted(Comparator.comparingDouble(this::remainingModelOrder)) + .sorted(Comparator.comparingDouble(AssignmentHolder::remainingModelOrder)) .toList()) { for (Node n : nodes.stream() .filter( @@ -369,7 +369,7 @@ private Map, Integer> tryAssigningRemaini return resultAllocations; } - private double remainingNodeOrder( + private static double remainingNodeOrder( Node n, AssignmentPlan.Deployment m, int remainingNodeCores, diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/NerProcessor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/NerProcessor.java index a0c8ddcba5125..599b3c90204ef 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/NerProcessor.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/NerProcessor.java @@ -88,7 +88,7 @@ public String toString() { /** * Checks labels are valid entity tags and none are duplicated */ - private void validate(List classificationLabels) { + private static void validate(List classificationLabels) { if (classificationLabels == null || classificationLabels.isEmpty()) { return; } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/tokenizers/PrecompiledCharMapNormalizer.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/tokenizers/PrecompiledCharMapNormalizer.java index 93b3c1f9b35fb..c6eca511b895e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/tokenizers/PrecompiledCharMapNormalizer.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/nlp/tokenizers/PrecompiledCharMapNormalizer.java @@ -87,19 +87,19 @@ public PrecompiledCharMapNormalizer(int[] offsets, String normalizedStr, Reader this.normalizedStrUtf8Bytes = normalizedStr.getBytes(StandardCharsets.UTF_8); } - private boolean hasLeaf(int v) { + private static boolean hasLeaf(int v) { return ((v >>> 8) & 1) == 1; } - private int label(int v) { + private static int label(int v) { return (v & ((1 << 31) | 0xFF)); } - private int value(int v) { + private static int value(int v) { return (v & ((1 << 31) - 1)); } - private int offset(int v) { + private static int offset(int v) { return (v >>> 10) << ((v & (1 << 9)) >>> 6); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelProvider.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelProvider.java index 297ecbd86d2ac..b704dc37bfc22 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelProvider.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelProvider.java @@ -1045,7 +1045,7 @@ public void expandIds( public void getInferenceStats(String[] modelIds, @Nullable TaskId parentTaskId, ActionListener> listener) { MultiSearchRequest multiSearchRequest = new MultiSearchRequest(); - Arrays.stream(modelIds).map(this::buildStatsSearchRequest).forEach(multiSearchRequest::add); + Arrays.stream(modelIds).map(TrainedModelProvider::buildStatsSearchRequest).forEach(multiSearchRequest::add); if (multiSearchRequest.requests().isEmpty()) { listener.onResponse(Collections.emptyList()); return; @@ -1103,7 +1103,7 @@ public void getInferenceStats(String[] modelIds, @Nullable TaskId parentTaskId, ); } - private SearchRequest buildStatsSearchRequest(String modelId) { + private static SearchRequest buildStatsSearchRequest(String modelId) { BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery() .filter(QueryBuilders.termQuery(InferenceStats.MODEL_ID.getPreferredName(), modelId)) .filter(QueryBuilders.termQuery(InferenceStats.TYPE.getPreferredName(), InferenceStats.NAME)); @@ -1136,7 +1136,7 @@ private SearchRequest buildStatsSearchRequest(String modelId) { ); } - private InferenceStats handleMultiNodeStatsResponse(SearchResponse response, String modelId) { + private static InferenceStats handleMultiNodeStatsResponse(SearchResponse response, String modelId) { if (response.getAggregations() == null) { logger.trace(() -> "[" + modelId + "] no previously stored stats found"); return null; @@ -1245,7 +1245,7 @@ private static QueryBuilder buildQueryIdExpressionQuery(String[] tokens, String return boolQuery; } - private Set matchedResourceIds(String[] tokens) { + private static Set matchedResourceIds(String[] tokens) { if (Strings.isAllOrWildcard(tokens)) { return MODELS_STORED_AS_RESOURCE; } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/pytorch/process/PyTorchResultProcessor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/pytorch/process/PyTorchResultProcessor.java index 4b925464d985b..5636762871b23 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/pytorch/process/PyTorchResultProcessor.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/pytorch/process/PyTorchResultProcessor.java @@ -266,7 +266,7 @@ public synchronized ResultStats getResultStats() { ); } - private LongSummaryStatistics cloneSummaryStats(LongSummaryStatistics stats) { + private static LongSummaryStatistics cloneSummaryStats(LongSummaryStatistics stats) { return new LongSummaryStatistics(stats.getCount(), stats.getMin(), stats.getMax(), stats.getSum()); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/pytorch/process/PyTorchStateStreamer.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/pytorch/process/PyTorchStateStreamer.java index 7da8591c005f6..82c9131325eee 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/pytorch/process/PyTorchStateStreamer.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/pytorch/process/PyTorchStateStreamer.java @@ -112,7 +112,7 @@ private boolean writeChunk(TrainedModelDefinitionDoc doc, OutputStream outputStr return true; } - private long writeModelSize(String modelId, Long modelSizeBytes, OutputStream outputStream) throws IOException { + private static long writeModelSize(String modelId, Long modelSizeBytes, OutputStream outputStream) throws IOException { if (modelSizeBytes == null) { String message = String.format( Locale.ROOT, diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java index 14a9474a0c787..035f4864ebace 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java @@ -540,13 +540,13 @@ private void auditJobUpdatedIfNotInternal(UpdateJobAction.Request request) { } } - private boolean isJobOpen(ClusterState clusterState, String jobId) { + private static boolean isJobOpen(ClusterState clusterState, String jobId) { PersistentTasksCustomMetadata persistentTasks = clusterState.metadata().custom(PersistentTasksCustomMetadata.TYPE); JobState jobState = MlTasks.getJobState(jobId, persistentTasks); return jobState == JobState.OPENED; } - private Set openJobIds(ClusterState clusterState) { + private static Set openJobIds(ClusterState clusterState) { PersistentTasksCustomMetadata persistentTasks = clusterState.metadata().custom(PersistentTasksCustomMetadata.TYPE); return MlTasks.openJobIds(persistentTasks); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/NodeLoadDetector.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/NodeLoadDetector.java index 3994424ac0b6f..548c95d1ddd50 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/NodeLoadDetector.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/NodeLoadDetector.java @@ -136,7 +136,10 @@ private void updateLoadGivenTasks(NodeLoad.Builder nodeLoad, PersistentTasksCust } } - private void updateLoadGivenModelAssignments(NodeLoad.Builder nodeLoad, TrainedModelAssignmentMetadata trainedModelAssignmentMetadata) { + private static void updateLoadGivenModelAssignments( + NodeLoad.Builder nodeLoad, + TrainedModelAssignmentMetadata trainedModelAssignmentMetadata + ) { if (trainedModelAssignmentMetadata != null && trainedModelAssignmentMetadata.allAssignments().isEmpty() == false) { for (TrainedModelAssignment assignment : trainedModelAssignmentMetadata.allAssignments().values()) { if (Optional.ofNullable(assignment.getNodeRoutingTable().get(nodeLoad.getNodeId())) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java index eababb5fab02c..4c71f8fbce139 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java @@ -747,7 +747,7 @@ static Collection matchingJobIdsWithTasks(String[] jobIdPatterns, Persis return MlStrings.findMatching(jobIdPatterns, MlTasks.openJobIds(tasksMetadata)); } - private void parseJobLenientlyFromSource(BytesReference source, ActionListener jobListener) { + private static void parseJobLenientlyFromSource(BytesReference source, ActionListener jobListener) { try ( InputStream stream = source.streamInput(); XContentParser parser = XContentFactory.xContent(XContentType.JSON) @@ -759,7 +759,7 @@ private void parseJobLenientlyFromSource(BytesReference source, ActionListener aliases = new HashSet<>(); List indices = new ArrayList<>(); for (var entry : getAliasesResponse.getAliases().entrySet()) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobRenormalizedResultsPersister.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobRenormalizedResultsPersister.java index 0690a225608eb..3c0d2aca4deda 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobRenormalizedResultsPersister.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobRenormalizedResultsPersister.java @@ -84,7 +84,7 @@ public void updateResult(String id, String index, ToXContent resultDoc) { } } - private XContentBuilder toXContentBuilder(ToXContent obj) throws IOException { + private static XContentBuilder toXContentBuilder(ToXContent obj) throws IOException { XContentBuilder builder = jsonBuilder(); obj.toXContent(builder, ToXContent.EMPTY_PARAMS); return builder; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManager.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManager.java index f09b3166964f5..1144b1afffdcb 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManager.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManager.java @@ -1010,7 +1010,7 @@ void setJobState(JobTask jobTask, JobState state, String reason) { ); } - private void logSetJobStateFailure(JobState state, String jobId, Exception e) { + private static void logSetJobStateFailure(JobState state, String jobId, Exception e) { if (ExceptionsHelper.unwrapCause(e) instanceof ResourceNotFoundException) { logger.debug("Could not set job state to [{}] for job [{}] as it has been closed", state, jobId); } else { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/params/FlushJobParams.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/params/FlushJobParams.java index df4ad9f1cac41..4fd2e98b16529 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/params/FlushJobParams.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/params/FlushJobParams.java @@ -186,14 +186,14 @@ private void checkValidFlushArgumentsCombination() { } } - private Long parseTimeParam(String name, String value) { + private static Long parseTimeParam(String name, String value) { if (Strings.isNullOrEmpty(value)) { return null; } return paramToEpochIfValidOrThrow(name, value) / TimeRange.MILLISECONDS_IN_SECOND; } - private long paramToEpochIfValidOrThrow(String paramName, String date) { + private static long paramToEpochIfValidOrThrow(String paramName, String date) { if (TimeRange.NOW.equals(date)) { return System.currentTimeMillis(); } @@ -208,14 +208,14 @@ private long paramToEpochIfValidOrThrow(String paramName, String date) { return epoch; } - private void checkFlushParamIsEmpty(String paramName, String paramValue) { + private static void checkFlushParamIsEmpty(String paramName, String paramValue) { if (paramValue.isEmpty() == false) { String msg = Messages.getMessage(Messages.REST_INVALID_FLUSH_PARAMS_UNEXPECTED, paramName); throw new IllegalArgumentException(msg); } } - private boolean isValidTimeRange(TimeRange timeRange) { + private static boolean isValidTimeRange(TimeRange timeRange) { return timeRange.getStart().isEmpty() == false || (timeRange.getStart().isEmpty() && timeRange.getEnd().isEmpty()); } } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/params/TimeRange.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/params/TimeRange.java index a344b2cd41eb0..26378a60db7c6 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/params/TimeRange.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/params/TimeRange.java @@ -80,7 +80,7 @@ public TimeRange build() { return createTimeRange(start, end); } - private TimeRange createTimeRange(String start, String end) { + private static TimeRange createTimeRange(String start, String end) { Long epochStart = null; Long epochEnd = null; if (start.isEmpty() == false) { @@ -104,7 +104,7 @@ private TimeRange createTimeRange(String start, String end) { /** * Returns epoch milli seconds */ - private long paramToEpochIfValidOrThrow(String paramName, String date) { + private static long paramToEpochIfValidOrThrow(String paramName, String date) { if (NOW.equals(date)) { return System.currentTimeMillis(); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/AbstractDataToProcessWriter.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/AbstractDataToProcessWriter.java index 4b2fb3deacc6d..63d44e9b9608a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/AbstractDataToProcessWriter.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/AbstractDataToProcessWriter.java @@ -266,7 +266,7 @@ final Collection inputFields() { /** * Find the indexes of the input fields from the header */ - protected final Map inputFieldIndexes(String[] header, Collection inputFields) { + protected static Map inputFieldIndexes(String[] header, Collection inputFields) { List headerList = Arrays.asList(header); // TODO header could be empty Map fieldIndexes = new HashMap<>(); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/JsonDataToProcessWriter.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/JsonDataToProcessWriter.java index 6bfc53087feac..a93e50f5110e5 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/JsonDataToProcessWriter.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/JsonDataToProcessWriter.java @@ -101,7 +101,7 @@ private void writeSmileXContent(CategorizationAnalyzer categorizationAnalyzer, I } } - private byte[] findNextObject(byte marker, InputStream data) throws IOException { + private static byte[] findNextObject(byte marker, InputStream data) throws IOException { // The underlying stream, MarkSupportingStreamInputWrapper, doesn't care about // readlimit, so just set to -1. We could pick a value, but I worry that if the // underlying implementation changes it may cause strange behavior, whereas -1 should diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredForecastsRemover.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredForecastsRemover.java index 388e971f1e063..10a12273baff5 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredForecastsRemover.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredForecastsRemover.java @@ -183,7 +183,7 @@ private List findForecastsToDelete(SearchResponse searchResponse) return forecastsToDelete; } - private DeleteByQueryRequest buildDeleteByQuery(List ids) { + private static DeleteByQueryRequest buildDeleteByQuery(List ids) { DeleteByQueryRequest request = new DeleteByQueryRequest(); request.setSlices(AbstractBulkByScrollRequest.AUTO_SLICES); request.setTimeout(DEFAULT_MAX_DURATION); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemover.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemover.java index 0e5ed9bbdd572..537297d130789 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemover.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemover.java @@ -120,7 +120,7 @@ public void onFailure(Exception e) { }); } - private DeleteByQueryRequest createDBQRequest(Job job, float requestsPerSec, long cutoffEpochMs) { + private static DeleteByQueryRequest createDBQRequest(Job job, float requestsPerSec, long cutoffEpochMs) { QueryBuilder excludeFilter = QueryBuilders.termsQuery( Result.RESULT_TYPE.getPreferredName(), ModelSizeStats.RESULT_TYPE_VALUE, diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelper.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelper.java index a8a1215625c7d..6a5e328d7530a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelper.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelper.java @@ -182,7 +182,7 @@ public OutputStream openNamedPipeOutputStream(Path file, Duration timeout) throw * @return A stream opened to read from the named pipe. * @throws IOException if the named pipe cannot be opened. */ - private OutputStream openNamedPipeOutputStreamWindows(Path file, Duration timeout) throws IOException { + private static OutputStream openNamedPipeOutputStreamWindows(Path file, Duration timeout) throws IOException { long timeoutMillisRemaining = timeout.toMillis(); // Can't use File.isFile() on Windows, but luckily there's an even simpler check (that's not possible on *nix) @@ -225,7 +225,7 @@ private OutputStream openNamedPipeOutputStreamWindows(Path file, Duration timeou * @return A stream opened to read from the named pipe. * @throws IOException if the named pipe cannot be opened. */ - private OutputStream openNamedPipeOutputStreamUnix(Path file, Duration timeout) throws IOException { + private static OutputStream openNamedPipeOutputStreamUnix(Path file, Duration timeout) throws IOException { long timeoutMillisRemaining = timeout.toMillis(); // Periodically check whether the file exists until the timeout expires, then, if @@ -263,7 +263,7 @@ private OutputStream openNamedPipeOutputStreamUnix(Path file, Duration timeout) * it wrapped in a RuntimeException. However, the privileged calls could also possibly throw other * RuntimeExceptions, so this method accounts for this case too. */ - private void propagatePrivilegedException(RuntimeException e) throws IOException { + private static void propagatePrivilegedException(RuntimeException e) throws IOException { Throwable ioe = ExceptionsHelper.unwrap(e, IOException.class); if (ioe != null) { throw (IOException) ioe; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/utils/persistence/WrappedBatchedJobsIterator.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/utils/persistence/WrappedBatchedJobsIterator.java index f96acaa024562..0b25e1c49a815 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/utils/persistence/WrappedBatchedJobsIterator.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/utils/persistence/WrappedBatchedJobsIterator.java @@ -55,7 +55,7 @@ public Job next() { return currentBatch.hasNext() ? currentBatch.next() : null; } - private VolatileCursorIterator createBatchIteratorFromBatch(Deque builders) { + private static VolatileCursorIterator createBatchIteratorFromBatch(Deque builders) { List jobs = builders.stream().map(Job.Builder::build).collect(Collectors.toList()); return new VolatileCursorIterator<>(jobs); } diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsAction.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsAction.java index 8f276829e242b..71a2abd28259a 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsAction.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsAction.java @@ -177,7 +177,7 @@ private void afterSettingUpdate( * @param remaining The counter used to determine if any other operations are in flight * @param results A thread-safe collection to hold results */ - private ActionListener resultCollector( + private static ActionListener resultCollector( final Exporter.Config exporterConfig, final ActionListener listener, final AtomicInteger remaining, @@ -224,7 +224,7 @@ private void finalResult() { } } - private Exception compileReason(ExporterResourceStatus status) { + private static Exception compileReason(ExporterResourceStatus status) { // The reason for unsuccessful setup could be multiple exceptions: one or more watches // may fail to be removed for any reason. List exceptions = status.getExceptions(); @@ -247,7 +247,7 @@ private Exception compileReason(ExporterResourceStatus status) { * @param exporter The exporter to migrate * @param listener Notified of success or failure */ - private void deleteAlertsFromOpenExporter(Exporter exporter, ActionListener listener) { + private static void deleteAlertsFromOpenExporter(Exporter exporter, ActionListener listener) { assert exporter.isOpen(); try { exporter.removeAlerts(status -> { diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java index c7b342ab53cc8..1eda86b030464 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java @@ -77,7 +77,7 @@ protected void doClose() { logger.debug("cleaning service closed"); } - private String executorName() { + private static String executorName() { return ThreadPool.Names.GENERIC; } diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollector.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollector.java index 276935e599fd2..6102fdcbf99f0 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollector.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/shards/ShardsCollector.java @@ -98,7 +98,7 @@ protected Collection doCollect(final MonitoringDoc.Node node, fin return Collections.unmodifiableCollection(results); } - private String[] expandIndexPattern(String[] indicesToMonitor, String[] indices) { + private static String[] expandIndexPattern(String[] indicesToMonitor, String[] indices) { final Set expandedIndices = new HashSet<>(); for (String indexOrPattern : indicesToMonitor) { diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java index 9e0067c568979..8c8d76897fd7f 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/Exporters.java @@ -282,7 +282,7 @@ public void export(final Collection docs, final ActionListener docs, final ActionListener listener) { + private static void doExport(final ExportBulk bulk, final Collection docs, final ActionListener listener) { final AtomicReference exceptionRef = new AtomicReference<>(); try { diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java index 9255b68881606..d37f4669484a0 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java @@ -531,10 +531,10 @@ protected boolean alwaysReplaceResource(final Response response) { } private void addDefaultParameters(final Request request) { - this.addParameters(request, defaultParameters); + PublishableHttpResource.addParameters(request, defaultParameters); } - private void addParameters(final Request request, final Map parameters) { + private static void addParameters(final Request request, final Map parameters) { for (final Map.Entry param : parameters.entrySet()) { request.addParameter(param.getKey(), param.getValue()); } diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/WatcherExistsHttpResource.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/WatcherExistsHttpResource.java index d43225d595124..c68b4da8a049e 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/WatcherExistsHttpResource.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/WatcherExistsHttpResource.java @@ -132,7 +132,7 @@ private void checkXPackForWatcher(final RestClient client, final ActionListener< * @throws IOException if any issue occurs while parsing the {@code xContent} {@code response}. * @throws RuntimeException if the response format is changed. */ - private boolean canUseWatcher(final Response response, final XContent xContent) throws IOException { + private static boolean canUseWatcher(final Response response, final XContent xContent) throws IOException { // no named content used; so EMPTY is fine final Map xpackInfo = XContentHelper.convertToMap(xContent, response.getEntity().getContent(), false); diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java index f753de62ba157..467378f4cd738 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporter.java @@ -468,7 +468,7 @@ private void responseReceived( } } - private boolean hasTemplate(final ClusterState clusterState, final String templateName) { + private static boolean hasTemplate(final ClusterState clusterState, final String templateName) { final IndexTemplateMetadata template = clusterState.getMetadata().getTemplates().get(templateName); return template != null && hasValidVersion(template.getVersion(), MonitoringTemplateRegistry.REGISTRY_VERSION); @@ -481,7 +481,7 @@ private boolean hasTemplate(final ClusterState clusterState, final String templa * @param minimumVersion The minimum version required to be a "valid" version * @return {@code true} if the version exists and it's >= to the minimum version. {@code false} otherwise. */ - private boolean hasValidVersion(final Object version, final long minimumVersion) { + private static boolean hasValidVersion(final Object version, final long minimumVersion) { return version instanceof Number && ((Number) version).intValue() >= minimumVersion; } diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java index e947bb58e1b5c..343353a9b3a39 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/rest/action/RestMonitoringBulkAction.java @@ -114,7 +114,7 @@ public boolean supportsContentStream() { * @param version the system API version * @return true if supported, false otherwise */ - private boolean isSupportedSystemVersion(final MonitoredSystem system, final String version) { + private static boolean isSupportedSystemVersion(final MonitoredSystem system, final String version) { final List monitoredSystem = SUPPORTED_API_VERSIONS.getOrDefault(system, emptyList()); return monitoredSystem.contains(version); } diff --git a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/GetStackTracesResponse.java b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/GetStackTracesResponse.java index 72fed7376bde5..c25733bf8587c 100644 --- a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/GetStackTracesResponse.java +++ b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/GetStackTracesResponse.java @@ -156,7 +156,7 @@ public Iterator toXContentChunked(ToXContent.Params params ); } - private Iterator optional( + private static Iterator optional( String name, Map values, BiFunction, Iterator> supplier diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/AnalyzerRules.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/AnalyzerRules.java index 0c5bc8b0a97fe..1c5e91f2a76e1 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/AnalyzerRules.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/AnalyzerRules.java @@ -63,7 +63,7 @@ protected LogicalPlan rule(Filter filter) { return filter; } - private Expression replaceRawBoolFieldWithEquals(Expression e) { + private static Expression replaceRawBoolFieldWithEquals(Expression e) { if (e instanceof FieldAttribute && e.dataType() == BOOLEAN) { e = new Equals(e.source(), e, Literal.of(e, Boolean.TRUE)); } diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/PreAnalyzer.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/PreAnalyzer.java index 604ea0ad08a32..e36eacc8c61c4 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/PreAnalyzer.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/PreAnalyzer.java @@ -38,7 +38,7 @@ public PreAnalysis preAnalyze(LogicalPlan plan) { return doPreAnalyze(plan); } - protected PreAnalysis doPreAnalyze(LogicalPlan plan) { + private static PreAnalysis doPreAnalyze(LogicalPlan plan) { List indices = new ArrayList<>(); plan.forEachUp(UnresolvedRelation.class, p -> indices.add(new TableInfo(p.table(), p.frozen()))); diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java index 2e0caf0ff1aba..5e0aa654392e7 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/AbstractFieldHitExtractor.java @@ -207,7 +207,7 @@ protected Object unwrapFieldsMultiValue(Object values) { return values; } - private boolean isListOfNulls(Object unwrapped) { + private static boolean isListOfNulls(Object unwrapped) { if (unwrapped instanceof List list) { if (list.size() == 0) { return false; diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/TotalHitsExtractor.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/TotalHitsExtractor.java index d5c091c51c8c6..dddf58c894c52 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/TotalHitsExtractor.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/execution/search/extractor/TotalHitsExtractor.java @@ -34,7 +34,7 @@ public Object extract(SearchHit hit) { return validate(super.extract(hit)); } - private Object validate(Object value) { + private static Object validate(Object value) { if (Number.class.isInstance(value) == false) { throw new QlIllegalArgumentException( "Inconsistent total hits count handling, expected a numeric value but found a {}: {}", diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java index c0c3068b4d98b..d4f143989414a 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java @@ -295,7 +295,7 @@ private void resolveRemoteIndices( } } - private void filterResults(String javaRegex, Set indexInfos, ActionListener> listener) { + private static void filterResults(String javaRegex, Set indexInfos, ActionListener> listener) { // since the index name does not support ?, filter the results manually Pattern pattern = javaRegex != null ? Pattern.compile(javaRegex) : null; @@ -581,7 +581,7 @@ public void resolveAsSeparateMappings( } - private GetAliasesRequest createGetAliasesRequest(FieldCapabilitiesResponse response, boolean includeFrozen) { + private static GetAliasesRequest createGetAliasesRequest(FieldCapabilitiesResponse response, boolean includeFrozen) { return new GetAliasesRequest().local(true) .aliases("*") .indices(response.getIndices()) diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java index 76cf1b6690335..5d9736726b46f 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java @@ -144,7 +144,7 @@ public Expression rule(ScalarFunction e) { return e; } - private Expression simplifyAndOr(BinaryPredicate bc) { + private static Expression simplifyAndOr(BinaryPredicate bc) { Expression l = bc.left(); Expression r = bc.right(); @@ -339,7 +339,7 @@ public Expression rule(BinaryLogic e) { } // combine conjunction - private Expression propagate(And and) { + private static Expression propagate(And and) { List ranges = new ArrayList<>(); // Only equalities, not-equalities and inequalities with a foldable .right are extracted separately; // the others go into the general 'exps'. @@ -479,7 +479,7 @@ private Expression propagate(And and) { // a = 2 OR a < 3 -> a < 3; a = 2 OR a < 1 -> nop // a = 2 OR 3 < a < 5 -> nop; a = 2 OR 1 < a < 3 -> 1 < a < 3; a = 2 OR 0 < a < 1 -> nop // a = 2 OR a != 2 -> TRUE; a = 2 OR a = 5 -> nop; a = 2 OR a != 5 -> a != 5 - private Expression propagate(Or or) { + private static Expression propagate(Or or) { List exps = new ArrayList<>(); List equals = new ArrayList<>(); // foldable right term Equals List notEquals = new ArrayList<>(); // foldable right term NotEquals @@ -652,7 +652,7 @@ public Expression rule(BinaryLogic e) { } // combine conjunction - private Expression combine(And and) { + private static Expression combine(And and) { List ranges = new ArrayList<>(); List bcs = new ArrayList<>(); List exps = new ArrayList<>(); @@ -764,7 +764,7 @@ else if ((other instanceof GreaterThan || other instanceof GreaterThanOrEqual) } // combine disjunction - private Expression combine(Or or) { + private static Expression combine(Or or) { List bcs = new ArrayList<>(); List ranges = new ArrayList<>(); List exps = new ArrayList<>(); @@ -912,7 +912,7 @@ private static boolean findExistingRange(Range main, List ranges, boolean return false; } - private boolean findConjunctiveComparisonInRange(BinaryComparison main, List ranges) { + private static boolean findConjunctiveComparisonInRange(BinaryComparison main, List ranges) { Object value = main.right().fold(); // NB: the loop modifies the list (hence why the int is used) @@ -1789,11 +1789,11 @@ public static final class SetAsOptimized extends Rule @Override public LogicalPlan apply(LogicalPlan plan) { - plan.forEachUp(this::rule); + plan.forEachUp(SetAsOptimized::rule); return plan; } - private void rule(LogicalPlan plan) { + private static void rule(LogicalPlan plan) { if (plan.optimized() == false) { plan.setOptimized(); } diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/plan/QueryPlan.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/plan/QueryPlan.java index a2802e0463816..fa38e87612d5d 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/plan/QueryPlan.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/plan/QueryPlan.java @@ -108,7 +108,7 @@ public PlanType transformExpressionsUp(Class typeToken } @SuppressWarnings("unchecked") - private Object doTransformExpression(Object arg, Function traversal) { + private static Object doTransformExpression(Object arg, Function traversal) { if (arg instanceof Expression) { return traversal.apply((Expression) arg); } @@ -163,7 +163,7 @@ public void forEachExpressionUp(Class typeToken, Consu } @SuppressWarnings("unchecked") - private void doForEachExpression(Object arg, Consumer traversal) { + private static void doForEachExpression(Object arg, Consumer traversal) { if (arg instanceof Expression) { traversal.accept((Expression) arg); } else if (arg instanceof Collection c) { diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/tree/Node.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/tree/Node.java index 1d9132d041670..cb0233429f323 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/tree/Node.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/tree/Node.java @@ -407,13 +407,13 @@ public String propertiesToString(boolean skipIfChild) { return sb.toString(); } - private String toString(Object obj) { + private static String toString(Object obj) { StringBuilder sb = new StringBuilder(); toString(sb, obj); return sb.toString(); } - private void toString(StringBuilder sb, Object obj) { + private static void toString(StringBuilder sb, Object obj) { if (obj instanceof Iterable) { sb.append("["); for (Iterator it = ((Iterable) obj).iterator(); it.hasNext();) { diff --git a/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/job/RollupIndexer.java b/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/job/RollupIndexer.java index 0cb65ae82baf0..57bdebafd1b20 100644 --- a/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/job/RollupIndexer.java +++ b/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/job/RollupIndexer.java @@ -151,7 +151,7 @@ protected IterationResult> doProcess(SearchResponse searchRe * @param config The config for the job. * @return The composite aggregation that creates the rollup buckets */ - private CompositeAggregationBuilder createCompositeBuilder(RollupJobConfig config) { + private static CompositeAggregationBuilder createCompositeBuilder(RollupJobConfig config) { final GroupConfig groupConfig = config.getGroupConfig(); List> builders = createValueSourceBuilders(groupConfig); diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocator.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocator.java index f1d58f2f0ca17..f95b44f1d2e22 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocator.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocator.java @@ -330,7 +330,7 @@ private AllocateUnassignedDecision decideAllocation(RoutingAllocation allocation return AllocateUnassignedDecision.NOT_TAKEN; } - private boolean isDelayedDueToNodeRestart(RoutingAllocation allocation, ShardRouting shardRouting) { + private static boolean isDelayedDueToNodeRestart(RoutingAllocation allocation, ShardRouting shardRouting) { if (shardRouting.unassignedInfo().isDelayed()) { String lastAllocatedNodeId = shardRouting.unassignedInfo().getLastAllocatedNodeId(); if (lastAllocatedNodeId != null) { diff --git a/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/AutoConfigureNode.java b/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/AutoConfigureNode.java index 46ecfb0c33ea7..29828fba085d8 100644 --- a/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/AutoConfigureNode.java +++ b/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/AutoConfigureNode.java @@ -844,7 +844,7 @@ public void execute(Terminal terminal, OptionSet options, Environment env, Proce } } - private String initialMasterNodesSettingValue(Environment environment) { + private static String initialMasterNodesSettingValue(Environment environment) { if (NODE_NAME_SETTING.exists(environment.settings())) { return "[\"" + NODE_NAME_SETTING.get(environment.settings()) + "\"]"; } @@ -932,8 +932,13 @@ private Environment possiblyReconfigureNode(Environment env, Terminal terminal, } } - private void notifyOfFailure(boolean inEnrollmentMode, Terminal terminal, Terminal.Verbosity verbosity, int exitCode, String message) - throws UserException { + private static void notifyOfFailure( + boolean inEnrollmentMode, + Terminal terminal, + Terminal.Verbosity verbosity, + int exitCode, + String message + ) throws UserException { if (inEnrollmentMode) { throw new UserException(exitCode, message); } else { @@ -942,11 +947,11 @@ private void notifyOfFailure(boolean inEnrollmentMode, Terminal terminal, Termin } } - private void deleteDirectory(Path directory) throws IOException { + private static void deleteDirectory(Path directory) throws IOException { IOUtils.rm(directory); } - private void moveDirectory(Path srcDir, Path dstDir) throws IOException { + private static void moveDirectory(Path srcDir, Path dstDir) throws IOException { try { Files.move(srcDir, dstDir, StandardCopyOption.ATOMIC_MOVE); } catch (AtomicMoveNotSupportedException e) { @@ -954,7 +959,7 @@ private void moveDirectory(Path srcDir, Path dstDir) throws IOException { } } - private GeneralNames getSubjectAltNames(Settings settings) throws IOException { + private static GeneralNames getSubjectAltNames(Settings settings) throws IOException { Set generalNameSet = new HashSet<>(); for (InetAddress ip : NetworkUtils.getAllAddresses()) { String ipString = NetworkAddress.format(ip); @@ -1079,7 +1084,7 @@ void checkExistingConfiguration(Settings settings, boolean inEnrollmentMode, Ter // Here we take a conservative approach: if any of the discovery or initial master nodes setting are set to a non-empty // value, we assume the admin intended a multi-node cluster configuration. There is only one exception: if the initial master // nodes setting contains just the current node name. - private boolean isInitialClusterNode(Settings settings) { + private static boolean isInitialClusterNode(Settings settings) { return DiscoveryModule.isSingleNodeDiscovery(settings) || (ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING.get(settings).isEmpty() && SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING.get(settings).isEmpty() @@ -1148,7 +1153,7 @@ private static boolean isDirEmpty(Path path) throws IOException { } } - private X509Certificate parseCertificateFromPem(String pemFormattedCert, Terminal terminal) throws Exception { + private static X509Certificate parseCertificateFromPem(String pemFormattedCert, Terminal terminal) throws Exception { try { final List certs = CertParsingUtils.readCertificates( Base64.getDecoder().wrap(new ByteArrayInputStream(pemFormattedCert.getBytes(StandardCharsets.UTF_8))) @@ -1174,7 +1179,7 @@ private X509Certificate parseCertificateFromPem(String pemFormattedCert, Termina } } - private PrivateKey parseKeyFromPem(String pemFormattedKey, Terminal terminal) throws UserException { + private static PrivateKey parseKeyFromPem(String pemFormattedKey, Terminal terminal) throws UserException { try { return parsePKCS8PemString(pemFormattedKey); } catch (Exception e) { @@ -1195,7 +1200,7 @@ private PrivateKey parseKeyFromPem(String pemFormattedKey, Terminal terminal) th } @SuppressWarnings("unchecked") - private List getTransportAddresses(Map responseMap) { + private static List getTransportAddresses(Map responseMap) { return (List) responseMap.get("nodes_addresses"); } @@ -1254,7 +1259,7 @@ static List removePreviousAutoconfiguration(List existingConfigL return existingConfigLines; } - private void removeAutoConfigurationFromKeystore(Environment env, Terminal terminal) throws UserException { + private static void removeAutoConfigurationFromKeystore(Environment env, Terminal terminal) throws UserException { if (Files.exists(KeyStoreWrapper.keystorePath(env.configFile()))) { try ( KeyStoreWrapper existingKeystore = KeyStoreWrapper.load(env.configFile()); diff --git a/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/CertificateTool.java b/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/CertificateTool.java index 57de814a7e7ee..82a6a5fc55c13 100644 --- a/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/CertificateTool.java +++ b/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/CertificateTool.java @@ -852,7 +852,7 @@ void generateAndWriteSignedCertificates( } } - private CertificateAndKey generateCertificateAndKey( + private static CertificateAndKey generateCertificateAndKey( CertificateInformation certificateInformation, CAInfo caInfo, int keySize, diff --git a/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommand.java b/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommand.java index 14af042e98e68..b67bb9898991f 100644 --- a/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommand.java +++ b/x-pack/plugin/security/cli/src/main/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommand.java @@ -312,7 +312,7 @@ private void writeZip(Path file, char[] password, CertificateTool.CAInfo caInfo, } } - private void createZipDirectory(ZipOutputStream zip, String name) throws IOException { + private static void createZipDirectory(ZipOutputStream zip, String name) throws IOException { ZipEntry entry = new ZipEntry(name + "/"); assert entry.isDirectory(); zip.putNextEntry(entry); @@ -502,7 +502,7 @@ static void copyWithSubstitutions(InputStream stream, PrintWriter writer, Map buildSubstitutions(Environment env, Map entries) { + private static Map buildSubstitutions(Environment env, Map entries) { final Map map = Maps.newMapWithExpectedSize(entries.size() + 4); ZonedDateTime now = ZonedDateTime.now().withNano(0); map.put("DATE", now.format(DateTimeFormatter.ISO_LOCAL_DATE)); @@ -542,14 +542,14 @@ private void writePemEntry(ZipOutputStream zip, String name, PemObjectGenerator } } - private JcaMiscPEMGenerator generator(PrivateKey privateKey, char[] password) throws IOException { + private static JcaMiscPEMGenerator generator(PrivateKey privateKey, char[] password) throws IOException { if (password == null || password.length == 0) { return new JcaMiscPEMGenerator(privateKey); } return new JcaMiscPEMGenerator(privateKey, CertificateTool.getEncrypter(password)); } - private Period getCertificateValidityPeriod(Terminal terminal) { + private static Period getCertificateValidityPeriod(Terminal terminal) { printHeader("How long should your certificates be valid?", terminal); terminal.println("Every certificate has an expiry date. When the expiry date is reached clients"); terminal.println("will stop trusting your certificate and TLS connections will fail."); @@ -566,7 +566,7 @@ private Period getCertificateValidityPeriod(Terminal terminal) { return readPeriodInput(terminal, "For how long should your certificate be valid?", DEFAULT_CERT_VALIDITY, 60); } - private boolean askMultipleCertificates(Terminal terminal) { + private static boolean askMultipleCertificates(Terminal terminal) { printHeader("Do you wish to generate one certificate per node?", terminal); terminal.println("If you have multiple nodes in your cluster, then you may choose to generate a"); terminal.println("separate certificate for each of these nodes. Each certificate will have its"); @@ -627,7 +627,7 @@ private CertOptions getCertificateConfiguration( terminal.println("When you are done, press once more to move on to the next step."); terminal.println(""); - dnsNames.addAll(readMultiLineInput(terminal, this::validateHostname)); + dnsNames.addAll(readMultiLineInput(terminal, HttpCertificateCommand::validateHostname)); if (dnsNames.isEmpty()) { terminal.println(Terminal.Verbosity.SILENT, "You did not enter any hostnames."); terminal.println("Clients are likely to encounter TLS hostname verification errors if they"); @@ -660,7 +660,7 @@ private CertOptions getCertificateConfiguration( terminal.println("When you are done, press once more to move on to the next step."); terminal.println(""); - ipNames.addAll(readMultiLineInput(terminal, this::validateIpAddress)); + ipNames.addAll(readMultiLineInput(terminal, HttpCertificateCommand::validateIpAddress)); if (ipNames.isEmpty()) { terminal.println(Terminal.Verbosity.SILENT, "You did not enter any IP addresses."); } else { @@ -741,7 +741,7 @@ private CertOptions getCertificateConfiguration( return new CertOptions(certName, dn, dnsNames, ipNames, keySize, validity); } - private String validateHostname(String name) { + private static String validateHostname(String name) { if (DERIA5String.isIA5String(name)) { return null; } else { @@ -749,7 +749,7 @@ private String validateHostname(String name) { } } - private String validateIpAddress(String ip) { + private static String validateIpAddress(String ip) { if (InetAddresses.isInetAddress(ip)) { return null; } else { @@ -757,11 +757,11 @@ private String validateIpAddress(String ip) { } } - private X500Principal buildDistinguishedName(String name) { + private static X500Principal buildDistinguishedName(String name) { return new X500Principal("CN=" + name.replace(".", ",DC=")); } - private List readMultiLineInput(Terminal terminal, Function validator) { + private static List readMultiLineInput(Terminal terminal, Function validator) { final List lines = new ArrayList<>(); while (true) { String input = terminal.readText(""); @@ -779,7 +779,7 @@ private List readMultiLineInput(Terminal terminal, Function { String periodInput = input.replaceAll("[,\\s]", ""); if (input.charAt(0) != 'P') { @@ -955,7 +955,7 @@ Period readPeriodInput(Terminal terminal, String prompt, Period defaultValue, in return period; } - private Integer readKeySize(Terminal terminal, int keySize) { + private static Integer readKeySize(Terminal terminal, int keySize) { return tryReadInput(terminal, "Key Size", keySize, input -> { try { final int size = Integer.parseInt(input); @@ -979,7 +979,7 @@ private Integer readKeySize(Terminal terminal, int keySize) { }); } - private char[] readPassword(Terminal terminal, String prompt, boolean confirm) { + private static char[] readPassword(Terminal terminal, String prompt, boolean confirm) { while (true) { final char[] password = terminal.readSecret(prompt + " [ for none]"); if (password.length == 0) { @@ -1003,7 +1003,7 @@ private char[] readPassword(Terminal terminal, String prompt, boolean confirm) { } } - private CertificateTool.CAInfo readKeystoreCA(Path ksPath, FileType fileType, Terminal terminal) throws UserException { + private static CertificateTool.CAInfo readKeystoreCA(Path ksPath, FileType fileType, Terminal terminal) throws UserException { final String storeType = fileType == FileType.PKCS12 ? "PKCS12" : "jks"; terminal.println("Reading a " + storeType + " keystore requires a password."); terminal.println("It is possible for the keystore's password to be blank,"); @@ -1029,13 +1029,13 @@ private CertificateTool.CAInfo readKeystoreCA(Path ksPath, FileType fileType, Te } } - private CertificateTool.CAInfo readPemCA(Path certPath, Path keyPath, Terminal terminal) throws UserException { + private static CertificateTool.CAInfo readPemCA(Path certPath, Path keyPath, Terminal terminal) throws UserException { final X509Certificate cert = readCertificate(certPath, terminal); final PrivateKey key = readPrivateKey(keyPath, terminal); return new CertificateTool.CAInfo(cert, key); } - private X509Certificate readCertificate(Path path, Terminal terminal) throws UserException { + private static X509Certificate readCertificate(Path path, Terminal terminal) throws UserException { try { final X509Certificate[] certificates = CertParsingUtils.readX509Certificates(List.of(path)); switch (certificates.length) { @@ -1053,7 +1053,7 @@ private X509Certificate readCertificate(Path path, Terminal terminal) throws Use } } - private PrivateKey readPrivateKey(Path path, Terminal terminal) { + private static PrivateKey readPrivateKey(Path path, Terminal terminal) { try { return PemUtils.readPrivateKey(path, () -> { terminal.println(""); @@ -1066,7 +1066,7 @@ private PrivateKey readPrivateKey(Path path, Terminal terminal) { } } - private boolean askExistingCertificateAuthority(Terminal terminal) { + private static boolean askExistingCertificateAuthority(Terminal terminal) { printHeader("Do you have an existing Certificate Authority (CA) key-pair that you wish to use to sign your certificate?", terminal); terminal.println("If you have an existing CA certificate and key, then you can use that CA to"); terminal.println("sign your new http certificate. This allows you to use the same CA across"); @@ -1079,7 +1079,7 @@ private boolean askExistingCertificateAuthority(Terminal terminal) { return terminal.promptYesNo("Use an existing CA?", false); } - private T tryReadInput(Terminal terminal, String prompt, T defaultValue, Function parser) { + private static T tryReadInput(Terminal terminal, String prompt, T defaultValue, Function parser) { final String defaultStr = defaultValue instanceof Period ? toString((Period) defaultValue) : String.valueOf(defaultValue); while (true) { final String input = terminal.readText(prompt + " [" + defaultStr + "] "); @@ -1113,7 +1113,7 @@ static String toString(Period period) { return Strings.collectionToCommaDelimitedString(parts); } - private Path requestPath(String prompt, Terminal terminal, Environment env, boolean requireExisting) { + private static Path requestPath(String prompt, Terminal terminal, Environment env, boolean requireExisting) { for (;;) { final String input = terminal.readText(prompt); final Path path = env.configFile().resolve(input).toAbsolutePath(); @@ -1209,7 +1209,7 @@ static FileType guessFileType(Path path, Terminal terminal) { return FileType.UNRECOGNIZED; } - private void printHeader(String text, Terminal terminal) { + private static void printHeader(String text, Terminal terminal) { terminal.println(""); terminal.println(Terminal.Verbosity.SILENT, "## " + text); terminal.println(""); diff --git a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java index 901e52cfe89a9..1033d4e51ebba 100644 --- a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java +++ b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java @@ -516,56 +516,55 @@ public void testGenerateMultipleCertificateWithNewCA() throws Exception { } public void testParsingValidityPeriod() throws Exception { - final HttpCertificateCommand command = new HttpCertificateCommand(); final MockTerminal terminal = MockTerminal.create(); terminal.addTextInput("2y"); - assertThat(command.readPeriodInput(terminal, "", null, 1), is(Period.ofYears(2))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 1), is(Period.ofYears(2))); terminal.addTextInput("18m"); - assertThat(command.readPeriodInput(terminal, "", null, 1), is(Period.ofMonths(18))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 1), is(Period.ofMonths(18))); terminal.addTextInput("90d"); - assertThat(command.readPeriodInput(terminal, "", null, 1), is(Period.ofDays(90))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 1), is(Period.ofDays(90))); terminal.addTextInput("1y, 6m"); - assertThat(command.readPeriodInput(terminal, "", null, 1), is(Period.ofYears(1).withMonths(6))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 1), is(Period.ofYears(1).withMonths(6))); // Test: Re-prompt on bad input. terminal.addTextInput("2m & 4d"); terminal.addTextInput("2m 4d"); - assertThat(command.readPeriodInput(terminal, "", null, 1), is(Period.ofMonths(2).withDays(4))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 1), is(Period.ofMonths(2).withDays(4))); terminal.addTextInput("1y, 6m"); - assertThat(command.readPeriodInput(terminal, "", null, 1), is(Period.ofYears(1).withMonths(6))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 1), is(Period.ofYears(1).withMonths(6))); // Test: Accept default value final Period p = Period.of(randomIntBetween(1, 5), randomIntBetween(0, 11), randomIntBetween(0, 30)); terminal.addTextInput(""); - assertThat(command.readPeriodInput(terminal, "", p, 1), is(p)); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", p, 1), is(p)); final int y = randomIntBetween(1, 5); final int m = randomIntBetween(1, 11); final int d = randomIntBetween(1, 30); terminal.addTextInput(y + "y " + m + "m " + d + "d"); - assertThat(command.readPeriodInput(terminal, "", null, 1), is(Period.of(y, m, d))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 1), is(Period.of(y, m, d))); // Test: Minimum Days final int shortDays = randomIntBetween(1, 20); terminal.addTextInput(shortDays + "d"); terminal.addTextInput("y"); // I'm sure - assertThat(command.readPeriodInput(terminal, "", null, 21), is(Period.ofDays(shortDays))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 21), is(Period.ofDays(shortDays))); terminal.addTextInput(shortDays + "d"); terminal.addTextInput("n"); // I'm not sure terminal.addTextInput("30d"); - assertThat(command.readPeriodInput(terminal, "", null, 21), is(Period.ofDays(30))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 21), is(Period.ofDays(30))); terminal.addTextInput("2m"); terminal.addTextInput("n"); // I'm not sure terminal.addTextInput("2y"); - assertThat(command.readPeriodInput(terminal, "", null, 90), is(Period.ofYears(2))); + assertThat(HttpCertificateCommand.readPeriodInput(terminal, "", null, 90), is(Period.ofYears(2))); } public void testValidityPeriodToString() throws Exception { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java index 39b62da317b9b..fd38b40683f71 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java @@ -1824,7 +1824,6 @@ public UnaryOperator getRestHandlerInterceptor(ThreadContext thread threadContext, secondayAuthc.get(), auditTrailService.get(), - workflowService.get(), handler, operatorPrivilegesService.get() ); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportBaseUpdateApiKeyAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportBaseUpdateApiKeyAction.java index 7e97a8b571679..9d367bf5caf24 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportBaseUpdateApiKeyAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportBaseUpdateApiKeyAction.java @@ -57,7 +57,8 @@ public final void doExecute(Task task, Request request, ActionListener abstract void doExecuteUpdate(Task task, Request request, Authentication authentication, ActionListener listener); - protected UpdateApiKeyResponse toSingleResponse(final String apiKeyId, final BulkUpdateApiKeyResponse response) throws Exception { + protected static UpdateApiKeyResponse toSingleResponse(final String apiKeyId, final BulkUpdateApiKeyResponse response) + throws Exception { if (response.getTotalResultCount() != 1) { throw new IllegalStateException( "single result required for single API key update but result count was [" + response.getTotalResultCount() + "]" @@ -84,7 +85,7 @@ protected UpdateApiKeyResponse toSingleResponse(final String apiKeyId, final Bul } } - private void throwIllegalStateExceptionOnIdMismatch(final String requestId, final String responseId) { + private static void throwIllegalStateExceptionOnIdMismatch(final String requestId, final String responseId) { final String message = "response ID [" + responseId + "] does not match request ID [" + requestId + "] for single API key update"; assert false : message; throw new IllegalStateException(message); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesAction.java index b7df9428df0ee..3d63364f85664 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportGetRolesAction.java @@ -52,7 +52,7 @@ protected void doExecute(Task task, final GetRolesRequest request, final ActionL if (specificRolesRequested) { for (String role : requestedRoles) { if (ReservedRolesStore.isReserved(role)) { - RoleDescriptor rd = reservedRolesStore.roleDescriptor(role); + RoleDescriptor rd = ReservedRolesStore.roleDescriptor(role); if (rd != null) { roles.add(rd); } else { @@ -64,7 +64,7 @@ protected void doExecute(Task task, final GetRolesRequest request, final ActionL } } } else { - roles.addAll(reservedRolesStore.roleDescriptors()); + roles.addAll(ReservedRolesStore.roleDescriptors()); } if (specificRolesRequested && rolesToSearchFor.isEmpty()) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/rolemapping/ReservedRoleMappingAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/rolemapping/ReservedRoleMappingAction.java index 2328c8478debc..852887767578f 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/rolemapping/ReservedRoleMappingAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/rolemapping/ReservedRoleMappingAction.java @@ -58,7 +58,7 @@ public String name() { return NAME; } - private Collection prepare(List roleMappings) { + private static Collection prepare(List roleMappings) { List requests = roleMappings.stream().map(rm -> PutRoleMappingRequest.fromMapping(rm)).toList(); var exceptions = new ArrayList(); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlCompleteLogoutAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlCompleteLogoutAction.java index a1b4b1bd92aa1..0b76af3cf542e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlCompleteLogoutAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlCompleteLogoutAction.java @@ -56,7 +56,7 @@ protected void doExecute(Task task, SamlCompleteLogoutRequest request, ActionLis } } - private void processLogoutResponse( + private static void processLogoutResponse( SamlRealm samlRealm, SamlCompleteLogoutRequest request, ActionListener listener diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionAction.java index 22c3989199b5d..72d4c7f1d3a5e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionAction.java @@ -102,7 +102,7 @@ private void invalidateSession( } } - private String buildLogoutResponseUrl(SamlRealm realm, SamlLogoutRequestHandler.Result result) { + private static String buildLogoutResponseUrl(SamlRealm realm, SamlLogoutRequestHandler.Result result) { final LogoutResponse response = realm.buildLogoutResponse(result.getRequestId()); return new SamlRedirect(response, realm.getSigningConfiguration()).getRedirectUrl(result.getRelayState()); } @@ -136,7 +136,7 @@ private void findAndInvalidateTokens(SamlRealm realm, SamlLogoutRequestHandler.R ); } - private Predicate> containsMetadata(Map requiredMetadata) { + private static Predicate> containsMetadata(Map requiredMetadata) { return source -> { @SuppressWarnings("unchecked") Map actualMetadata = (Map) source.get("metadata"); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlLogoutAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlLogoutAction.java index 4c6a88586f8f6..d5f25dcf5773e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlLogoutAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlLogoutAction.java @@ -120,7 +120,7 @@ private SamlLogoutResponse buildResponse(Authentication authentication, Map metadata, String key) { + private static String getMetadataString(Map metadata, String key) { final Object value = metadata.get(key); if (value == null) { if (metadata.containsKey(key)) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlPrepareAuthenticationAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlPrepareAuthenticationAction.java index 18f67eba8fc44..dcc5b638f4d43 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlPrepareAuthenticationAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/saml/TransportSamlPrepareAuthenticationAction.java @@ -64,7 +64,11 @@ protected void doExecute( } } - private void prepareAuthentication(SamlRealm realm, String relayState, ActionListener listener) { + private static void prepareAuthentication( + SamlRealm realm, + String relayState, + ActionListener listener + ) { final AuthnRequest authnRequest = realm.buildAuthenticationRequest(); try { String redirectUrl = new SamlRedirect(authnRequest, realm.getSigningConfiguration()).getRedirectUrl(relayState); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java index 1b4f4b891c7ea..b28680f35e083 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java @@ -1275,7 +1275,8 @@ LogEntryBuilder withRequestBody(final BulkUpdateApiKeyRequest bulkUpdateApiKeyRe return this; } - private void withRequestBody(XContentBuilder builder, AbstractCreateApiKeyRequest abstractCreateApiKeyRequest) throws IOException { + private static void withRequestBody(XContentBuilder builder, AbstractCreateApiKeyRequest abstractCreateApiKeyRequest) + throws IOException { TimeValue expiration = abstractCreateApiKeyRequest.getExpiration(); builder.startObject("apikey") .field("id", abstractCreateApiKeyRequest.getId()) @@ -1293,21 +1294,23 @@ private void withRequestBody(XContentBuilder builder, AbstractCreateApiKeyReques builder.endObject(); // apikey } - private void withRequestBody(final XContentBuilder builder, final BaseSingleUpdateApiKeyRequest baseSingleUpdateApiKeyRequest) - throws IOException { + private static void withRequestBody( + final XContentBuilder builder, + final BaseSingleUpdateApiKeyRequest baseSingleUpdateApiKeyRequest + ) throws IOException { builder.startObject("apikey").field("id", baseSingleUpdateApiKeyRequest.getId()); withBaseUpdateApiKeyFields(builder, baseSingleUpdateApiKeyRequest); builder.endObject(); } - private void withRequestBody(final XContentBuilder builder, final BulkUpdateApiKeyRequest bulkUpdateApiKeyRequest) + private static void withRequestBody(final XContentBuilder builder, final BulkUpdateApiKeyRequest bulkUpdateApiKeyRequest) throws IOException { builder.startObject("apikeys").stringListField("ids", bulkUpdateApiKeyRequest.getIds()); withBaseUpdateApiKeyFields(builder, bulkUpdateApiKeyRequest); builder.endObject(); } - private void withBaseUpdateApiKeyFields(final XContentBuilder builder, final BaseUpdateApiKeyRequest baseUpdateApiKeyRequest) + private static void withBaseUpdateApiKeyFields(final XContentBuilder builder, final BaseUpdateApiKeyRequest baseUpdateApiKeyRequest) throws IOException { builder.field("type", baseUpdateApiKeyRequest.getType().value()); if (baseUpdateApiKeyRequest.getRoleDescriptors() != null) { @@ -1324,7 +1327,7 @@ private void withBaseUpdateApiKeyFields(final XContentBuilder builder, final Bas } } - private void withRoleDescriptor(XContentBuilder builder, RoleDescriptor roleDescriptor) throws IOException { + private static void withRoleDescriptor(XContentBuilder builder, RoleDescriptor roleDescriptor) throws IOException { builder.startObject().array(RoleDescriptor.Fields.CLUSTER.getPreferredName(), roleDescriptor.getClusterPrivileges()); if (roleDescriptor.getConditionalClusterPrivileges() != null && roleDescriptor.getConditionalClusterPrivileges().length > 0) { // This fails if this list contains multiple instances of the {@code ManageApplicationPrivileges} diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java index ce622ddf6fa69..897bfdcc6583e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java @@ -740,7 +740,7 @@ static XContentBuilder newDocument( * @return `null` if the update is a noop, i.e., if no changes to `currentApiKeyDoc` are required */ @Nullable - XContentBuilder maybeBuildUpdatedDocument( + static XContentBuilder maybeBuildUpdatedDocument( final String apiKeyId, final ApiKeyDoc currentApiKeyDoc, final Version targetDocVersion, @@ -799,7 +799,7 @@ XContentBuilder maybeBuildUpdatedDocument( return builder.endObject(); } - private boolean isNoop( + private static boolean isNoop( final String apiKeyId, final ApiKeyDoc apiKeyDoc, final Version targetDocVersion, @@ -999,7 +999,7 @@ public List parseRoleDescriptorsBytes( return parseRoleDescriptorsBytes(apiKeyId, bytesReference, roleType == RoleReference.ApiKeyRoleType.LIMITED_BY); } - private List parseRoleDescriptorsBytes( + private static List parseRoleDescriptorsBytes( final String apiKeyId, BytesReference bytesReference, final boolean replaceLegacySuperuserRoleDescriptor @@ -1494,7 +1494,7 @@ private IndexRequest maybeBuildIndexRequest( .request(); } - private void addErrorsForNotFoundApiKeys( + private static void addErrorsForNotFoundApiKeys( final BulkUpdateApiKeyResponse.Builder responseBuilder, final Collection foundDocs, final List requestedIds diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/CrossClusterAccessAuthenticationService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/CrossClusterAccessAuthenticationService.java index 866bac68c33dd..9b0212910f4f5 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/CrossClusterAccessAuthenticationService.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/CrossClusterAccessAuthenticationService.java @@ -196,7 +196,7 @@ private static void withRequestProcessingFailure( listener.onFailure(ese); } - private void writeAuthToContext( + private static void writeAuthToContext( final Authenticator.Context context, final Authentication authentication, final ActionListener listener diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java index 0dd9bb6f551d4..0735eccff9913 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java @@ -422,7 +422,7 @@ private void addReservedRealm(List realms) { /** * Check that the given realmName is not yet used by the given list of realms. */ - private void ensureRealmNameIsAvailable(List realms, String realmName) { + private static void ensureRealmNameIsAvailable(List realms, String realmName) { assert realms.size() == realms.stream().map(Realm::name).collect(Collectors.toUnmodifiableSet()).size() : "existing realm names must be unique"; final Realm misNamedRealm = realms.stream().filter(realm -> realmName.equals(realm.name())).findFirst().orElse(null); @@ -462,7 +462,7 @@ private static void checkUniqueOrders(Map> orderToRealmName } } - private void ensureUniqueExplicitlyConfiguredRealmNames(Map> nameToRealmIdentifier) { + private static void ensureUniqueExplicitlyConfiguredRealmNames(Map> nameToRealmIdentifier) { String duplicateRealms = nameToRealmIdentifier.entrySet() .stream() .filter(entry -> entry.getValue().size() > 1) diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/ResetPasswordTool.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/ResetPasswordTool.java index b4e766fabf045..0718742d362cb 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/ResetPasswordTool.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/ResetPasswordTool.java @@ -128,7 +128,7 @@ protected void executeCommand(Terminal terminal, OptionSet options, Environment } } - private SecureString promptForPassword(Terminal terminal, String providedUsername) { + private static SecureString promptForPassword(Terminal terminal, String providedUsername) { while (true) { SecureString password1 = new SecureString(terminal.readSecret("Enter password for [" + providedUsername + "]: ")); Validation.Error err = Validation.Users.validatePassword(password1); @@ -150,7 +150,7 @@ private SecureString promptForPassword(Terminal terminal, String providedUsernam } } - private String requestBodySupplier(SecureString pwd) throws Exception { + private static String requestBodySupplier(SecureString pwd) throws Exception { XContentBuilder xContentBuilder = JsonXContent.contentBuilder(); xContentBuilder.startObject().field("password", pwd.toString()).endObject(); return Strings.toString(xContentBuilder); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/SetupPasswordTool.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/SetupPasswordTool.java index 10ae8ac7da8c1..95f06051abb40 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/SetupPasswordTool.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/tool/SetupPasswordTool.java @@ -172,7 +172,7 @@ public void execute(Terminal terminal, OptionSet options, Environment env, Proce ); } - private SecureString generatePassword(SecureRandom secureRandom, String user) { + private static SecureString generatePassword(SecureRandom secureRandom, String user) { int passwordLength = 20; // Generate 20 character passwords char[] characters = new char[passwordLength]; for (int i = 0; i < passwordLength; ++i) { @@ -181,7 +181,7 @@ private SecureString generatePassword(SecureRandom secureRandom, String user) { return new SecureString(characters); } - private void changedPasswordCallback(Terminal terminal, String user, SecureString password) { + private static void changedPasswordCallback(Terminal terminal, String user, SecureString password) { terminal.println("Changed password for user " + user + "\n" + "PASSWORD " + user + " = " + password + "\n"); } @@ -227,7 +227,7 @@ public void execute(Terminal terminal, OptionSet options, Environment env, Proce ); } - private SecureString promptForPassword(Terminal terminal, String user) throws UserException { + private static SecureString promptForPassword(Terminal terminal, String user) throws UserException { // loop for two consecutive good passwords while (true) { SecureString password1 = new SecureString(terminal.readSecret("Enter password for [" + user + "]: ")); @@ -250,7 +250,7 @@ private SecureString promptForPassword(Terminal terminal, String user) throws Us } } - private void changedPasswordCallback(Terminal terminal, String user, SecureString password) { + private static void changedPasswordCallback(Terminal terminal, String user, SecureString password) { terminal.println("Changed password for user [" + user + "]"); } } @@ -620,7 +620,7 @@ void changePasswords( } } - private HttpResponseBuilder responseBuilder(InputStream is, Terminal terminal) throws IOException { + private static HttpResponseBuilder responseBuilder(InputStream is, Terminal terminal) throws IOException { HttpResponseBuilder httpResponseBuilder = new HttpResponseBuilder(); if (is != null) { byte[] bytes = toByteArray(is); @@ -633,12 +633,12 @@ private HttpResponseBuilder responseBuilder(InputStream is, Terminal terminal) t return httpResponseBuilder; } - private URL createURL(URL url, String path, String query) throws MalformedURLException, URISyntaxException { + private static URL createURL(URL url, String path, String query) throws MalformedURLException, URISyntaxException { return new URL(url, (url.toURI().getPath() + path).replaceAll("/+", "/") + query); } } - private byte[] toByteArray(InputStream is) throws IOException { + private static byte[] toByteArray(InputStream is) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); byte[] internalBuffer = new byte[1024]; int read = is.read(internalBuffer); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosRealm.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosRealm.java index b51db1a138cde..273fe6c487439 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosRealm.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosRealm.java @@ -185,7 +185,7 @@ public void authenticate(final AuthenticationToken token, final ActionListener 0) { return Base64.getEncoder().encodeToString(outToken); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java index a2bd793d48c3c..4e390c86ba1f1 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java @@ -126,7 +126,7 @@ void loop() { * @param username username to insert into the DN template. Any commas, equals or plus will be escaped. * @return DN (distinguished name) build from the template. */ - String buildDnFromTemplate(String username, String template) { + static String buildDnFromTemplate(String username, String template) { // this value must be escaped to avoid manipulation of the template DN. String escapedUsername = escapedRDNValue(username); return new MessageFormat(template, Locale.ROOT).format(new Object[] { escapedUsername }, new StringBuffer(), null).toString(); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapMetadataResolver.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapMetadataResolver.java index c82066a15c593..14f78ba82fc27 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapMetadataResolver.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapMetadataResolver.java @@ -80,7 +80,7 @@ public void resolve( } } - private Attribute findAttribute(Collection attributes, String name) { + private static Attribute findAttribute(Collection attributes, String name) { return attributes.stream().filter(attr -> attr.getName().equals(name)).findFirst().orElse(null); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactory.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactory.java index 840d2476285b6..5d260266d3f20 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactory.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactory.java @@ -276,7 +276,7 @@ public boolean ssl() { /** * @param ldapUrls URLS in the form of "ldap://..." or "ldaps://..." */ - private boolean secureUrls(String[] ldapUrls) { + private static boolean secureUrls(String[] ldapUrls) { if (ldapUrls.length == 0) { return true; } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java index 754d2a82dd835..0f34850b861b7 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java @@ -393,7 +393,7 @@ private void validateResponseType(AuthenticationSuccessResponse response) { * @param expectedState The state that was originally generated * @param state The state that was contained in the response */ - private void validateState(State expectedState, State state) { + private static void validateState(State expectedState, State state) { if (null == state) { throw new ElasticsearchSecurityException("Failed to validate the response, the response did not contain a state parameter"); } else if (null == expectedState) { @@ -449,7 +449,7 @@ public void cancelled() { * of the Id Token and call the provided listener. * (This method is package-protected for testing purposes) */ - void handleUserinfoResponse( + static void handleUserinfoResponse( HttpResponse httpResponse, JWTClaimsSet verifiedIdTokenClaims, ActionListener claimsListener @@ -523,7 +523,11 @@ void handleUserinfoResponse( /** * Validates that the userinfo response contains a sub Claim and that this claim value is the same as the one returned in the ID Token */ - private void validateUserInfoResponse(JWTClaimsSet userInfoClaims, String expectedSub, ActionListener claimsListener) { + private static void validateUserInfoResponse( + JWTClaimsSet userInfoClaims, + String expectedSub, + ActionListener claimsListener + ) { if (userInfoClaims.getSubject().isEmpty()) { claimsListener.onFailure(new ElasticsearchSecurityException("Userinfo Response did not contain a sub Claim")); } else if (userInfoClaims.getSubject().equals(expectedSub) == false) { @@ -619,7 +623,7 @@ public void cancelled() { * Handle the Token Response from the OpenID Connect Provider. If successful, extract the (yet not validated) Id Token * and access token and call the provided listener. */ - private void handleTokenResponse(HttpResponse httpResponse, ActionListener> tokensListener) { + private static void handleTokenResponse(HttpResponse httpResponse, ActionListener> tokensListener) { try { final HttpEntity entity = httpResponse.getEntity(); final Header encodingHeader = entity.getContentEncoding(); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealm.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealm.java index efb230f1e06aa..ea5acc1379051 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealm.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealm.java @@ -232,7 +232,7 @@ private void buildUserFromClaims(JWTClaimsSet claims, ActionListener return new SamlAttributes(nameId, session, attributes); } - private String getSessionIndex(Assertion assertion) { + private static String getSessionIndex(Assertion assertion) { return assertion.getAuthnStatements().stream().map(as -> as.getSessionIndex()).filter(Objects::nonNull).findFirst().orElse(null); } @@ -166,7 +166,7 @@ private Tuple> extractDetails( throw samlException("No assertions found in SAML response"); } - private void moveToNewDocument(XMLObject xmlObject) { + private static void moveToNewDocument(XMLObject xmlObject) { final Element element = xmlObject.getDOM(); final Document doc = element.getOwnerDocument().getImplementation().createDocument(null, null, null); doc.adoptNode(element); @@ -320,7 +320,10 @@ private void checkSubject(Subject assertionSubject, XMLObject parent, Collection checkSubjectInResponseTo(confirmationData.get(0), allowedSamlRequestIds); } - private void checkSubjectInResponseTo(SubjectConfirmationData subjectConfirmationData, Collection allowedSamlRequestIds) { + private static void checkSubjectInResponseTo( + SubjectConfirmationData subjectConfirmationData, + Collection allowedSamlRequestIds + ) { // Allow for IdP initiated SSO where InResponseTo MUST be missing if (Strings.hasText(subjectConfirmationData.getInResponseTo()) && allowedSamlRequestIds.contains(subjectConfirmationData.getInResponseTo()) == false) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlLogoutRequestHandler.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlLogoutRequestHandler.java index 4b61f13c85fca..6c5e6c2d80e2b 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlLogoutRequestHandler.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlLogoutRequestHandler.java @@ -116,7 +116,7 @@ private SAMLObject decrypt(EncryptedID encrypted) { } } - private String getSessionIndex(LogoutRequest logoutRequest) { + private static String getSessionIndex(LogoutRequest logoutRequest) { return logoutRequest.getSessionIndexes().stream().map(as -> as.getValue()).filter(Objects::nonNull).findFirst().orElse(null); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlMessageBuilder.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlMessageBuilder.java index dcefcc27937b7..d9ea5ffd27b7b 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlMessageBuilder.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlMessageBuilder.java @@ -67,7 +67,7 @@ protected Issuer buildIssuer() { return issuer; } - protected String buildId() { + protected static String buildId() { // 20 bytes (160 bits) of randomness as recommended by the SAML spec return SamlUtils.generateSecureNCName(20); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlMetadataCommand.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlMetadataCommand.java index 80d2697651e6c..106b550a1e23c 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlMetadataCommand.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlMetadataCommand.java @@ -364,7 +364,7 @@ private static PrivateKey readSigningKey(Path path, char[] password, Terminal te } } - private void validateXml(Terminal terminal, Path xml) throws Exception { + private static void validateXml(Terminal terminal, Path xml) throws Exception { try (InputStream xmlInput = Files.newInputStream(xml)) { SamlUtils.validate(xmlInput, METADATA_SCHEMA); terminal.println(Terminal.Verbosity.VERBOSE, "The generated metadata file conforms to the SAML metadata schema"); @@ -379,7 +379,7 @@ private void validateXml(Terminal terminal, Path xml) throws Exception { } } - private void printExceptions(Terminal terminal, Throwable throwable) { + private static void printExceptions(Terminal terminal, Throwable throwable) { terminal.errorPrintln(" - " + throwable.getMessage()); for (Throwable sup : throwable.getSuppressed()) { printExceptions(terminal, sup); @@ -390,11 +390,11 @@ private void printExceptions(Terminal terminal, Throwable throwable) { } @SuppressForbidden(reason = "CLI tool working from current directory") - private Path resolvePath(String name) { + private static Path resolvePath(String name) { return PathUtils.get(name).normalize(); } - private String requireText(Terminal terminal, String prompt) { + private static String requireText(Terminal terminal, String prompt) { String value = null; while (Strings.isNullOrEmpty(value)) { value = terminal.readText(prompt); @@ -402,7 +402,7 @@ private String requireText(Terminal terminal, String prompt) { return value; } - private T option(OptionSpec spec, OptionSet options, T defaultValue) { + private static T option(OptionSpec spec, OptionSet options, T defaultValue) { if (options.has(spec)) { return spec.value(options); } else { @@ -428,7 +428,7 @@ private Map getAttributeNames(OptionSet options, RealmConfig rea } // We sort this Set so that it is deterministic for testing - private SortedSet sorted(Set strings) { + private static SortedSet sorted(Set strings) { return new TreeSet<>(strings); } @@ -491,15 +491,15 @@ private RealmConfig findRealm(Terminal terminal, OptionSet options, Environment } } - private String optionName(OptionSpec spec) { + private static String optionName(OptionSpec spec) { return spec.options().get(0); } - private RealmConfig buildRealm(RealmConfig.RealmIdentifier identifier, Environment env, Settings globalSettings) { + private static RealmConfig buildRealm(RealmConfig.RealmIdentifier identifier, Environment env, Settings globalSettings) { return new RealmConfig(identifier, globalSettings, env, new ThreadContext(globalSettings)); } - private boolean isSamlRealm(RealmConfig.RealmIdentifier realmIdentifier) { + private static boolean isSamlRealm(RealmConfig.RealmIdentifier realmIdentifier) { return SamlRealmSettings.TYPE.equals(realmIdentifier.getType()); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlObjectHandler.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlObjectHandler.java index 064df6a01ab4f..9f35b32f211dd 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlObjectHandler.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlObjectHandler.java @@ -135,7 +135,7 @@ private KeyInfoCredentialResolver createResolverForEncryptionKeys() { return new ChainingKeyInfoCredentialResolver(Arrays.asList(localKeyInfoCredentialResolver, collectionKeyInfoCredentialResolver)); } - private EncryptedKeyResolver createResolverForEncryptedKeyElements() { + private static EncryptedKeyResolver createResolverForEncryptedKeyElements() { return new ChainingEncryptedKeyResolver( Arrays.asList( new InlineEncryptedKeyResolver(), @@ -149,7 +149,7 @@ protected SpConfiguration getSpConfiguration() { return sp; } - protected String describe(X509Certificate certificate) { + protected static String describe(X509Certificate certificate) { return "X509Certificate{Subject=" + certificate.getSubjectX500Principal() + "; SerialNo=" @@ -157,7 +157,7 @@ protected String describe(X509Certificate certificate) { + "}"; } - protected String describe(Collection credentials) { + protected static String describe(Collection credentials) { return credentials.stream().map(credential -> describe(credential.getEntityCertificate())).collect(Collectors.joining(",")); } @@ -262,7 +262,7 @@ private ElasticsearchSecurityException samlSignatureException(List c return samlException(msg, signature, describeCredentials(credentials)); } - private String describeCredentials(List credentials) { + private static String describeCredentials(List credentials) { return credentials.stream().map(c -> { if (c == null) { return ""; @@ -325,7 +325,7 @@ T buildXmlObject(Element element, Class type) { } } - protected String text(XMLObject xml, int length) { + protected static String text(XMLObject xml, int length) { return text(xml, length, 0); } @@ -435,7 +435,7 @@ protected byte[] decodeBase64(String content) { } } - protected byte[] inflate(byte[] bytes) { + protected static byte[] inflate(byte[] bytes) { Inflater inflater = new Inflater(true); try ( ByteArrayInputStream in = new ByteArrayInputStream(bytes); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlRealm.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlRealm.java index d2b15c9a74249..856fdc4ba9555 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlRealm.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlRealm.java @@ -644,7 +644,7 @@ public Map createTokenMetadata(SamlNameId nameId, String session return tokenMeta; } - private String resolveSingleValueAttribute(SamlAttributes attributes, AttributeParser parser, String name) { + private static String resolveSingleValueAttribute(SamlAttributes attributes, AttributeParser parser, String name) { final List list = parser.getAttribute(attributes); switch (list.size()) { case 0: diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlRedirect.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlRedirect.java index a883f83d1329f..4195d7d24a082 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlRedirect.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlRedirect.java @@ -74,11 +74,11 @@ private String withParameters(String queryParam) { } } - private String base64Encode(byte[] bytes) { + private static String base64Encode(byte[] bytes) { return Base64.getEncoder().encodeToString(bytes); } - private String urlEncode(String param) { + private static String urlEncode(String param) { return URLEncoder.encode(param, StandardCharsets.US_ASCII); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlResponseHandler.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlResponseHandler.java index ed3e88fa22ae6..484af268afca0 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlResponseHandler.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlResponseHandler.java @@ -40,7 +40,7 @@ protected void checkInResponseTo(StatusResponseType response, Collection } } - protected String getStatusCodeMessage(Status status) { + protected static String getStatusCodeMessage(Status status) { StatusCode firstLevel = status.getStatusCode(); StatusCode subLevel = firstLevel.getStatusCode(); StringBuilder sb = new StringBuilder(); @@ -66,7 +66,7 @@ protected String getStatusCodeMessage(Status status) { return sb.toString(); } - protected void checkResponseDestination(StatusResponseType response, String spConfiguredUrl) { + protected static void checkResponseDestination(StatusResponseType response, String spConfiguredUrl) { if (spConfiguredUrl.equals(response.getDestination()) == false) { if (response.isSigned() || Strings.hasText(response.getDestination())) { throw samlException( @@ -81,7 +81,7 @@ protected void checkResponseDestination(StatusResponseType response, String spCo } } - protected void checkStatus(Status status) { + protected static void checkStatus(Status status) { if (status == null || status.getStatusCode() == null) { throw samlException("SAML Response has no status code"); } @@ -90,16 +90,16 @@ protected void checkStatus(Status status) { } } - protected boolean isSuccess(Status status) { + protected static boolean isSuccess(Status status) { return StatusCode.SUCCESS.equals(status.getStatusCode().getValue()); } - private String getMessage(Status status) { + private static String getMessage(Status status) { final StatusMessage sm = status.getStatusMessage(); return sm == null ? null : sm.getValue(); } - private String getDetail(Status status) { + private static String getDetail(Status status) { final StatusDetail sd = status.getStatusDetail(); return sd == null ? null : SamlUtils.toString(sd.getDOM()); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlSpMetadataBuilder.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlSpMetadataBuilder.java index 6df1fc571cc9a..7385ce02eb8e4 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlSpMetadataBuilder.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/saml/SamlSpMetadataBuilder.java @@ -292,7 +292,7 @@ private ServiceName buildServiceName() { return name; } - private RequestedAttribute buildRequestedAttribute(String friendlyName, String name) { + private static RequestedAttribute buildRequestedAttribute(String friendlyName, String name) { final RequestedAttribute attribute = new RequestedAttributeBuilder().buildObject(); if (Strings.hasText(friendlyName)) { attribute.setFriendlyName(friendlyName); @@ -329,7 +329,7 @@ private List buildKeyDescriptors() throws CertificateEn return keys; } - private KeyDescriptor buildKeyDescriptor(X509Certificate certificate, UsageType usageType) throws CertificateEncodingException { + private static KeyDescriptor buildKeyDescriptor(X509Certificate certificate, UsageType usageType) throws CertificateEncodingException { final KeyDescriptor descriptor = new KeyDescriptorBuilder().buildObject(); descriptor.setUse(usageType); final KeyInfo keyInfo = new KeyInfoBuilder().buildObject(); @@ -357,7 +357,7 @@ private Organization buildOrganization() { return org; } - private ContactPerson buildContact(ContactInfo contact) { + private static ContactPerson buildContact(ContactInfo contact) { final GivenName givenName = new GivenNameBuilder().buildObject(); givenName.setValue(contact.givenName); final SurName surName = new SurNameBuilder().buildObject(); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStore.java index a16eeb7cf4e0f..7749500465f65 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStore.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStore.java @@ -253,7 +253,7 @@ void deleteToken(DeleteServiceAccountTokenRequest request, ActionListener listener) { + public static void getRoleDescriptor(Authentication authentication, ActionListener listener) { assert authentication.isServiceAccount() : "authentication is not for service account: " + authentication; final String principal = authentication.getEffectiveSubject().getUser().principal(); getRoleDescriptorForPrincipal(principal, listener); } - public void getRoleDescriptorForPrincipal(String principal, ActionListener listener) { + public static void getRoleDescriptorForPrincipal(String principal, ActionListener listener) { final ServiceAccount account = ACCOUNTS.get(principal); if (account == null) { listener.onFailure( @@ -179,7 +179,7 @@ public void getRoleDescriptorForPrincipal(String principal, ActionListener> lookup.lookup(username, userListener); } - private List resolveRealms(Iterable allRealms, List lookupRealms) { + private static List resolveRealms(Iterable allRealms, List lookupRealms) { final List result = new ArrayList<>(lookupRealms.size()); for (String name : lookupRealms) { result.add(findRealm(name, allRealms)); @@ -150,7 +150,7 @@ private List resolveRealms(Iterable allRealms, List delegatedRealms, Settings globalSettings) { + private static void checkForRealmChains(Iterable delegatedRealms, Settings globalSettings) { for (Realm realm : delegatedRealms) { Setting> realmAuthzSetting = AUTHZ_REALMS.apply(realm.type()).getConcreteSettingForNamespace(realm.name()); if (realmAuthzSetting.exists(globalSettings)) { @@ -165,7 +165,7 @@ private void checkForRealmChains(Iterable delegatedRealms, Settings globa } } - private Realm findRealm(String name, Iterable allRealms) { + private static Realm findRealm(String name, Iterable allRealms) { for (Realm realm : allRealms) { if (name.equals(realm.name())) { return realm; diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/restriction/WorkflowService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/restriction/WorkflowService.java index 8b23640f9ef94..e035d7fdabbac 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/restriction/WorkflowService.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/restriction/WorkflowService.java @@ -23,7 +23,7 @@ public class WorkflowService { private static final String WORKFLOW_HEADER = "_xpack_security_workflow"; - public Workflow resolveWorkflowAndStoreInThreadContext(RestHandler restHandler, ThreadContext threadContext) { + public static Workflow resolveWorkflowAndStoreInThreadContext(RestHandler restHandler, ThreadContext threadContext) { Workflow workflow = resolveWorkflow(restHandler); if (workflow != null) { assert threadContext.getHeader(WORKFLOW_HEADER) == null @@ -33,11 +33,11 @@ public Workflow resolveWorkflowAndStoreInThreadContext(RestHandler restHandler, return workflow; } - public String readWorkflowFromThreadContext(ThreadContext threadContext) { + public static String readWorkflowFromThreadContext(ThreadContext threadContext) { return threadContext.getHeader(WORKFLOW_HEADER); } - private Workflow resolveWorkflow(RestHandler restHandler) { + private static Workflow resolveWorkflow(RestHandler restHandler) { final String restHandlerName = resolveRestHandlerName(restHandler); if (restHandlerName == null) { logger.trace(() -> format("unable to resolve name of REST handler [%s]", restHandler.getClass())); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java index f4dbadbed588d..ab9ea8f772054 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java @@ -206,7 +206,7 @@ public void getRole(Subject subject, ActionListener roleActionListener) { assert false == subject.getUser() instanceof InternalUser : "Internal user [" + subject.getUser() + "] should not pass here"; final RoleReferenceIntersection roleReferenceIntersection = subject.getRoleReferenceIntersection(anonymousUser); - final String workflow = workflowService.readWorkflowFromThreadContext(threadContext); + final String workflow = WorkflowService.readWorkflowFromThreadContext(threadContext); roleReferenceIntersection.buildRole( this::buildRoleFromRoleReference, roleActionListener.delegateFailureAndWrap((l, role) -> l.onResponse(role.forWorkflow(workflow))) diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/RoleDescriptorStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/RoleDescriptorStore.java index bb737d094115c..ad4d0d4434622 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/RoleDescriptorStore.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/RoleDescriptorStore.java @@ -130,7 +130,7 @@ public void resolveServiceAccountRoleReference( RoleReference.ServiceAccountRoleReference roleReference, ActionListener listener ) { - serviceAccountService.getRoleDescriptorForPrincipal(roleReference.getPrincipal(), listener.map(roleDescriptor -> { + ServiceAccountService.getRoleDescriptorForPrincipal(roleReference.getPrincipal(), listener.map(roleDescriptor -> { final RolesRetrievalResult rolesRetrievalResult = new RolesRetrievalResult(); rolesRetrievalResult.addDescriptors(Set.of(roleDescriptor)); return rolesRetrievalResult; diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/enrollment/ExternalEnrollmentTokenGenerator.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/enrollment/ExternalEnrollmentTokenGenerator.java index eff410bb2f06a..0a899bd70e619 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/enrollment/ExternalEnrollmentTokenGenerator.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/enrollment/ExternalEnrollmentTokenGenerator.java @@ -75,7 +75,7 @@ protected EnrollmentToken create(String user, SecureString password, String acti return new EnrollmentToken(apiKey, fingerprint, httpInfo.v2(), httpInfo.v1()); } - private HttpResponse.HttpResponseBuilder responseBuilder(InputStream is) throws IOException { + private static HttpResponse.HttpResponseBuilder responseBuilder(InputStream is) throws IOException { final HttpResponse.HttpResponseBuilder httpResponseBuilder = new HttpResponse.HttpResponseBuilder(); if (is != null) { String responseBody = Streams.readFully(is).utf8ToString(); @@ -87,11 +87,11 @@ private HttpResponse.HttpResponseBuilder responseBuilder(InputStream is) throws return httpResponseBuilder; } - protected URL createAPIKeyUrl(URL baseUrl) throws MalformedURLException, URISyntaxException { + protected static URL createAPIKeyUrl(URL baseUrl) throws MalformedURLException, URISyntaxException { return new URL(baseUrl, (baseUrl.toURI().getPath() + "/_security/api_key").replaceAll("/+", "/")); } - protected URL getHttpInfoUrl(URL baseUrl) throws MalformedURLException, URISyntaxException { + protected static URL getHttpInfoUrl(URL baseUrl) throws MalformedURLException, URISyntaxException { return new URL(baseUrl, (baseUrl.toURI().getPath() + "/_nodes/_local/http").replaceAll("/+", "/")); } @@ -134,7 +134,7 @@ protected String getApiKeyCredentials(String user, SecureString password, String user, password, createApiKeyRequestBodySupplier, - is -> responseBuilder(is) + ExternalEnrollmentTokenGenerator::responseBuilder ); final int httpCode = httpResponseApiKey.getHttpStatus(); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java index 85d8ad5305777..f7d5ada9b9538 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java @@ -35,7 +35,6 @@ public class SecurityRestFilter extends FilterRestHandler implements RestHandler private final AuditTrailService auditTrailService; private final boolean enabled; private final ThreadContext threadContext; - private final WorkflowService workflowService; private final OperatorPrivileges.OperatorPrivilegesService operatorPrivilegesService; public SecurityRestFilter( @@ -43,7 +42,6 @@ public SecurityRestFilter( ThreadContext threadContext, SecondaryAuthenticator secondaryAuthenticator, AuditTrailService auditTrailService, - WorkflowService workflowService, RestHandler restHandler, OperatorPrivileges.OperatorPrivilegesService operatorPrivilegesService ) { @@ -52,7 +50,6 @@ public SecurityRestFilter( this.threadContext = threadContext; this.secondaryAuthenticator = secondaryAuthenticator; this.auditTrailService = auditTrailService; - this.workflowService = workflowService; // can be null if security is not enabled this.operatorPrivilegesService = operatorPrivilegesService == null ? OperatorPrivileges.NOOP_OPERATOR_PRIVILEGES_SERVICE @@ -83,7 +80,8 @@ public void handleRequest(RestRequest request, RestChannel channel, NodeClient c if (secondaryAuthentication != null) { logger.trace("Found secondary authentication {} in REST request [{}]", secondaryAuthentication, request.uri()); } - workflowService.resolveWorkflowAndStoreInThreadContext(getConcreteRestHandler(), threadContext); + WorkflowService.resolveWorkflowAndStoreInThreadContext(getConcreteRestHandler(), threadContext); + doHandleRequest(request, channel, client); }, e -> handleException(request, channel, e))); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java index cdc2e7caceedc..3102ba4e4ee36 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/oauth2/RestGetTokenAction.java @@ -165,7 +165,7 @@ public void onFailure(Exception e) { } } - private String extractBase64EncodedToken(ElasticsearchSecurityException e) { + private static String extractBase64EncodedToken(ElasticsearchSecurityException e) { String base64EncodedToken = null; List values = e.getHeader(KerberosAuthenticationToken.WWW_AUTHENTICATE); if (values != null && values.size() == 1) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java index 9a47ff429c48c..09527b251b6e8 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/saml/RestSamlAuthenticateAction.java @@ -115,7 +115,7 @@ public RestResponse buildResponse(SamlAuthenticateResponse response, XContentBui } } - private byte[] decodeBase64(String content) { + private static byte[] decodeBase64(String content) { content = content.replaceAll("\\s+", ""); try { return Base64.getDecoder().decode(content); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java index dfedc2c659033..9809127080dc5 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java @@ -108,7 +108,7 @@ private void validateHeaders() { } } - private void ensureRequiredHeaderInContext(ThreadContext threadContext, String requiredHeader) { + private static void ensureRequiredHeaderInContext(ThreadContext threadContext, String requiredHeader) { if (threadContext.getHeader(requiredHeader) == null) { throw CrossClusterAccessAuthenticationService.requiredHeaderMissingException(requiredHeader); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java index 75126b205dcd6..bfd87326d4481 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java @@ -40,7 +40,6 @@ class ServerTransportFilter { private final AuthenticationService authcService; private final AuthorizationService authzService; - private final SecurityActionMapper actionMapper = new SecurityActionMapper(); private final ThreadContext threadContext; private final boolean extractClientCert; private final DestructiveOperations destructiveOperations; diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ApiKeyServiceTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ApiKeyServiceTests.java index a0a1b622cf36e..48184a4e3a9df 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ApiKeyServiceTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ApiKeyServiceTests.java @@ -2192,7 +2192,7 @@ public void testMaybeBuildUpdatedDocument() throws IOException { when(request.getMetadata()).thenReturn(newMetadata); final var service = createApiKeyService(); - final XContentBuilder builder = service.maybeBuildUpdatedDocument( + final XContentBuilder builder = ApiKeyService.maybeBuildUpdatedDocument( apiKeyId, oldApiKeyDoc, newVersion, diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticatorTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticatorTests.java index 60f68d4104a99..057a55ea4708d 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticatorTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticatorTests.java @@ -935,7 +935,7 @@ public void testHandleUserinfoResponseSuccess() throws Exception { final PlainActionFuture future = new PlainActionFuture<>(); this.authenticator = buildAuthenticator(); - this.authenticator.handleUserinfoResponse(response, idClaims, future); + OpenIdConnectAuthenticator.handleUserinfoResponse(response, idClaims, future); final JWTClaimsSet finalClaims = future.get(); assertThat(finalClaims.getSubject(), equalTo(sub)); @@ -957,7 +957,7 @@ public void testHandleUserinfoResponseFailure() throws Exception { final PlainActionFuture future = new PlainActionFuture<>(); this.authenticator = buildAuthenticator(); - this.authenticator.handleUserinfoResponse(response, idClaims, future); + OpenIdConnectAuthenticator.handleUserinfoResponse(response, idClaims, future); final ElasticsearchSecurityException exception = expectThrows(ElasticsearchSecurityException.class, future::actionGet); assertThat( diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/service/ServiceAccountServiceTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/service/ServiceAccountServiceTests.java index cdf847e4356f7..0c40e3996d288 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/service/ServiceAccountServiceTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/service/ServiceAccountServiceTests.java @@ -579,7 +579,7 @@ public void testGetRoleDescriptor() throws ExecutionException, InterruptedExcept ); final PlainActionFuture future1 = new PlainActionFuture<>(); - serviceAccountService.getRoleDescriptor(auth1, future1); + ServiceAccountService.getRoleDescriptor(auth1, future1); final RoleDescriptor roleDescriptor1 = future1.get(); assertNotNull(roleDescriptor1); assertThat(roleDescriptor1.getName(), equalTo("elastic/fleet-server")); @@ -594,7 +594,7 @@ public void testGetRoleDescriptor() throws ExecutionException, InterruptedExcept Map.of("_token_name", randomAlphaOfLengthBetween(3, 8), "_token_source", tokenSource.name().toLowerCase(Locale.ROOT)) ); final PlainActionFuture future2 = new PlainActionFuture<>(); - serviceAccountService.getRoleDescriptor(auth2, future2); + ServiceAccountService.getRoleDescriptor(auth2, future2); final ElasticsearchSecurityException e = expectThrows(ElasticsearchSecurityException.class, future2::actionGet); assertThat(e.getMessage(), containsString("cannot load role for service account [" + username + "] - no such service account")); } diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/RBACEngineTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/RBACEngineTests.java index d60858234e8fb..2420d7c2269a6 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/RBACEngineTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/RBACEngineTests.java @@ -1663,7 +1663,7 @@ public void testGetRoleDescriptorsForRemoteClusterForReservedRoles() { // superuser { final SimpleRole role = Role.buildFromRoleDescriptor( - reservedRolesStore.roleDescriptor("superuser"), + ReservedRolesStore.roleDescriptor("superuser"), fieldPermissionsCache, RESTRICTED_INDICES ); @@ -1699,7 +1699,7 @@ public void testGetRoleDescriptorsForRemoteClusterForReservedRoles() { // kibana_system { final SimpleRole role = Role.buildFromRoleDescriptor( - reservedRolesStore.roleDescriptor("kibana_system"), + ReservedRolesStore.roleDescriptor("kibana_system"), fieldPermissionsCache, RESTRICTED_INDICES ); @@ -1735,7 +1735,7 @@ public void testGetRoleDescriptorsForRemoteClusterForReservedRoles() { // monitoring_user { final SimpleRole role = Role.buildFromRoleDescriptor( - reservedRolesStore.roleDescriptor("monitoring_user"), + ReservedRolesStore.roleDescriptor("monitoring_user"), fieldPermissionsCache, RESTRICTED_INDICES ); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/restriction/WorkflowServiceTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/restriction/WorkflowServiceTests.java index 437ea041d4ee6..1fe0a9f8c7999 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/restriction/WorkflowServiceTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/restriction/WorkflowServiceTests.java @@ -26,16 +26,14 @@ public class WorkflowServiceTests extends ESTestCase { - private final WorkflowService workflowService = new WorkflowService(); - public void testResolveWorkflowAndStoreInThreadContextWithKnownRestHandler() { final Workflow expectedWorkflow = randomFrom(WorkflowResolver.allWorkflows()); final RestHandler restHandler = new TestBaseRestHandler(randomFrom(expectedWorkflow.allowedRestHandlers())); final ThreadContext threadContext = new ThreadContext(Settings.EMPTY); - final Workflow actualWorkflow = workflowService.resolveWorkflowAndStoreInThreadContext(restHandler, threadContext); + final Workflow actualWorkflow = WorkflowService.resolveWorkflowAndStoreInThreadContext(restHandler, threadContext); assertThat(actualWorkflow, equalTo(expectedWorkflow)); - assertThat(workflowService.readWorkflowFromThreadContext(threadContext), equalTo(expectedWorkflow.name())); + assertThat(WorkflowService.readWorkflowFromThreadContext(threadContext), equalTo(expectedWorkflow.name())); } public void testResolveWorkflowAndStoreInThreadContextWithUnknownRestHandler() { @@ -51,9 +49,9 @@ public void testResolveWorkflowAndStoreInThreadContextWithUnknownRestHandler() { } final ThreadContext threadContext = new ThreadContext(Settings.EMPTY); - final Workflow actualWorkflow = workflowService.resolveWorkflowAndStoreInThreadContext(restHandler, threadContext); + final Workflow actualWorkflow = WorkflowService.resolveWorkflowAndStoreInThreadContext(restHandler, threadContext); assertThat(actualWorkflow, nullValue()); - assertThat(workflowService.readWorkflowFromThreadContext(threadContext), nullValue()); + assertThat(WorkflowService.readWorkflowFromThreadContext(threadContext), nullValue()); } public static class TestBaseRestHandler extends BaseRestHandler { diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java index 46a78f1055a6f..8a042a5921a45 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java @@ -2267,7 +2267,7 @@ public void testGetRoleForWorkflowWithRestriction() { // Tests that for a role with restriction, getRole returns: // 1. a usable role when originating workflow matches try (var ignored = threadContext.stashContext()) { - workflowService.resolveWorkflowAndStoreInThreadContext( + WorkflowService.resolveWorkflowAndStoreInThreadContext( new TestBaseRestHandler(randomFrom(workflow.allowedRestHandlers())), threadContext ); @@ -2282,7 +2282,7 @@ public void testGetRoleForWorkflowWithRestriction() { // 2. an "empty-restricted" role if originating workflow does not match (or is null) try (var ignored = threadContext.stashContext()) { - workflowService.resolveWorkflowAndStoreInThreadContext(new TestBaseRestHandler(randomAlphaOfLength(10)), threadContext); + WorkflowService.resolveWorkflowAndStoreInThreadContext(new TestBaseRestHandler(randomAlphaOfLength(10)), threadContext); final PlainActionFuture future1 = new PlainActionFuture<>(); compositeRolesStore.getRole(authentication1.getEffectiveSubject(), future1); @@ -2377,7 +2377,7 @@ public void testGetRoleForWorkflowWithoutRestriction() { try (var ignored = threadContext.stashContext()) { boolean useExistingWorkflowAsOriginating = randomBoolean(); Workflow existingWorkflow = randomFrom(WorkflowResolver.allWorkflows()); - workflowService.resolveWorkflowAndStoreInThreadContext( + WorkflowService.resolveWorkflowAndStoreInThreadContext( new TestBaseRestHandler( useExistingWorkflowAsOriginating ? randomFrom(existingWorkflow.allowedRestHandlers()) : randomAlphaOfLengthBetween(4, 8) ), diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/enrollment/ExternalEnrollmentTokenGeneratorTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/enrollment/ExternalEnrollmentTokenGeneratorTests.java index 339b3de9ecb49..669f67d80c1f8 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/enrollment/ExternalEnrollmentTokenGeneratorTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/enrollment/ExternalEnrollmentTokenGeneratorTests.java @@ -85,8 +85,8 @@ public void testCreateSuccess() throws Exception { final CommandLineHttpClient client = mock(CommandLineHttpClient.class); final ExternalEnrollmentTokenGenerator externalEnrollmentTokenGenerator = new ExternalEnrollmentTokenGenerator(environment, client); final URL baseURL = new URL("http://localhost:9200"); - final URL createAPIKeyURL = externalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); - final URL getHttpInfoURL = externalEnrollmentTokenGenerator.getHttpInfoUrl(baseURL); + final URL createAPIKeyURL = ExternalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); + final URL getHttpInfoURL = ExternalEnrollmentTokenGenerator.getHttpInfoUrl(baseURL); final HttpResponse httpResponseOK = new HttpResponse(HttpURLConnection.HTTP_OK, new HashMap<>()); when(client.execute(anyString(), any(URL.class), anyString(), any(SecureString.class), anyCheckedSupplier(), anyCheckedFunction())) @@ -174,7 +174,7 @@ public void testFailedCreateApiKey() throws Exception { final CommandLineHttpClient client = mock(CommandLineHttpClient.class); final URL baseURL = new URL("http://localhost:9200"); final ExternalEnrollmentTokenGenerator externalEnrollmentTokenGenerator = new ExternalEnrollmentTokenGenerator(environment, client); - final URL createAPIKeyURL = externalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); + final URL createAPIKeyURL = ExternalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); final HttpResponse httpResponseNotOK = new HttpResponse(HttpURLConnection.HTTP_BAD_REQUEST, new HashMap<>()); when( @@ -200,8 +200,8 @@ public void testFailedRetrieveHttpInfo() throws Exception { final CommandLineHttpClient client = mock(CommandLineHttpClient.class); final URL baseURL = new URL("http://localhost:9200"); final ExternalEnrollmentTokenGenerator externalEnrollmentTokenGenerator = new ExternalEnrollmentTokenGenerator(environment, client); - final URL createAPIKeyURL = externalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); - final URL getHttpInfoURL = externalEnrollmentTokenGenerator.getHttpInfoUrl(baseURL); + final URL createAPIKeyURL = ExternalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); + final URL getHttpInfoURL = ExternalEnrollmentTokenGenerator.getHttpInfoUrl(baseURL); final HttpResponse httpResponseOK = new HttpResponse(HttpURLConnection.HTTP_OK, new HashMap<>()); when( @@ -278,8 +278,8 @@ public void testFailedNoCaInKeystore() throws Exception { final CommandLineHttpClient client = mock(CommandLineHttpClient.class); final ExternalEnrollmentTokenGenerator externalEnrollmentTokenGenerator = new ExternalEnrollmentTokenGenerator(environment, client); final URL baseURL = new URL("http://localhost:9200"); - final URL createAPIKeyURL = externalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); - final URL getHttpInfoURL = externalEnrollmentTokenGenerator.getHttpInfoUrl(baseURL); + final URL createAPIKeyURL = ExternalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); + final URL getHttpInfoURL = ExternalEnrollmentTokenGenerator.getHttpInfoUrl(baseURL); final HttpResponse httpResponseOK = new HttpResponse(HttpURLConnection.HTTP_OK, new HashMap<>()); when( @@ -362,8 +362,8 @@ public void testFailedManyCaInKeystore() throws Exception { final CommandLineHttpClient client = mock(CommandLineHttpClient.class); final ExternalEnrollmentTokenGenerator externalEnrollmentTokenGenerator = new ExternalEnrollmentTokenGenerator(environment, client); final URL baseURL = new URL("http://localhost:9200"); - final URL createAPIKeyURL = externalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); - final URL getHttpInfoURL = externalEnrollmentTokenGenerator.getHttpInfoUrl(baseURL); + final URL createAPIKeyURL = ExternalEnrollmentTokenGenerator.createAPIKeyUrl(baseURL); + final URL getHttpInfoURL = ExternalEnrollmentTokenGenerator.getHttpInfoUrl(baseURL); final HttpResponse httpResponseOK = new HttpResponse(HttpURLConnection.HTTP_OK, new HashMap<>()); when( diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java index 2547839f59b56..69884cd1e6dbd 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java @@ -102,7 +102,6 @@ private SecurityRestFilter getFilter(OperatorPrivileges.OperatorPrivilegesServic threadContext, secondaryAuthenticator, new AuditTrailService(null, null), - new WorkflowService(), restHandler, privilegesService ); @@ -171,15 +170,7 @@ public void testProcessSecondaryAuthentication() throws Exception { } public void testProcessWithSecurityDisabled() throws Exception { - filter = new SecurityRestFilter( - false, - threadContext, - secondaryAuthenticator, - mock(AuditTrailService.class), - mock(WorkflowService.class), - restHandler, - null - ); + filter = new SecurityRestFilter(false, threadContext, secondaryAuthenticator, mock(AuditTrailService.class), restHandler, null); assertEquals(NOOP_OPERATOR_PRIVILEGES_SERVICE, filter.getOperatorPrivilegesService()); RestRequest request = mock(RestRequest.class); filter.handleRequest(request, channel, null); @@ -231,7 +222,6 @@ public Set getFilteredFields() { threadContext, secondaryAuthenticator, new AuditTrailService(auditTrail, licenseState), - new WorkflowService(), restHandler, NOOP_OPERATOR_PRIVILEGES_SERVICE ); @@ -298,19 +288,11 @@ public void testProcessWithWorkflow() throws Exception { restHandler = new TestBaseRestHandler(randomFrom(workflow.allowedRestHandlers())); final WorkflowService workflowService = new WorkflowService(); - filter = new SecurityRestFilter( - true, - threadContext, - secondaryAuthenticator, - new AuditTrailService(null, null), - workflowService, - restHandler, - null - ); + filter = new SecurityRestFilter(true, threadContext, secondaryAuthenticator, new AuditTrailService(null, null), restHandler, null); RestRequest request = mock(RestRequest.class); filter.handleRequest(request, channel, null); - assertThat(workflowService.readWorkflowFromThreadContext(threadContext), equalTo(workflow.name())); + assertThat(WorkflowService.readWorkflowFromThreadContext(threadContext), equalTo(workflow.name())); } public void testProcessWithoutWorkflow() throws Exception { @@ -325,19 +307,11 @@ public void testProcessWithoutWorkflow() throws Exception { } final WorkflowService workflowService = new WorkflowService(); - filter = new SecurityRestFilter( - true, - threadContext, - secondaryAuthenticator, - new AuditTrailService(null, null), - workflowService, - restHandler, - null - ); + filter = new SecurityRestFilter(true, threadContext, secondaryAuthenticator, new AuditTrailService(null, null), restHandler, null); RestRequest request = mock(RestRequest.class); filter.handleRequest(request, channel, null); - assertThat(workflowService.readWorkflowFromThreadContext(threadContext), nullValue()); + assertThat(WorkflowService.readWorkflowFromThreadContext(threadContext), nullValue()); } public void testCheckRest() throws Exception { diff --git a/x-pack/plugin/snapshot-based-recoveries/src/main/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerService.java b/x-pack/plugin/snapshot-based-recoveries/src/main/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerService.java index 4887419507c6f..5e93003b04aa9 100644 --- a/x-pack/plugin/snapshot-based-recoveries/src/main/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerService.java +++ b/x-pack/plugin/snapshot-based-recoveries/src/main/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerService.java @@ -180,7 +180,7 @@ && isSnapshotVersionCompatible(latestSnapshot) ); } - private boolean isSnapshotVersionCompatible(ShardSnapshot snapshot) { + private static boolean isSnapshotVersionCompatible(ShardSnapshot snapshot) { IndexVersion commitVersion = snapshot.getCommitVersion(); // if the snapshotVersion == null that means that the snapshot was taken in a version <= 7.15, // therefore we can safely use that snapshot. Since this runs on the shard primary and @@ -193,7 +193,7 @@ private boolean isSnapshotVersionCompatible(ShardSnapshot snapshot) { return commitVersion.onOrBefore(IndexVersion.current()); } - private ShardRecoveryPlan getRecoveryPlanUsingSourceNode( + private static ShardRecoveryPlan getRecoveryPlanUsingSourceNode( Store.MetadataSnapshot sourceMetadata, Store.RecoveryDiff sourceTargetDiff, List filesMissingInTarget, @@ -233,7 +233,7 @@ public void onFailure(Exception e) { shardSnapshotsService.fetchLatestSnapshotsForShard(shardId, listenerIgnoringErrors); } - private Store.MetadataSnapshot toMetadataSnapshot(List files) { + private static Store.MetadataSnapshot toMetadataSnapshot(List files) { return new Store.MetadataSnapshot( files.stream().collect(Collectors.toMap(StoreFileMetadata::name, Function.identity())), emptyMap(), diff --git a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/CustomDateFormatTestCase.java b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/CustomDateFormatTestCase.java index 861d6f1582321..3f70c52df64b0 100644 --- a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/CustomDateFormatTestCase.java +++ b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/CustomDateFormatTestCase.java @@ -71,7 +71,7 @@ public void testCustomDateFormatsWithNowFunctions() throws IOException { } } - private void createIndex() throws IOException { + private static void createIndex() throws IOException { Request request = new Request("PUT", "/test"); XContentBuilder index = JsonXContent.contentBuilder().prettyPrint().startObject(); diff --git a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/FieldExtractorTestCase.java b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/FieldExtractorTestCase.java index 23c7579c8716c..253736dfa01a0 100644 --- a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/FieldExtractorTestCase.java +++ b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/FieldExtractorTestCase.java @@ -1271,7 +1271,7 @@ private enum NestedFieldType { LEAF; } - private void addField( + private static void addField( XContentBuilder index, boolean nestedFieldAdded, int remainingFields, @@ -1342,16 +1342,19 @@ private void addField( } } - private boolean shouldAddNestedField() { + private static boolean shouldAddNestedField() { return randomBoolean(); } - private void createIndexWithFieldTypeAndAlias(String type, Map> fieldProps, Map indexProps) - throws IOException { + private static void createIndexWithFieldTypeAndAlias( + String type, + Map> fieldProps, + Map indexProps + ) throws IOException { createIndexWithFieldTypeAndProperties(type, fieldProps, indexProps, true, false, null); } - private void createIndexWithFieldTypeAndProperties( + private static void createIndexWithFieldTypeAndProperties( String type, Map> fieldProps, Map indexProps @@ -1359,7 +1362,7 @@ private void createIndexWithFieldTypeAndProperties( createIndexWithFieldTypeAndProperties(type, fieldProps, indexProps, false, false, null); } - private void createIndexWithFieldTypeAndSubFields( + private static void createIndexWithFieldTypeAndSubFields( String type, Map> fieldProps, Map indexProps, @@ -1369,7 +1372,7 @@ private void createIndexWithFieldTypeAndSubFields( createIndexWithFieldTypeAndProperties(type, fieldProps, indexProps, false, true, subFieldsProps, subFieldsTypes); } - private void createIndexWithFieldTypeAndProperties( + private static void createIndexWithFieldTypeAndProperties( String type, Map> fieldProps, Map indexProps, @@ -1450,7 +1453,7 @@ private void createIndexWithFieldTypeAndProperties( client().performRequest(request); } - private Request buildRequest(String query) { + private static Request buildRequest(String query) { Request request = new Request("POST", RestSqlTestCase.SQL_QUERY_REST_ENDPOINT); request.addParameter("error_trace", "true"); request.addParameter("pretty", "true"); @@ -1459,14 +1462,14 @@ private Request buildRequest(String query) { return request; } - private Map runSql(String query) throws IOException { + private static Map runSql(String query) throws IOException { Response response = client().performRequest(buildRequest(query)); try (InputStream content = response.getEntity().getContent()) { return XContentHelper.convertToMap(JsonXContent.jsonXContent, content, false); } } - private JDBCType jdbcTypeFor(String esType) { + private static JDBCType jdbcTypeFor(String esType) { return switch (esType) { case "long" -> JDBCType.BIGINT; case "integer" -> JDBCType.INTEGER; diff --git a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java index 88fbf4112c611..70f4c932b7142 100644 --- a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java +++ b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java @@ -206,7 +206,7 @@ public void testFloatingPointNumbersReturnTypes() throws IOException { } @SuppressWarnings({ "unchecked" }) - private void assertFloatingPointNumbersReturnTypes(Request request, Mode mode) throws IOException { + private static void assertFloatingPointNumbersReturnTypes(Request request, Mode mode) throws IOException { String requestContent = query( "SELECT " + "CAST(1234.34 AS REAL) AS float_positive," @@ -249,12 +249,19 @@ private void assertFloatingPointNumbersReturnTypes(Request request, Mode mode) t assertEquals(row.get(3), -1234567890123.34d); } - private void assertQuery(String sql, String columnName, String columnType, Object columnValue, int displaySize) throws IOException { + private static void assertQuery(String sql, String columnName, String columnType, Object columnValue, int displaySize) + throws IOException { assertQuery(sql, columnName, columnType, columnValue, null, displaySize); } - private void assertQuery(String sql, String columnName, String columnType, Object columnValue, Object cliColumnValue, int displaySize) - throws IOException { + private static void assertQuery( + String sql, + String columnName, + String columnType, + Object columnValue, + Object cliColumnValue, + int displaySize + ) throws IOException { for (Mode mode : Mode.values()) { boolean isCliCheck = mode == CLI && cliColumnValue != null; assertQuery(sql, columnName, columnType, isCliCheck ? cliColumnValue : columnValue, displaySize, mode); @@ -262,7 +269,7 @@ private void assertQuery(String sql, String columnName, String columnType, Objec } @SuppressWarnings({ "unchecked" }) - private void assertQuery(String sql, String columnName, String columnType, Object columnValue, int displaySize, Mode mode) + private static void assertQuery(String sql, String columnName, String columnType, Object columnValue, int displaySize, Mode mode) throws IOException { boolean columnar = randomBoolean(); Map response = runSql(mode, sql, columnar); @@ -293,7 +300,7 @@ private void assertQuery(String sql, String columnName, String columnType, Objec } } - private Map runSql(Mode mode, String sql, boolean columnar) throws IOException { + private static Map runSql(Mode mode, String sql, boolean columnar) throws IOException { Request request = new Request("POST", SQL_QUERY_REST_ENDPOINT); String requestContent = query(sql).mode(mode).toString(); String format = randomFrom(XContentType.JSON, XContentType.SMILE, XContentType.CBOR, XContentType.YAML).name() diff --git a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/cli/EmbeddedCli.java b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/cli/EmbeddedCli.java index 9636129c5f25c..1e3de6317d239 100644 --- a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/cli/EmbeddedCli.java +++ b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/cli/EmbeddedCli.java @@ -274,7 +274,7 @@ public String command(String command) throws IOException { * Create the "echo" that we expect jLine to send to the terminal * while we're typing a command. */ - private List expectedCommandEchos(String command) { + private static List expectedCommandEchos(String command) { List commandLines = Arrays.stream(command.split("\n")).filter(s -> s.isEmpty() == false).toList(); List result = new ArrayList<>(commandLines.size() * 2); result.add("[?1h=[?2004h[33msql> [0m" + commandLines.get(0)); diff --git a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/cli/PartialResultsTestCase.java b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/cli/PartialResultsTestCase.java index 163284cada329..bebbbc16f631f 100644 --- a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/cli/PartialResultsTestCase.java +++ b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/cli/PartialResultsTestCase.java @@ -17,7 +17,7 @@ public abstract class PartialResultsTestCase extends CliIntegrationTestCase { - private void createTestIndex(int okShards, int badShards) throws IOException { + private static void createTestIndex(int okShards, int badShards) throws IOException { final String mappingTemplate = """ { "aliases": { diff --git a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlPaginationTestCase.java b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlPaginationTestCase.java index 7e298b2ad3e5d..72871aadce2b5 100644 --- a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlPaginationTestCase.java +++ b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlPaginationTestCase.java @@ -62,7 +62,7 @@ public void testPaginationIsConsistentWithPivotQueries() throws Exception { assertNoSearchContexts(client()); } - private String fetchRemainingPages(String cursor, String format) throws IOException { + private static String fetchRemainingPages(String cursor, String format) throws IOException { StringBuilder result = new StringBuilder(); while (cursor != null) { Tuple response = runSqlAsText(cursor(cursor), format); diff --git a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java index 3f8e7801118ec..5f6d5f1d7298c 100644 --- a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java +++ b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java @@ -1539,7 +1539,7 @@ public void testFetchAllPagesListCursor(String format) throws IOException { * 2. There are at most `expectedValues.size() / pageSize + 1` pages (the last one might or might not be empty) * 3. Optionally: That the last page is not empty. */ - private void testFetchAllPages(String format, String query, List expectedValues, int pageSize, boolean emptyLastPage) + private static void testFetchAllPages(String format, String query, List expectedValues, int pageSize, boolean emptyLastPage) throws IOException { int remainingPages = expectedValues.size() / pageSize + 1; @@ -1581,7 +1581,7 @@ public void testDataStreamInShowTablesFiltered() throws IOException { expectDataStreamInShowTables(dataStreamName, "SHOW TABLES \\\"" + dataStreamName + "*\\\""); } - private void expectDataStreamInShowTables(String dataStreamName, String sql) throws IOException { + private static void expectDataStreamInShowTables(String dataStreamName, String sql) throws IOException { try { createDataStream(dataStreamName); diff --git a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlUsageTestCase.java b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlUsageTestCase.java index c979feba781c7..626679eaf6669 100644 --- a/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlUsageTestCase.java +++ b/x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlUsageTestCase.java @@ -310,7 +310,7 @@ private void index(List docs) throws IOException { client().performRequest(request); } - private Map getStats() throws UnsupportedOperationException, IOException { + private static Map getStats() throws UnsupportedOperationException, IOException { Request request = new Request("GET", SQL_STATS_REST_ENDPOINT); Map responseAsMap; try (InputStream content = client().performRequest(request).getEntity().getContent()) { @@ -320,7 +320,7 @@ private Map getStats() throws UnsupportedOperationException, IOE return responseAsMap; } - private void runTranslate(String sql) throws IOException { + private static void runTranslate(String sql) throws IOException { Request request = new Request("POST", SQL_TRANSLATE_REST_ENDPOINT); if (randomBoolean()) { // We default to JSON but we force it randomly for extra coverage @@ -349,7 +349,7 @@ private String scroll(String cursor) throws IOException { } @SuppressWarnings({ "unchecked", "rawtypes" }) - private void assertTranslateQueryMetric(int expected, Map responseAsMap) throws IOException { + private static void assertTranslateQueryMetric(int expected, Map responseAsMap) throws IOException { List>> nodesListStats = (List) responseAsMap.get("stats"); int actualMetricValue = 0; for (Map perNodeStats : nodesListStats) { @@ -384,7 +384,7 @@ private String runSql(String sql, Integer fetchSize) throws IOException { } @SuppressWarnings({ "unchecked", "rawtypes" }) - private void assertFeatureMetric(int expected, Map responseAsMap, String feature) throws IOException { + private static void assertFeatureMetric(int expected, Map responseAsMap, String feature) throws IOException { List> nodesListStats = (List>) responseAsMap.get("stats"); int actualMetricValue = 0; for (Map perNodeStats : nodesListStats) { @@ -395,7 +395,8 @@ private void assertFeatureMetric(int expected, Map responseAsMap } @SuppressWarnings({ "unchecked", "rawtypes" }) - private void assertQueryMetric(int expected, Map responseAsMap, String queryType, String metric) throws IOException { + private static void assertQueryMetric(int expected, Map responseAsMap, String queryType, String metric) + throws IOException { List>> nodesListStats = (List) responseAsMap.get("stats"); int actualMetricValue = 0; for (Map perNodeStats : nodesListStats) { @@ -410,7 +411,7 @@ private void assertClientTypeQueryMetric(int expected, Map respo assertQueryMetric(expected, responseAsMap, clientType, metric); } - private void assertAllQueryMetric(int expected, Map responseAsMap, String metric) throws IOException { + private static void assertAllQueryMetric(int expected, Map responseAsMap, String metric) throws IOException { assertQueryMetric(expected, responseAsMap, "_all", metric); } diff --git a/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/Cli.java b/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/Cli.java index 60264874472ef..8bd1e2c5d0581 100644 --- a/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/Cli.java +++ b/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/Cli.java @@ -151,7 +151,7 @@ private void execute(String uri, boolean debug, boolean binary, String keystoreL } } - private void checkConnection(CliSession cliSession, CliTerminal cliTerminal, ConnectionConfiguration con) throws UserException { + private static void checkConnection(CliSession cliSession, CliTerminal cliTerminal, ConnectionConfiguration con) throws UserException { try { cliSession.checkConnection(); } catch (ClientException ex) { diff --git a/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/ConnectionBuilder.java b/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/ConnectionBuilder.java index d24a0d22a4e30..3d6324bc44557 100644 --- a/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/ConnectionBuilder.java +++ b/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/ConnectionBuilder.java @@ -101,7 +101,7 @@ public ConnectionConfiguration buildConnection(String connectionStringArg, Strin } @SuppressForbidden(reason = "cli application shouldn't depend on ES") - private Path getKeystorePath(String keystoreLocation) { + private static Path getKeystorePath(String keystoreLocation) { return Paths.get(keystoreLocation); } diff --git a/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/command/ServerQueryCliCommand.java b/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/command/ServerQueryCliCommand.java index b2f5e998baa4e..8efc920bdbc16 100644 --- a/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/command/ServerQueryCliCommand.java +++ b/x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/command/ServerQueryCliCommand.java @@ -60,7 +60,7 @@ protected boolean doHandle(CliTerminal terminal, CliSession cliSession, String l return true; } - private void handleText(CliTerminal terminal, String str) { + private static void handleText(CliTerminal terminal, String str) { terminal.print(str); } } diff --git a/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/HttpClient.java b/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/HttpClient.java index 77e9012afa814..3c8f614145719 100644 --- a/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/HttpClient.java +++ b/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/HttpClient.java @@ -152,7 +152,7 @@ private ResponseWithWarnings con.request( (out) -> out.write(requestBytes), - this::readFrom, + HttpClient::readFrom, "POST", requestBodyContentType.mediaTypeWithoutParameters() // "application/cbor" or "application/json" ) @@ -199,7 +199,7 @@ private Response get(String path, CheckedFunction con.request(null, this::readFrom, "GET") + con -> con.request(null, HttpClient::readFrom, "GET") ) ).getResponseOrThrowException(); return fromContent(contentType(response.v1()), response.v2(), responseParser); @@ -216,7 +216,7 @@ private byte[] toContent(Request request) { } } - private Tuple>, byte[]> readFrom(InputStream inputStream, Function> headers) { + private static Tuple>, byte[]> readFrom(InputStream inputStream, Function> headers) { ByteArrayOutputStream out = new ByteArrayOutputStream(); try { Streams.copy(inputStream, out); @@ -227,7 +227,7 @@ private Tuple>, byte[]> readFrom(InputStream input } - private ContentType contentType(Function> headers) { + private static ContentType contentType(Function> headers) { List contentTypeHeaders = headers.apply("Content-Type"); String contentType = contentTypeHeaders == null || contentTypeHeaders.isEmpty() ? null : contentTypeHeaders.get(0); @@ -239,7 +239,7 @@ private ContentType contentType(Function> headers) { } } - private Response fromContent( + private static Response fromContent( ContentType type, byte[] bytesReference, CheckedFunction responseParser diff --git a/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/JreHttpUrlConnection.java b/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/JreHttpUrlConnection.java index a632bb6b3698e..b41c5864a28b0 100644 --- a/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/JreHttpUrlConnection.java +++ b/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/JreHttpUrlConnection.java @@ -187,7 +187,7 @@ public ResponseOrException request( } } - private Function> getHeaderFields(URLConnection con) { + private static Function> getHeaderFields(URLConnection con) { return header -> { List values = new LinkedList<>(); for (Map.Entry> entry : con.getHeaderFields().entrySet()) { @@ -199,7 +199,7 @@ private Function> getHeaderFields(URLConnection con) { }; } - private boolean shouldParseBody(int responseCode) { + private static boolean shouldParseBody(int responseCode) { return responseCode == 200 || responseCode == 201 || responseCode == 202; } diff --git a/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/ProxyConfig.java b/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/ProxyConfig.java index f4aa8099bf60b..36628e5d59d90 100644 --- a/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/ProxyConfig.java +++ b/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/ProxyConfig.java @@ -40,7 +40,7 @@ class ProxyConfig { } @SuppressForbidden(reason = "create the actual proxy") - private Proxy createProxy(Proxy.Type type, Object[] address) { + private static Proxy createProxy(Proxy.Type type, Object[] address) { return new Proxy(type, new InetSocketAddress((String) address[0], (int) address[1])); } diff --git a/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/SslConfig.java b/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/SslConfig.java index e1645b3ed5833..72c891bf52a43 100644 --- a/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/SslConfig.java +++ b/x-pack/plugin/sql/sql-client/src/main/java/org/elasticsearch/xpack/sql/client/SslConfig.java @@ -130,7 +130,7 @@ private KeyManager[] loadKeyManagers() throws GeneralSecurityException, IOExcept return kmFactory.getKeyManagers(); } - private KeyStore loadKeyStore(String source, char[] pass, String keyStoreType) throws GeneralSecurityException, IOException { + private static KeyStore loadKeyStore(String source, char[] pass, String keyStoreType) throws GeneralSecurityException, IOException { KeyStore keyStore = KeyStore.getInstance(keyStoreType); Path path = Paths.get(source); diff --git a/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ConstructingObjectParser.java b/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ConstructingObjectParser.java index 77b5e46cebf31..d6ef897ed58b0 100644 --- a/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ConstructingObjectParser.java +++ b/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ConstructingObjectParser.java @@ -104,7 +104,7 @@ private BiConsumer queueingConsumer(BiConsumer consumer }; } - private boolean isConstructorArg(BiConsumer consumer) { + private static boolean isConstructorArg(BiConsumer consumer) { return consumer == REQUIRED_CONSTRUCTOR_ARG_MARKER || consumer == OPTIONAL_CONSTRUCTOR_ARG_MARKER; } diff --git a/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ObjectParser.java b/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ObjectParser.java index 2b5d94d9c51b0..b3d21193b5915 100644 --- a/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ObjectParser.java +++ b/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ObjectParser.java @@ -174,7 +174,7 @@ Value parse(JsonParser parser, Value value, Context context) throws IOException return value; } - private void maybeMarkRequiredField(String currentFieldName, List requiredFields) { + private static void maybeMarkRequiredField(String currentFieldName, List requiredFields) { Iterator iter = requiredFields.iterator(); while (iter.hasNext()) { String[] requiredFieldNames = iter.next(); @@ -232,7 +232,7 @@ private void parseValue(JsonParser parser, FieldParser fieldParser, String curre } } - private void throwMustEndOn(JsonParser parser, String currentFieldName, JsonToken token) { + private static void throwMustEndOn(JsonParser parser, String currentFieldName, JsonToken token) { throw new ParseException(location(parser), "parser for [" + currentFieldName + "] did not end on " + token); } @@ -258,7 +258,7 @@ private void throwFailedToParse(JsonParser parser, String currentFieldName, Exce throw new ParseException(location(parser), "[" + name + "] failed to parse field [" + currentFieldName + "]", ex); } - private void throwMissingRequiredFields(List requiredFields) { + private static void throwMissingRequiredFields(List requiredFields) { final StringBuilder message = new StringBuilder(); for (String[] fields : requiredFields) { message.append("Required one of fields ").append(Arrays.toString(fields)).append(", but none were specified. "); diff --git a/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ParsedMediaType.java b/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ParsedMediaType.java index cb877c7a285ff..c005da5ff0789 100644 --- a/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ParsedMediaType.java +++ b/x-pack/plugin/sql/sql-proto/src/main/java/org/elasticsearch/xpack/sql/proto/content/ParsedMediaType.java @@ -118,7 +118,7 @@ public String responseContentTypeHeader() { return mediaTypeWithoutParameters() + formatParameters(parameters); } - private String formatParameters(Map params) { + private static String formatParameters(Map params) { String joined = params.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining(";")); return joined.isEmpty() ? "" : ";" + joined; } diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java index d7b95f80298e2..c0bf3efa74f13 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java @@ -202,7 +202,7 @@ protected LogicalPlan rule(With plan) { return substituteCTE(plan.child(), plan.subQueries()); } - private LogicalPlan substituteCTE(LogicalPlan p, Map subQueries) { + private static LogicalPlan substituteCTE(LogicalPlan p, Map subQueries) { if (p instanceof UnresolvedRelation ur) { SubQueryAlias subQueryAlias = subQueries.get(ur.table().index()); if (subQueryAlias != null) { @@ -344,7 +344,7 @@ else if (plan instanceof OrderBy o) { }); } - private List expandProjections(List projections, LogicalPlan child) { + private static List expandProjections(List projections, LogicalPlan child) { List result = new ArrayList<>(); List output = child.output(); @@ -366,7 +366,7 @@ private List expandProjections(List return result; } - private List expandStar(UnresolvedStar us, List output) { + private static List expandStar(UnresolvedStar us, List output) { List expanded = new ArrayList<>(); // a qualifier is specified - since this is a star, it should be a CompoundDataType @@ -532,7 +532,7 @@ protected LogicalPlan doRule(LogicalPlan plan) { return plan; } - private Integer findOrdinal(Expression expression) { + private static Integer findOrdinal(Expression expression) { if (expression.foldable()) { if (expression.dataType().isInteger()) { Object v = Foldables.valueOf(expression); @@ -789,7 +789,7 @@ protected LogicalPlan rule(LogicalPlan plan) { return plan; } - private Expression replaceAliases(Expression condition, List named) { + private static Expression replaceAliases(Expression condition, List named) { List aliases = new ArrayList<>(); named.forEach(n -> { if (n instanceof Alias) { @@ -878,11 +878,11 @@ protected LogicalPlan doRule(LogicalPlan plan) { return plan; } - private boolean hasUnresolvedAliases(List expressions) { + private static boolean hasUnresolvedAliases(List expressions) { return expressions != null && Expressions.anyMatch(expressions, UnresolvedAlias.class::isInstance); } - private List assignAliases(List exprs) { + private static List assignAliases(List exprs) { List newExpr = new ArrayList<>(exprs.size()); for (NamedExpression expr : exprs) { NamedExpression transformed = (NamedExpression) expr.transformUp(UnresolvedAlias.class, ua -> { @@ -1015,7 +1015,7 @@ protected LogicalPlan rule(Filter f, AnalyzerContext context) { return f; } - private Set findMissingAggregate(Aggregate target, Expression from) { + private static Set findMissingAggregate(Aggregate target, Expression from) { Set missing = new LinkedHashSet<>(); for (Expression filterAgg : from.collect(Functions::isAggregate)) { @@ -1106,10 +1106,10 @@ protected boolean skipResolved() { @Override protected LogicalPlan rule(LogicalPlan plan) { - return plan.transformExpressionsDown(this::implicitCast); + return plan.transformExpressionsDown(ImplicitCasting::implicitCast); } - private Expression implicitCast(Expression e) { + private static Expression implicitCast(Expression e) { if (e.childrenResolved() == false) { return e; } @@ -1209,7 +1209,7 @@ protected LogicalPlan rule(LogicalPlan plan) { return plan.transformExpressionsOnly(Alias.class, a -> a.child()); } - private List cleanChildrenAliases(List args) { + private static List cleanChildrenAliases(List args) { List cleaned = new ArrayList<>(args.size()); for (NamedExpression ne : args) { cleaned.add((NamedExpression) trimNonTopLevelAliases(ne)); @@ -1217,7 +1217,7 @@ private List cleanChildrenAliases(List cleanAllAliases(List args) { + private static List cleanAllAliases(List args) { List cleaned = new ArrayList<>(args.size()); for (Expression e : args) { cleaned.add(trimAliases(e)); diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java index 72af249f17b6b..c7826919c5999 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java @@ -274,7 +274,7 @@ Collection verify(LogicalPlan plan, SqlVersion version) { return failures; } - private void checkNestedAggregation(LogicalPlan p, Set localFailures, AttributeMap attributeRefs) { + private static void checkNestedAggregation(LogicalPlan p, Set localFailures, AttributeMap attributeRefs) { if (p instanceof Aggregate) { ((Aggregate) p).child().forEachDown(Aggregate.class, a -> { localFailures.add(fail(a, "Nested aggregations in sub-selects are not supported.")); @@ -282,7 +282,7 @@ private void checkNestedAggregation(LogicalPlan p, Set localFailures, A } } - private void checkFullTextSearchInSelect(LogicalPlan plan, Set localFailures) { + private static void checkFullTextSearchInSelect(LogicalPlan plan, Set localFailures) { plan.forEachUp(Project.class, p -> { for (NamedExpression ne : p.projections()) { ne.forEachUp( diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/PivotRowSet.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/PivotRowSet.java index fae22e1ba60dc..fb78aa950f61d 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/PivotRowSet.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/PivotRowSet.java @@ -117,7 +117,7 @@ else if (hasNull(currentRow) == false || data.isEmpty()) { lastAfterKey = currentRowGroupKey; } - private boolean hasNull(Object[] currentRow) { + private static boolean hasNull(Object[] currentRow) { for (Object object : currentRow) { if (object == null) { return true; diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/optimizer/Optimizer.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/optimizer/Optimizer.java index 1fa2ca845b218..d3ab0f797ae2f 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/optimizer/Optimizer.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/optimizer/Optimizer.java @@ -304,7 +304,7 @@ protected LogicalPlan rule(Aggregate agg) { static class PruneOrderByNestedFields extends OptimizerRule { - private void findNested(Expression exp, AttributeMap functions, Consumer onFind) { + private static void findNested(Expression exp, AttributeMap functions, Consumer onFind) { exp.forEachUp(e -> { if (e instanceof ReferenceAttribute) { Function f = functions.resolve(e); @@ -549,7 +549,10 @@ protected LogicalPlan rule(UnaryPlan plan) { // normally only the upper projections should survive but since the lower list might have aliases definitions // that might be reused by the upper one, these need to be replaced. // for example an alias defined in the lower list might be referred in the upper - without replacing it the alias becomes invalid - private List combineProjections(List upper, List lower) { + private static List combineProjections( + List upper, + List lower + ) { // TODO: this need rewriting when moving functions of NamedExpression @@ -636,7 +639,7 @@ protected LogicalPlan rule(LogicalPlan plan) { } - private boolean canPropagateFoldable(LogicalPlan p) { + private static boolean canPropagateFoldable(LogicalPlan p) { return p instanceof Project || p instanceof Filter || p instanceof SubQueryAlias @@ -827,7 +830,7 @@ protected LogicalPlan rule(UnaryPlan plan) { return plan; } - private LocalRelation unfilteredLocalRelation(LogicalPlan plan) { + private static LocalRelation unfilteredLocalRelation(LogicalPlan plan) { List filterOrLeaves = plan.collectFirstChildren(p -> p instanceof Filter || p instanceof LeafPlan); if (filterOrLeaves.size() == 1) { @@ -1172,7 +1175,7 @@ protected LogicalPlan rule(UnaryPlan plan) { return plan; } - private List extractLiterals(List named) { + private static List extractLiterals(List named) { List values = new ArrayList<>(); for (NamedExpression n : named) { if (n instanceof Alias a) { @@ -1198,14 +1201,16 @@ static class SkipQueryForLiteralAggregations extends OptimizerRule { @Override protected LogicalPlan rule(Aggregate plan) { - if (plan.groupings().isEmpty() && plan.child() instanceof EsRelation && plan.aggregates().stream().allMatch(this::foldable)) { + if (plan.groupings().isEmpty() + && plan.child() instanceof EsRelation + && plan.aggregates().stream().allMatch(SkipQueryForLiteralAggregations::foldable)) { return plan.replaceChild(new LocalRelation(plan.source(), new SingletonExecutable())); } return plan; } - private boolean foldable(Expression e) { + private static boolean foldable(Expression e) { if (e instanceof Alias) { e = ((Alias) e).child(); } diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/LogicalPlanBuilder.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/LogicalPlanBuilder.java index 0b1d346bf051d..c170689e1fa90 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/LogicalPlanBuilder.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/LogicalPlanBuilder.java @@ -249,7 +249,7 @@ public LogicalPlan visitRelation(RelationContext ctx) { return result; } - private Join doJoin(JoinRelationContext ctx) { + private static Join doJoin(JoinRelationContext ctx) { JoinCriteriaContext criteria = ctx.joinCriteria(); if (criteria != null) { @@ -286,7 +286,7 @@ public LogicalPlan visitTableName(TableNameContext ctx) { return new UnresolvedRelation(source(ctx), tableIdentifier, alias, includeFrozen); } - private Limit limit(LogicalPlan plan, Source source, Token limit) { + private static Limit limit(LogicalPlan plan, Source source, Token limit) { return new Limit(source, new Literal(source, Integer.parseInt(limit.getText()), DataTypes.INTEGER), plan); } } diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/Mapper.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/Mapper.java index 2f94b5e869a33..d1233a63c4d57 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/Mapper.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/Mapper.java @@ -116,7 +116,7 @@ protected PhysicalPlan map(Join j) { return join(j); } - private PhysicalPlan join(Join join) { + private static PhysicalPlan join(Join join) { // TODO: pick up on nested/parent-child docs // 2. Hash? // 3. Cartesian diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetCheckpointAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetCheckpointAction.java index 1a90ee22e29db..8167305ef0cee 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetCheckpointAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetCheckpointAction.java @@ -90,7 +90,7 @@ protected void resolveIndicesAndGetCheckpoint(Task task, Request request, Action new AsyncGetCheckpointsFromNodesAction(state, task, nodesAndShards, new OriginalIndices(request), listener).start(); } - private Map> resolveIndicesToPrimaryShards(ClusterState state, String[] concreteIndices) { + private static Map> resolveIndicesToPrimaryShards(ClusterState state, String[] concreteIndices) { if (concreteIndices.length == 0) { return Collections.emptyMap(); } diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartTransformAction.java index 375c6e063ac6d..13423de7d3a85 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartTransformAction.java @@ -384,7 +384,7 @@ public boolean test(PersistentTasksCustomMetadata.PersistentTask persistentTa // checking for `isNotStopped` as the state COULD be marked as failed for any number of reasons // But if it is in a failed state, _stats will show as much and give good reason to the user. // If it is not able to be assigned to a node all together, we should just close the task completely - private boolean isNotStopped(PersistentTasksCustomMetadata.PersistentTask task) { + private static boolean isNotStopped(PersistentTasksCustomMetadata.PersistentTask task) { TransformState state = (TransformState) task.getState(); return state != null && state.getTaskState().equals(TransformTaskState.STOPPED) == false; } diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/IndexBasedTransformConfigManager.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/IndexBasedTransformConfigManager.java index 30577a41998af..107c3c2b5bd65 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/IndexBasedTransformConfigManager.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/IndexBasedTransformConfigManager.java @@ -898,7 +898,7 @@ private void parseCheckpointsLenientlyFromSource( } } - private QueryBuilder buildQueryFromTokenizedIds(String[] idTokens, String resourceName) { + private static QueryBuilder buildQueryFromTokenizedIds(String[] idTokens, String resourceName) { BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery() .filter(QueryBuilders.termQuery(TransformField.INDEX_DOC_TYPE.getPreferredName(), resourceName)); if (Strings.isAllOrWildcard(idTokens) == false) { diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestCatTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestCatTransformAction.java index a7ca920b5a970..b68afa8db75fb 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestCatTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestCatTransformAction.java @@ -211,7 +211,7 @@ private static Table getTableWithHeader() { .endHeaders(); } - private Table buildTable(GetTransformAction.Response response, GetTransformStatsAction.Response statsResponse) { + private static Table buildTable(GetTransformAction.Response response, GetTransformStatsAction.Response statsResponse) { Table table = getTableWithHeader(); Map statsById = statsResponse.getTransformsStats() .stream() diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java index 6e35bcbd18a5d..aa956e47ad49a 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java @@ -364,7 +364,7 @@ private static IndexerState currentIndexerState(TransformState previousState) { }; } - private void markAsFailed(TransformTask task, String reason) { + private static void markAsFailed(TransformTask task, String reason) { CountDownLatch latch = new CountDownLatch(1); task.fail( diff --git a/x-pack/plugin/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/feature/FeatureFactory.java b/x-pack/plugin/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/feature/FeatureFactory.java index 0feafd8b8af02..0c4ff1780ae1e 100644 --- a/x-pack/plugin/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/feature/FeatureFactory.java +++ b/x-pack/plugin/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/feature/FeatureFactory.java @@ -236,7 +236,7 @@ private LineString buildMercatorLine(Line line) { return geomFactory.createLineString(buildMercatorCoordinates(line)); } - private Coordinate[] buildMercatorCoordinates(Line line) { + private static Coordinate[] buildMercatorCoordinates(Line line) { final Coordinate[] coordinates = new Coordinate[line.length()]; for (int i = 0; i < line.length(); i++) { final double x = SphericalMercatorUtils.lonToSphericalMercator(line.getX(i)); @@ -282,7 +282,7 @@ private org.locationtech.jts.geom.MultiPoint buildMercatorMultiPoint(MultiPoint return geomFactory.createMultiPoint(points); } - private org.locationtech.jts.geom.Geometry clipGeometry( + private static org.locationtech.jts.geom.Geometry clipGeometry( org.locationtech.jts.geom.Geometry tile, org.locationtech.jts.geom.Geometry geometry ) { diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java index 0c8690cc62e5f..e5fd1fcbf2035 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java @@ -857,7 +857,7 @@ public String getFeatureDescription() { return "Manages Watch definitions and state"; } - private Settings getWatchesIndexSettings() { + private static Settings getWatchesIndexSettings() { return Settings.builder() .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) @@ -867,7 +867,7 @@ private Settings getWatchesIndexSettings() { .build(); } - private XContentBuilder getWatchesIndexMappings() { + private static XContentBuilder getWatchesIndexMappings() { try { final XContentBuilder builder = jsonBuilder(); @@ -949,7 +949,7 @@ private XContentBuilder getWatchesIndexMappings() { } } - private Settings getTriggeredWatchesIndexSettings() { + private static Settings getTriggeredWatchesIndexSettings() { return Settings.builder() .put("index.number_of_shards", 1) .put("index.auto_expand_replicas", "0-1") @@ -959,7 +959,7 @@ private Settings getTriggeredWatchesIndexSettings() { .build(); } - private XContentBuilder getTriggeredWatchesIndexMappings() { + private static XContentBuilder getTriggeredWatchesIndexMappings() { try { final XContentBuilder builder = jsonBuilder(); diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherIndexingListener.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherIndexingListener.java index ca91d51a2d129..7e16a0353f2cd 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherIndexingListener.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherIndexingListener.java @@ -328,7 +328,10 @@ private boolean hasShardAllocationIdChanged(String watchIndex, ClusterState stat * - then store the size of the allocation ids and the index position * data.put(ShardId(".watch", 0), new Tuple(1, 4)) */ - Map getLocalShardAllocationIds(List localShards, IndexRoutingTable routingTable) { + static Map getLocalShardAllocationIds( + List localShards, + IndexRoutingTable routingTable + ) { Map data = Maps.newMapWithExpectedSize(localShards.size()); for (ShardRouting shardRouting : localShards) { diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java index 73c3a4c093fdf..571e8912b43b2 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleService.java @@ -191,7 +191,7 @@ private void pauseExecution(String reason) { /** * check if watcher has been stopped manually via the stop API */ - private boolean isWatcherStoppedManually(ClusterState state) { + private static boolean isWatcherStoppedManually(ClusterState state) { WatcherMetadata watcherMetadata = state.getMetadata().custom(WatcherMetadata.TYPE); return watcherMetadata != null && watcherMetadata.manuallyStopped(); } diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java index 3a3638a88edcc..0472722bd80a2 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherService.java @@ -419,7 +419,7 @@ void refreshWatches(IndexMetadata indexMetadata) { * @param index The index of the local shard * @return true if the we should parse the watch on this node, false otherwise */ - private boolean parseWatchOnThisNode(String id, int totalShardCount, int index) { + private static boolean parseWatchOnThisNode(String id, int totalShardCount, int index) { int hash = Murmur3HashFunction.hash(id); int shardIndex = Math.floorMod(hash, totalShardCount); return shardIndex == index; diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java index 0a67129495cb5..b385298c09062 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/index/ExecutableIndexAction.java @@ -226,7 +226,14 @@ private Map addTimestampToDocument(Map data, Zon /** * Extracts the specified field out of data map, or alternative falls back to the action value */ - private String getField(String actionId, String watchId, String name, Map data, String fieldName, String defaultValue) { + private static String getField( + String actionId, + String watchId, + String name, + Map data, + String fieldName, + String defaultValue + ) { Object obj; // map may be immutable - only try to remove if it's actually there if (data.containsKey(fieldName) && (obj = data.remove(fieldName)) != null) { @@ -255,7 +262,7 @@ private String getField(String actionId, String watchId, String name, Map mutableMap(Map data) { + private static Map mutableMap(Map data) { return data instanceof HashMap ? data : new HashMap<>(data); } diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpClient.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpClient.java index e70e1ba349086..9a165112c41d1 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpClient.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpClient.java @@ -334,7 +334,7 @@ static void setProxy(RequestConfig.Builder config, HttpRequest request, HttpProx * * @return An HTTP proxy instance, if no settings are configured this will be an HttpProxy.NO_PROXY instance */ - private HttpProxy getProxyFromSettings(Settings settings) { + private static HttpProxy getProxyFromSettings(Settings settings) { String proxyHost = HttpSettings.PROXY_HOST.get(settings); Scheme proxyScheme = HttpSettings.PROXY_SCHEME.exists(settings) ? Scheme.parse(HttpSettings.PROXY_SCHEME.get(settings)) diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpRequest.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpRequest.java index 7dd9ce8c1012f..4ef46374fba0f 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpRequest.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpRequest.java @@ -200,7 +200,7 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params toX * Sanitize both internal (see {@link #sanitizeInternalHeaders(Map)} and * user-added sensitive headers that should not be shown. */ - private Map sanitizeHeaders(Map headers) { + private static Map sanitizeHeaders(Map headers) { String authorizationHeader = headers.containsKey("Authorization") ? "Authorization" : null; if (authorizationHeader == null) { authorizationHeader = headers.containsKey("authorization") ? "authorization" : null; @@ -217,7 +217,7 @@ private Map sanitizeHeaders(Map headers) { * Sanitize headers that the user may not have added, but were automatically * added by Elasticsearch. */ - private Map sanitizeInternalHeaders(Map headers) { + private static Map sanitizeInternalHeaders(Map headers) { // Redact the additional webhook password, if present. if (headers.containsKey(WebhookService.TOKEN_HEADER_NAME)) { Map sanitizedHeaders = new HashMap<>(headers); diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/text/TextTemplateEngine.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/text/TextTemplateEngine.java index 1d50a3980555e..ddf380652d482 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/text/TextTemplateEngine.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/text/TextTemplateEngine.java @@ -64,7 +64,7 @@ public String render(TextTemplate textTemplate, Map model) { return compiledTemplate.newInstance(mergedModel).execute(); } - private String trimContentType(TextTemplate textTemplate) { + private static String trimContentType(TextTemplate textTemplate) { String template = textTemplate.getTemplate(); if (template.startsWith("__") == false) { return template; // Doesn't even start with __ so can't have a content type @@ -83,7 +83,7 @@ private String trimContentType(TextTemplate textTemplate) { return template; } - private XContentType detectContentType(String content) { + private static XContentType detectContentType(String content) { if (content.startsWith("__")) { // There must be a __ "failed to execute watch [" + ctx.id().watchId() + "]", e); diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java index bee560c33fb62..74c72e468e9b1 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/TriggeredWatchStore.java @@ -94,7 +94,7 @@ public BulkResponse putAll(final List triggeredWatches) throws I * @return The bulk request for the triggered watches * @throws IOException If a triggered watch could not be parsed to JSON, this exception is thrown */ - private BulkRequest createBulkRequest(final List triggeredWatches) throws IOException { + private static BulkRequest createBulkRequest(final List triggeredWatches) throws IOException { BulkRequest request = new BulkRequest(); for (TriggeredWatch triggeredWatch : triggeredWatches) { IndexRequest indexRequest = new IndexRequest(TriggeredWatchStoreField.INDEX_NAME).id(triggeredWatch.id().value()); diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/Account.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/Account.java index eff93d3847b7c..d644a4cf48769 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/Account.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/Account.java @@ -173,7 +173,7 @@ private void executeConnect(Transport transport, String user, String password) t } } - private void setContextClassLoader(final ClassLoader classLoader) { + private static void setContextClassLoader(final ClassLoader classLoader) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { // unprivileged code such as scripts do not have SpecialPermission diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/EmailService.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/EmailService.java index 92cca7c717299..3afe2fa731860 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/EmailService.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/EmailService.java @@ -268,7 +268,7 @@ static boolean recipientDomainsInAllowList(Email email, Set allowedDomai return domains.stream().allMatch(matchesAnyAllowedDomain); } - private EmailSent send(Email email, Authentication auth, Profile profile, Account account) throws MessagingException { + private static EmailSent send(Email email, Authentication auth, Profile profile, Account account) throws MessagingException { assert account != null; try { email = account.send(email, auth, profile); diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParser.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParser.java index 2bb25436e056b..929150e916d21 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParser.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParser.java @@ -80,7 +80,7 @@ public class ReportingAttachmentParser implements EmailAttachmentParser Setting.simpleString(key, Setting.Property.NodeScope, Setting.Property.Dynamic) ); - private static final ObjectParser PARSER = new ObjectParser<>("reporting_attachment"); + private static final ObjectParser PARSER = new ObjectParser<>("reporting_attachment"); private static final ObjectParser PAYLOAD_PARSER = new ObjectParser<>( "reporting_attachment_kibana_payload", true, @@ -98,8 +98,20 @@ public class ReportingAttachmentParser implements EmailAttachmentParser s.parseAuth(p), () -> null, ReportingAttachment.AUTH); - PARSER.declareObjectOrDefault(Builder::proxy, (p, s) -> s.parseProxy(p), () -> null, ReportingAttachment.PROXY); + PARSER.declareObjectOrDefault(Builder::auth, (p, s) -> { + try { + return BasicAuth.parse(p); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }, () -> null, ReportingAttachment.AUTH); + PARSER.declareObjectOrDefault(Builder::proxy, (p, s) -> { + try { + return HttpProxy.parse(p); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }, () -> null, ReportingAttachment.PROXY); PAYLOAD_PARSER.declareString(KibanaReportingPayload::setPath, new ParseField("path")); } @@ -138,7 +150,7 @@ public ReportingAttachmentParser( this.templateEngine = templateEngine; this.logger = LogManager.getLogger(getClass()); clusterSettings.addSettingsUpdateConsumer(REPORT_WARNING_ENABLED_SETTING, this::setWarningEnabled); - clusterSettings.addAffixUpdateConsumer(REPORT_WARNING_TEXT, this::addWarningText, this::warningValidator); + clusterSettings.addAffixUpdateConsumer(REPORT_WARNING_TEXT, this::addWarningText, ReportingAttachmentParser::warningValidator); } void setWarningEnabled(boolean warningEnabled) { @@ -149,8 +161,8 @@ void addWarningText(String name, String value) { customWarnings.put(name, value); } - void warningValidator(String name, String value) { - if (WARNINGS.keySet().contains(name) == false) { + static void warningValidator(String name, String value) { + if (WARNINGS.containsKey(name) == false) { throw new IllegalArgumentException( format( "Warning [%s] is not supported. Only the following warnings are supported [%s]", @@ -169,7 +181,7 @@ public String type() { @Override public ReportingAttachment parse(String id, XContentParser parser) throws IOException { Builder builder = new Builder(id); - PARSER.parse(parser, builder, new AuthParseContext()); + PARSER.parse(parser, builder, null); return builder.build(); } @@ -286,7 +298,7 @@ public Attachment toAttachment(WatchExecutionContext context, Payload payload, R ); } - private void sleep(long sleepMillis, WatchExecutionContext context, ReportingAttachment attachment) { + private static void sleep(long sleepMillis, WatchExecutionContext context, ReportingAttachment attachment) { try { Thread.sleep(sleepMillis); } catch (InterruptedException e) { @@ -344,7 +356,7 @@ private HttpResponse requestReportGeneration(String watchId, String attachmentId /** * Extract the id from JSON payload, so we know which ID to poll for */ - private String extractIdFromJson(String watchId, String attachmentId, BytesReference body) throws IOException { + private static String extractIdFromJson(String watchId, String attachmentId, BytesReference body) throws IOException { // EMPTY is safe here becaus we never call namedObject try ( InputStream stream = body.streamInput(); @@ -369,29 +381,6 @@ private String extractIdFromJson(String watchId, String attachmentId, BytesRefer } } - /** - * A helper class to parse HTTP auth and proxy structures, which is read by an old school pull parser, that is handed over in the ctor. - * See the static parser definition at the top - */ - private static class AuthParseContext { - - BasicAuth parseAuth(XContentParser parser) { - try { - return BasicAuth.parse(parser); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } - - HttpProxy parseProxy(XContentParser parser) { - try { - return HttpProxy.parse(parser); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } - } - /** * Helper class to extract the URL path of the dashboard from the response after a report was triggered * diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/pagerduty/IncidentEvent.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/pagerduty/IncidentEvent.java index be008212a3793..e7b05067a5111 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/pagerduty/IncidentEvent.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/pagerduty/IncidentEvent.java @@ -167,7 +167,7 @@ XContentBuilder buildAPIXContent(XContentBuilder builder, Params params, String /** * Turns the V1 API contexts into 2 distinct lists, images and links. The V2 API has separated these out into 2 top level fields. */ - private void toXContentV2Contexts(XContentBuilder builder, ToXContent.Params params, IncidentEventContext[] contexts) + private static void toXContentV2Contexts(XContentBuilder builder, ToXContent.Params params, IncidentEventContext[] contexts) throws IOException { // contexts can be either links or images, and the v2 api needs them separate Map> groups = Arrays.stream(contexts) diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportActivateWatchAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportActivateWatchAction.java index a821e75569c9e..b5a74aecea5b5 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportActivateWatchAction.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/TransportActivateWatchAction.java @@ -118,7 +118,7 @@ protected void doExecute(ActivateWatchRequest request, ActionListener allocationIds = listener.getLocalShardAllocationIds( + Map allocationIds = WatcherIndexingListener.getLocalShardAllocationIds( asList(shardRouting), indexRoutingTable ); @@ -412,7 +412,7 @@ public void testCheckAllocationIdsWithoutShards() throws Exception { ShardRouting shardRouting = TestShardRouting.newShardRouting(shardId, "other", true, STARTED); IndexRoutingTable indexRoutingTable = IndexRoutingTable.builder(index).addShard(shardRouting).build(); - Map allocationIds = listener.getLocalShardAllocationIds( + Map allocationIds = WatcherIndexingListener.getLocalShardAllocationIds( Collections.emptyList(), indexRoutingTable ); @@ -436,7 +436,10 @@ public void testCheckAllocationIdsWithSeveralShards() { .addShard(TestShardRouting.newShardRouting(secondShardId, "node2", false, STARTED)) .build(); - Map allocationIds = listener.getLocalShardAllocationIds(localShards, indexRoutingTable); + Map allocationIds = WatcherIndexingListener.getLocalShardAllocationIds( + localShards, + indexRoutingTable + ); assertThat(allocationIds.size(), is(2)); } diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParserTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParserTests.java index a8eee3d0f9f1d..ad5609ac34624 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParserTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParserTests.java @@ -673,7 +673,7 @@ public void testWarningValidation() { String keyName = randomAlphaOfLength(5) + "notavalidsettingname"; IllegalArgumentException expectedException = expectThrows( IllegalArgumentException.class, - () -> reportingAttachmentParser.warningValidator(keyName, randomAlphaOfLength(10)) + () -> ReportingAttachmentParser.warningValidator(keyName, randomAlphaOfLength(10)) ); assertThat(expectedException.getMessage(), containsString(keyName)); assertThat(expectedException.getMessage(), containsString("is not supported")); diff --git a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java index 5c9ddc6ea1f0f..54adb26f7ba69 100644 --- a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java +++ b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java @@ -810,7 +810,7 @@ public Query termQuery(Object value, SearchExecutionContext context) { return wildcardQuery(escapeWildcardSyntax(searchTerm), MultiTermQuery.CONSTANT_SCORE_REWRITE, false, context); } - private String escapeWildcardSyntax(String term) { + private static String escapeWildcardSyntax(String term) { StringBuilder result = new StringBuilder(); for (int i = 0; i < term.length();) { final int c = term.codePointAt(i); diff --git a/x-pack/plugin/write-load-forecaster/src/main/java/org/elasticsearch/xpack/writeloadforecaster/LicensedWriteLoadForecaster.java b/x-pack/plugin/write-load-forecaster/src/main/java/org/elasticsearch/xpack/writeloadforecaster/LicensedWriteLoadForecaster.java index d1d69a4b0fd94..c1126df228cfe 100644 --- a/x-pack/plugin/write-load-forecaster/src/main/java/org/elasticsearch/xpack/writeloadforecaster/LicensedWriteLoadForecaster.java +++ b/x-pack/plugin/write-load-forecaster/src/main/java/org/elasticsearch/xpack/writeloadforecaster/LicensedWriteLoadForecaster.java @@ -97,7 +97,7 @@ public Metadata.Builder withWriteLoadForecastForWriteIndex(String dataStreamName return metadata; } - private void clearPreviousForecast(DataStream dataStream, Metadata.Builder metadata) { + private static void clearPreviousForecast(DataStream dataStream, Metadata.Builder metadata) { if (dataStream.getIndices().size() > 1) { final Index previousWriteIndex = dataStream.getIndices().get(dataStream.getIndices().size() - 2); final IndexMetadata previousWriteIndexMetadata = metadata.getSafe(previousWriteIndex); diff --git a/x-pack/qa/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/test/CoreTestTranslater.java b/x-pack/qa/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/test/CoreTestTranslater.java index 34863db4d4bdb..6bd5c791765ec 100644 --- a/x-pack/qa/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/test/CoreTestTranslater.java +++ b/x-pack/qa/runtime-fields/src/main/java/org/elasticsearch/xpack/runtimefields/test/CoreTestTranslater.java @@ -261,7 +261,7 @@ private boolean modifyCreateIndex(ApiCallSection createIndex) { * runtime fields that load from source. * @return true if this mapping supports runtime fields, false otherwise */ - protected final boolean runtimeifyMappingProperties(Map properties, Map runtimeFields) { + protected static boolean runtimeifyMappingProperties(Map properties, Map runtimeFields) { for (Map.Entry property : properties.entrySet()) { if (false == property.getValue() instanceof Map) { continue;