diff --git a/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SecureSM.java b/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SecureSM.java index a21e2ea764859..fa98bc1bacc6c 100644 --- a/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SecureSM.java +++ b/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SecureSM.java @@ -143,7 +143,7 @@ public void checkAccess(ThreadGroup g) { } @SuppressForbidden(reason = "java.security.debug messages go to standard error") - private void debugThreadGroups(final ThreadGroup caller, final ThreadGroup target) { + private static void debugThreadGroups(final ThreadGroup caller, final ThreadGroup target) { System.err.println("access: caller group=" + caller); System.err.println("access: target group=" + target); } diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DiagnosticTrustManager.java b/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DiagnosticTrustManager.java index 120a24d3c0364..52e67b250fc48 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DiagnosticTrustManager.java +++ b/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/DiagnosticTrustManager.java @@ -136,7 +136,7 @@ private void diagnose(CertificateException cause, X509Certificate[] chain, SslDi logger.warning(diagnostic, cause); } - private SSLSession session(Socket socket) { + private static SSLSession session(Socket socket) { if (socket instanceof final SSLSocket ssl) { final SSLSession handshakeSession = ssl.getHandshakeSession(); if (handshakeSession == null) { @@ -149,7 +149,7 @@ private SSLSession session(Socket socket) { } } - private SSLSession session(SSLEngine engine) { + private static SSLSession session(SSLEngine engine) { return engine.getHandshakeSession(); } } diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationLoader.java b/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationLoader.java index b81b036605f81..dfe12ea43da30 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationLoader.java +++ b/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslConfigurationLoader.java @@ -293,7 +293,7 @@ protected SslTrustConfig buildTrustConfig(Path basePath, SslVerificationMode ver return buildDefaultTrustConfig(defaultTrustConfig, keyConfig); } - protected SslTrustConfig buildDefaultTrustConfig(SslTrustConfig trustConfig, SslKeyConfig keyConfig) { + protected static SslTrustConfig buildDefaultTrustConfig(SslTrustConfig trustConfig, SslKeyConfig keyConfig) { final SslTrustConfig trust = keyConfig.asTrustConfig(); if (trust == null) { return trustConfig; diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreKeyConfig.java b/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreKeyConfig.java index 8c07def7a5a6d..ac040a27c3cbb 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreKeyConfig.java +++ b/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreKeyConfig.java @@ -190,7 +190,7 @@ private SslConfigException keystoreException(Path path, GeneralSecurityException /** * Verifies that the keystore contains at least 1 private key entry. */ - private void checkKeyStore(KeyStore keyStore, Path path) throws KeyStoreException { + private static void checkKeyStore(KeyStore keyStore, Path path) throws KeyStoreException { Enumeration aliases = keyStore.aliases(); while (aliases.hasMoreElements()) { String alias = aliases.nextElement(); diff --git a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreTrustConfig.java b/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreTrustConfig.java index f03f5ec577f4e..7c330aa1c2d8c 100644 --- a/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreTrustConfig.java +++ b/libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/StoreTrustConfig.java @@ -123,7 +123,7 @@ private String fileTypeForException() { /** * Verifies that the keystore contains at least 1 trusted certificate entry. */ - private void checkTrustStore(KeyStore store, Path path) throws GeneralSecurityException { + private static void checkTrustStore(KeyStore store, Path path) throws GeneralSecurityException { Enumeration aliases = store.aliases(); while (aliases.hasMoreElements()) { String alias = aliases.nextElement(); diff --git a/libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java b/libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java index 8f1799b18c0be..c23eb09622da6 100644 --- a/libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java +++ b/libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java @@ -254,7 +254,7 @@ public void close() { IOUtils.closeWhileHandlingException(parser); } - private NumberType convertNumberType(JsonParser.NumberType numberType) { + private static NumberType convertNumberType(JsonParser.NumberType numberType) { return switch (numberType) { case INT -> NumberType.INT; case BIG_INTEGER -> NumberType.BIG_INTEGER; diff --git a/libs/x-content/src/main/java/org/elasticsearch/xcontent/ConstructingObjectParser.java b/libs/x-content/src/main/java/org/elasticsearch/xcontent/ConstructingObjectParser.java index ff87078f3007b..fe8fe262660ee 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/xcontent/ConstructingObjectParser.java +++ b/libs/x-content/src/main/java/org/elasticsearch/xcontent/ConstructingObjectParser.java @@ -341,7 +341,7 @@ int getNumberOfFields() { * Constructor arguments are detected by this "marker" consumer. It * keeps the API looking clean even if it is a bit sleezy. */ - 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/libs/x-content/src/main/java/org/elasticsearch/xcontent/MediaTypeRegistry.java b/libs/x-content/src/main/java/org/elasticsearch/xcontent/MediaTypeRegistry.java index 646be14f7a9c5..643b48d54fcdd 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/xcontent/MediaTypeRegistry.java +++ b/libs/x-content/src/main/java/org/elasticsearch/xcontent/MediaTypeRegistry.java @@ -64,7 +64,7 @@ public MediaTypeRegistry register(T[] mediaTypes) { return this; } - private Map convertPatterns(Map paramNameAndValueRegex) { + private static Map convertPatterns(Map paramNameAndValueRegex) { Map parametersForMediaType = new HashMap<>(paramNameAndValueRegex.size()); for (Map.Entry params : paramNameAndValueRegex.entrySet()) { String parameterName = params.getKey().toLowerCase(Locale.ROOT); diff --git a/libs/x-content/src/main/java/org/elasticsearch/xcontent/NamedXContentRegistry.java b/libs/x-content/src/main/java/org/elasticsearch/xcontent/NamedXContentRegistry.java index 99de00159fbd1..bd19734e09e39 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/xcontent/NamedXContentRegistry.java +++ b/libs/x-content/src/main/java/org/elasticsearch/xcontent/NamedXContentRegistry.java @@ -90,7 +90,7 @@ public NamedXContentRegistry(List entries) { this.registry = unmodifiableMap(createRegistry(entries)); } - private Map, Map>> createRegistry(List entries) { + private static Map, Map>> createRegistry(List entries) { if (entries.isEmpty()) { return emptyMap(); } @@ -109,7 +109,7 @@ private Map, Map>> createRegistry(Li return newRegistry; } - private void registerParsers( + private static void registerParsers( Map, Map>> newRegistry, Entry entry, String name, diff --git a/libs/x-content/src/main/java/org/elasticsearch/xcontent/ObjectParser.java b/libs/x-content/src/main/java/org/elasticsearch/xcontent/ObjectParser.java index e9ca43248b480..036e110df99df 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/xcontent/ObjectParser.java +++ b/libs/x-content/src/main/java/org/elasticsearch/xcontent/ObjectParser.java @@ -340,7 +340,7 @@ private void throwNoFieldFound(XContentParser parser) { throw new XContentParseException(parser.getTokenLocation(), "[" + name + "] no field found"); } - 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. "); @@ -348,7 +348,7 @@ private void throwMissingRequiredFields(List requiredFields) { throw new IllegalArgumentException(message.toString()); } - private void ensureExclusiveFields(List> exclusiveFields) { + private static void ensureExclusiveFields(List> exclusiveFields) { StringBuilder message = null; for (List fieldset : exclusiveFields) { if (fieldset.size() > 1) { @@ -373,7 +373,7 @@ private void maybeMarkExclusiveField(String currentFieldName, List> } } - 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(); @@ -522,7 +522,7 @@ public void declareNamedObjects( }, field, ValueType.OBJECT_ARRAY); } - private void parseObjectsInArray( + private static void parseObjectsInArray( Consumer orderedModeCallback, ParseField field, BiFunction objectParser, @@ -546,7 +546,7 @@ private void parseObjectsInArray( } } - private XContentParseException wrapCanBeObjectOrArrayOfObjects(ParseField field, XContentParser p) { + private static XContentParseException wrapCanBeObjectOrArrayOfObjects(ParseField field, XContentParser p) { return new XContentParseException( p.getTokenLocation(), "[" @@ -556,11 +556,11 @@ private XContentParseException wrapCanBeObjectOrArrayOfObjects(ParseField field, ); } - private XContentParseException wrapParseError(ParseField field, XContentParser p, IOException e, String s) { + private static XContentParseException wrapParseError(ParseField field, XContentParser p, IOException e, String s) { return new XContentParseException(p.getTokenLocation(), "[" + field + "] " + s, e); } - private XContentParseException rethrowFieldParseFailure(ParseField field, XContentParser p, String currentName, Exception e) { + private static XContentParseException rethrowFieldParseFailure(ParseField field, XContentParser p, String currentName, Exception e) { return new XContentParseException(p.getTokenLocation(), "[" + field + "] failed to parse field [" + currentName + "]", e); } @@ -668,7 +668,7 @@ private void parseSub(XContentParser parser, FieldParser fieldParser, String cur } } - private void throwMustEndOn(String currentFieldName, XContentParser.Token token) { + private static void throwMustEndOn(String currentFieldName, XContentParser.Token token) { throw new IllegalStateException("parser for [" + currentFieldName + "] did not end on " + token); } diff --git a/libs/x-content/src/main/java/org/elasticsearch/xcontent/ParsedMediaType.java b/libs/x-content/src/main/java/org/elasticsearch/xcontent/ParsedMediaType.java index 71598d28af7d6..bbbaf22e6c95a 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/xcontent/ParsedMediaType.java +++ b/libs/x-content/src/main/java/org/elasticsearch/xcontent/ParsedMediaType.java @@ -139,7 +139,7 @@ public T toMediaType(MediaTypeRegistry mediaTypeRegistr return null; } - private boolean isValidParameter(String paramName, String value, Map registeredParams) { + private static boolean isValidParameter(String paramName, String value, Map registeredParams) { if (registeredParams.containsKey(paramName)) { Pattern regex = registeredParams.get(paramName); return regex.matcher(value).matches(); @@ -162,7 +162,7 @@ public String responseContentTypeHeader(Map params) { return mediaTypeWithoutParameters() + formatParameters(params); } - 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/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 dc0bc57d17eb5..d42ef96d8ff3a 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 @@ -131,7 +131,7 @@ private boolean matchFieldNamesWithDots(String name, int dotIndex, List children; private final boolean isFinalNode; @@ -141,7 +141,7 @@ private class BuildNode { } } - private BuildNode root = new BuildNode(false); + private final BuildNode root = new BuildNode(false); void insert(String filter) { insertNode(filter, root); diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactory.java b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactory.java index a7e324f5bd54c..3d0f9a64876e1 100644 --- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactory.java @@ -58,7 +58,7 @@ public CharGroupTokenizerFactory(IndexSettings indexSettings, Environment enviro } } - private char parseEscapedChar(final String s) { + private static char parseEscapedChar(final String s) { int len = s.length(); char c = s.charAt(0); if (c == '\\') { diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MinHashTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MinHashTokenFilterFactory.java index 9b9fb5a8836ba..a87f7aac58ed1 100644 --- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MinHashTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MinHashTokenFilterFactory.java @@ -36,7 +36,7 @@ public TokenStream create(TokenStream tokenStream) { return minHashFilterFactory.create(tokenStream); } - private Map convertSettings(Settings settings) { + private static Map convertSettings(Settings settings) { Map settingMap = new HashMap<>(); if (settings.hasValue("hash_count")) { settingMap.put("hashCount", settings.get("hash_count")); diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java index 0bc18ae794d27..51f8b6a6076bd 100644 --- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java @@ -111,7 +111,7 @@ public AnalysisMode getAnalysisMode() { }; } - private TokenFilterFactory chainFilters(String name, List filters) { + private static TokenFilterFactory chainFilters(String name, List filters) { return new TokenFilterFactory() { @Override public String name() { @@ -137,7 +137,7 @@ private TokenFilterFactory resolveFilterFactory(Function previousTokenFilters, Function allFilters ) { - final Analyzer analyzer = buildSynonymAnalyzer(tokenizer, charFilters, previousTokenFilters, allFilters); + final Analyzer analyzer = buildSynonymAnalyzer(tokenizer, charFilters, previousTokenFilters); final SynonymMap synonyms = buildSynonyms(analyzer, getRulesFromSettings(environment)); final String name = name(); return new TokenFilterFactory() { diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java index 319f40ab658ac..be49770e80402 100644 --- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java @@ -79,7 +79,7 @@ public TokenFilterFactory getChainAwareTokenFilterFactory( List previousTokenFilters, Function allFilters ) { - final Analyzer analyzer = buildSynonymAnalyzer(tokenizer, charFilters, previousTokenFilters, allFilters); + final Analyzer analyzer = buildSynonymAnalyzer(tokenizer, charFilters, previousTokenFilters); final SynonymMap synonyms = buildSynonyms(analyzer, getRulesFromSettings(environment)); final String name = name(); return new TokenFilterFactory() { @@ -108,11 +108,10 @@ public AnalysisMode getAnalysisMode() { }; } - Analyzer buildSynonymAnalyzer( + static Analyzer buildSynonymAnalyzer( TokenizerFactory tokenizer, List charFilters, - List tokenFilters, - Function allFilters + List tokenFilters ) { return new CustomAnalyzer( tokenizer, diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java index 7271dee894991..3fcbd17067791 100644 --- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java @@ -95,7 +95,7 @@ public TokenFilterFactory getSynonymFilter() { throw new IllegalArgumentException("Token filter [" + name() + "] cannot be used to parse synonyms"); } - private int getFlag(int flag, Settings settings, String key, boolean defaultValue) { + private static int getFlag(int flag, Settings settings, String key, boolean defaultValue) { if (settings.getAsBoolean(key, defaultValue)) { return flag; } diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactory.java index 6789a4d61c692..020462e727316 100644 --- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactory.java @@ -95,7 +95,7 @@ public TokenFilterFactory getSynonymFilter() { throw new IllegalArgumentException("Token filter [" + name() + "] cannot be used to parse synonyms"); } - public int getFlag(int flag, Settings settings, String key, boolean defaultValue) { + public static int getFlag(int flag, Settings settings, String key, boolean defaultValue) { if (settings.getAsBoolean(key, defaultValue)) { return flag; } @@ -103,7 +103,7 @@ public int getFlag(int flag, Settings settings, String key, boolean defaultValue } // source => type - private static Pattern typePattern = Pattern.compile("(.*)\\s*=>\\s*(.*)\\s*$"); + private static final Pattern typePattern = Pattern.compile("(.*)\\s*=>\\s*(.*)\\s*$"); /** * parses a list of MappingCharFilter style rules into a custom byte[] type table diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java index fcffdb7f6b5d1..2179b137cffcf 100644 --- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java @@ -240,7 +240,11 @@ public void testTokenFiltersBypassSynonymAnalysis() throws IOException { TokenFilterFactory tff = plugin.getTokenFilters().get(factory).get(idxSettings, null, factory, settings); TokenizerFactory tok = new KeywordTokenizerFactory(idxSettings, null, "keyword", settings); SynonymTokenFilterFactory stff = new SynonymTokenFilterFactory(idxSettings, null, "synonym", settings); - Analyzer analyzer = stff.buildSynonymAnalyzer(tok, Collections.emptyList(), Collections.singletonList(tff), null); + Analyzer analyzer = SynonymTokenFilterFactory.buildSynonymAnalyzer( + tok, + Collections.emptyList(), + Collections.singletonList(tff) + ); try (TokenStream ts = analyzer.tokenStream("field", "text")) { assertThat(ts, instanceOf(KeywordTokenizer.class)); @@ -308,7 +312,7 @@ public void testDisallowedTokenFilters() throws IOException { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, "Expected IllegalArgumentException for factory " + factory, - () -> stff.buildSynonymAnalyzer(tok, Collections.emptyList(), Collections.singletonList(tff), null) + () -> SynonymTokenFilterFactory.buildSynonymAnalyzer(tok, Collections.emptyList(), Collections.singletonList(tff)) ); assertEquals(factory, "Token filter [" + factory + "] cannot be used to parse synonyms", e.getMessage()); diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CsvParser.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CsvParser.java index f6584557165c6..5b41f8b406633 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CsvParser.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CsvParser.java @@ -175,7 +175,7 @@ private char currentChar() { return line.charAt(currentIndex); } - private boolean isWhitespace(char c) { + private static boolean isWhitespace(char c) { return c == SPACE || c == TAB; } diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateFormat.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateFormat.java index 8ee203f935901..4a9fa93662bde 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateFormat.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateFormat.java @@ -61,7 +61,7 @@ Function getFunction(String format, ZoneId timezone, Loca return date -> Instant.ofEpochMilli(parseMillis(date)).atZone(timezone); } - private long parseMillis(String date) { + private static long parseMillis(String date) { if (date.startsWith("@")) { date = date.substring(1); } diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/FingerprintProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/FingerprintProcessor.java index d2cb7a056bd98..701eab051dd1e 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/FingerprintProcessor.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/FingerprintProcessor.java @@ -346,7 +346,7 @@ public byte[] digest() { @Override public String getAlgorithm() { - return mh.getAlgorithm(); + return Murmur3Hasher.getAlgorithm(); } } 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 a1b7c347b7a7b..372a3abd1038e 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 @@ -179,11 +179,11 @@ private boolean inNetwork(String ip, String network) { }; } - private boolean isLoopback(InetAddress ip) { + private static boolean isLoopback(InetAddress ip) { return ip.isLoopbackAddress(); } - private boolean isUnicast(InetAddress ip) { + private static boolean isUnicast(InetAddress ip) { return Arrays.equals(ip.getAddress(), BROADCAST_IP4) == false && isUnspecified(ip) == false && isLoopback(ip) == false @@ -191,36 +191,36 @@ && isMulticast(ip) == false && isLinkLocalUnicast(ip) == false; } - private boolean isLinkLocalUnicast(InetAddress ip) { + private static boolean isLinkLocalUnicast(InetAddress ip) { return ip.isLinkLocalAddress(); } - private boolean isInterfaceLocalMulticast(InetAddress ip) { + private static boolean isInterfaceLocalMulticast(InetAddress ip) { return ip.isMCNodeLocal(); } - private boolean isLinkLocalMulticast(InetAddress ip) { + private static boolean isLinkLocalMulticast(InetAddress ip) { return ip.isMCLinkLocal(); } - private boolean isMulticast(InetAddress ip) { + private static boolean isMulticast(InetAddress ip) { return ip.isMulticastAddress(); } - private boolean isUnspecified(InetAddress ip) { + private static boolean isUnspecified(InetAddress ip) { var address = ip.getAddress(); return Arrays.equals(UNDEFINED_IP4, address) || Arrays.equals(UNDEFINED_IP6, address); } - private boolean isPrivate(String ip) { + private static boolean isPrivate(String ip) { return CIDRUtils.isInRange(ip, "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "fd00::/8"); } - private boolean isPublic(String ip) { + private static boolean isPublic(String ip) { return isLocalOrPrivate(ip) == false; } - private boolean isLocalOrPrivate(String ip) { + private static boolean isLocalOrPrivate(String ip) { var address = InetAddresses.forString(ip); return isPrivate(ip) || isLoopback(address) diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RegisteredDomainProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RegisteredDomainProcessor.java index 0afc659baa282..6b949889fc960 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RegisteredDomainProcessor.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RegisteredDomainProcessor.java @@ -103,7 +103,7 @@ public String getType() { return TYPE; } - private class DomainInfo { + private static class DomainInfo { private final String domain; private final String registeredDomain; private final String eTLD; diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RemoveProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RemoveProcessor.java index 2fd1242846657..c438eb36a44b6 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RemoveProcessor.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RemoveProcessor.java @@ -73,7 +73,7 @@ private void fieldsToKeepProcessor(IngestDocument document) { .forEach(documentField -> removeWhenPresent(document, documentField)); } - private void removeWhenPresent(IngestDocument document, String documentField) { + private static void removeWhenPresent(IngestDocument document, String documentField) { if (document.hasField(documentField)) { document.removeField(documentField); } @@ -127,7 +127,7 @@ private List getTemplates(String processorTag, Map getFields(String processorTag, Map config, String propertyName) { + private static List getFields(String processorTag, Map config, String propertyName) { final List fields = new ArrayList<>(); if (config.containsKey(propertyName) == false) { diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java index 1dc87a1548a2c..88d0288e1a2e9 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java @@ -197,7 +197,7 @@ protected void doStart() { serverBootstrap.childOption(ChannelOption.ALLOCATOR, NettyAllocator.getAllocator()); serverBootstrap.childHandler(configureServerChannelHandler()); - serverBootstrap.handler(new ServerChannelExceptionHandler(this)); + serverBootstrap.handler(ServerChannelExceptionHandler.INSTANCE); serverBootstrap.childOption(ChannelOption.TCP_NODELAY, SETTING_HTTP_TCP_NO_DELAY.get(settings)); serverBootstrap.childOption(ChannelOption.SO_KEEPALIVE, SETTING_HTTP_TCP_KEEP_ALIVE.get(settings)); @@ -339,20 +339,18 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E @ChannelHandler.Sharable private static class ServerChannelExceptionHandler extends ChannelInboundHandlerAdapter { - private final Netty4HttpServerTransport transport; + static final ServerChannelExceptionHandler INSTANCE = new ServerChannelExceptionHandler(); - private ServerChannelExceptionHandler(Netty4HttpServerTransport transport) { - this.transport = transport; - } + private ServerChannelExceptionHandler() {} @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { ExceptionsHelper.maybeDieOnAnotherThread(cause); Netty4HttpServerChannel httpServerChannel = ctx.channel().attr(HTTP_SERVER_CHANNEL_KEY).get(); if (cause instanceof Error) { - transport.onServerException(httpServerChannel, new Exception(cause)); + AbstractHttpServerTransport.onServerException(httpServerChannel, new Exception(cause)); } else { - transport.onServerException(httpServerChannel, (Exception) cause); + AbstractHttpServerTransport.onServerException(httpServerChannel, (Exception) cause); } } } diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java index 78333567dfe86..d298115faa535 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java @@ -378,7 +378,7 @@ private void setupPipeline(Channel ch) { .addLast("dispatcher", new Netty4MessageInboundHandler(this, recycler)); } - private void addClosedExceptionLogger(Channel channel) { + private static void addClosedExceptionLogger(Channel channel) { channel.closeFuture().addListener(f -> { if (f.isSuccess() == false) { logger.debug(() -> new ParameterizedMessage("exception while closing channel: {}", channel), f.cause()); @@ -387,7 +387,7 @@ private void addClosedExceptionLogger(Channel channel) { } @ChannelHandler.Sharable - private class ServerChannelExceptionHandler extends ChannelInboundHandlerAdapter { + private static class ServerChannelExceptionHandler extends ChannelInboundHandlerAdapter { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java index 12f1475c449e8..719024d5eb1db 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java @@ -278,7 +278,6 @@ public void testHandlingMissingRootLevelSnapshotMetadata() throws Exception { ); logger.info("--> verify that repo is assumed in old metadata format"); - final SnapshotsService snapshotsService = internalCluster().getCurrentMasterNodeInstance(SnapshotsService.class); final ThreadPool threadPool = internalCluster().getCurrentMasterNodeInstance(ThreadPool.class); assertThat( PlainActionFuture.get( @@ -286,7 +285,7 @@ public void testHandlingMissingRootLevelSnapshotMetadata() throws Exception { .execute( ActionRunnable.supply( f, - () -> snapshotsService.minCompatibleVersion(Version.CURRENT, getRepositoryData(repoName), null) + () -> SnapshotsService.minCompatibleVersion(Version.CURRENT, getRepositoryData(repoName), null) ) ) ), @@ -303,7 +302,7 @@ public void testHandlingMissingRootLevelSnapshotMetadata() throws Exception { .execute( ActionRunnable.supply( f, - () -> snapshotsService.minCompatibleVersion(Version.CURRENT, getRepositoryData(repoName), null) + () -> SnapshotsService.minCompatibleVersion(Version.CURRENT, getRepositoryData(repoName), null) ) ) ), diff --git a/server/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java index 94a18eb774e5c..5329c56ba19d3 100644 --- a/server/src/main/java/org/elasticsearch/action/ActionModule.java +++ b/server/src/main/java/org/elasticsearch/action/ActionModule.java @@ -680,7 +680,7 @@ public void reg return unmodifiableMap(actions.getRegistry()); } - private ActionFilters setupActionFilters(List actionPlugins) { + private static ActionFilters setupActionFilters(List actionPlugins) { return new ActionFilters( Collections.unmodifiableSet(actionPlugins.stream().flatMap(p -> p.getActionFilters().stream()).collect(Collectors.toSet())) ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java index ec1749978ca5e..dfb5c2ef02af2 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java @@ -211,7 +211,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - private XContentBuilder unassignedInfoToXContent(UnassignedInfo unassignedInfo, XContentBuilder builder) throws IOException { + private static XContentBuilder unassignedInfoToXContent(UnassignedInfo unassignedInfo, XContentBuilder builder) throws IOException { builder.startObject("unassigned_info"); builder.field("reason", unassignedInfo.getReason()); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java index 33d5d392c336e..57fb0d42ea48a 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java @@ -64,14 +64,11 @@ public final class TransportCleanupRepositoryAction extends TransportMasterNodeA private final RepositoriesService repositoriesService; - private final SnapshotsService snapshotsService; - @Inject public TransportCleanupRepositoryAction( TransportService transportService, ClusterService clusterService, RepositoriesService repositoriesService, - SnapshotsService snapshotsService, ThreadPool threadPool, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver @@ -88,7 +85,6 @@ public TransportCleanupRepositoryAction( ThreadPool.Names.SAME ); this.repositoriesService = repositoriesService; - this.snapshotsService = snapshotsService; // We add a state applier that will remove any dangling repository cleanup actions on master failover. // This is safe to do since cleanups will increment the repository state id before executing any operations to prevent concurrent // operations from corrupting the repository. This is the same safety mechanism used by snapshot deletes. @@ -234,7 +230,7 @@ public void clusterStateProcessed(ClusterState oldState, ClusterState newState) listener, l -> blobStoreRepository.cleanup( repositoryStateId, - snapshotsService.minCompatibleVersion(newState.nodes().getMinNodeVersion(), repositoryData, null), + SnapshotsService.minCompatibleVersion(newState.nodes().getMinNodeVersion(), repositoryData, null), ActionListener.wrap(result -> after(null, result), e -> after(e, null)) ) ) diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java index 7076dbfa240ae..db5a54a9d4950 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java @@ -158,11 +158,11 @@ private Tuple partitionKnownAndValidSettings( ); } - private void logUnknownSetting(final String settingType, final Map.Entry e, final Logger logger) { + private static void logUnknownSetting(final String settingType, final Map.Entry e, final Logger logger) { logger.warn("ignoring existing unknown {} setting: [{}] with value [{}]; archiving", settingType, e.getKey(), e.getValue()); } - private void logInvalidSetting( + private static void logInvalidSetting( final String settingType, final Map.Entry e, final IllegalArgumentException ex, diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java index 7a9537082a80d..b2c817745abbb 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java @@ -105,7 +105,10 @@ && checkClearedBlockAndArchivedSettings(request.persistentSettings(), clearedBlo * archived settings that have been set to null. * @return true if all settings are clear blocks or archived settings. */ - private boolean checkClearedBlockAndArchivedSettings(final Settings settings, final Set clearedBlockAndArchivedSettings) { + private static boolean checkClearedBlockAndArchivedSettings( + final Settings settings, + final Set clearedBlockAndArchivedSettings + ) { for (String key : settings.keySet()) { if (Metadata.SETTING_READ_ONLY_SETTING.getKey().equals(key)) { if (Metadata.SETTING_READ_ONLY_SETTING.get(settings)) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java index bf7d5bf76fe84..231ab29e9a091 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java @@ -477,7 +477,7 @@ private void snapshots( ); } - private boolean isCurrentSnapshotsOnly(String[] snapshots) { + private static boolean isCurrentSnapshotsOnly(String[] snapshots) { return (snapshots.length == 1 && GetSnapshotsRequest.CURRENT_SNAPSHOT.equalsIgnoreCase(snapshots[0])); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/shard/TransportGetShardSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/shard/TransportGetShardSnapshotAction.java index 3e1faee7aa7d1..6cc255956f209 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/shard/TransportGetShardSnapshotAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/shard/TransportGetShardSnapshotAction.java @@ -85,7 +85,7 @@ protected void masterOperation( } GroupedActionListener, RepositoryException>> groupedActionListener = new GroupedActionListener<>( - listener.map(this::transformToResponse), + listener.map(TransportGetShardSnapshotAction::transformToResponse), repositories.size() ); @@ -124,7 +124,7 @@ private void getShardSnapshots( ); } - private GetShardSnapshotResponse transformToResponse( + private static GetShardSnapshotResponse transformToResponse( Collection, RepositoryException>> shardSnapshots ) { final Optional latestSnapshot = shardSnapshots.stream() @@ -142,7 +142,7 @@ private GetShardSnapshotResponse transformToResponse( return new GetShardSnapshotResponse(latestSnapshot.orElse(null), failures); } - private Set getRequestedRepositories(GetShardSnapshotRequest request, ClusterState state) { + private static Set getRequestedRepositories(GetShardSnapshotRequest request, ClusterState state) { RepositoriesMetadata repositories = state.metadata().custom(RepositoriesMetadata.TYPE, RepositoriesMetadata.EMPTY); if (request.getFromAllRepositories()) { return repositories.repositories().stream().map(RepositoryMetadata::name).collect(Collectors.toUnmodifiableSet()); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/AnalysisStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/AnalysisStats.java index ed8a30e4ba34d..6f2479227c3ea 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/AnalysisStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/AnalysisStats.java @@ -313,7 +313,7 @@ public int hashCode() { ); } - private void toXContentCollection(XContentBuilder builder, Params params, String name, Collection coll) + private static void toXContentCollection(XContentBuilder builder, Params params, String name, Collection coll) throws IOException { builder.startArray(name); for (ToXContent toXContent : coll) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java index deca42423f755..2746c116c79e0 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java @@ -312,7 +312,7 @@ static final class Fields { static final String INDEX = "index"; } - private void addIntMinMax(String field, int min, int max, double avg, XContentBuilder builder) throws IOException { + private static void addIntMinMax(String field, int min, int max, double avg, XContentBuilder builder) throws IOException { builder.startObject(field); builder.field(Fields.MIN, min); builder.field(Fields.MAX, max); @@ -320,7 +320,7 @@ private void addIntMinMax(String field, int min, int max, double avg, XContentBu builder.endObject(); } - private void addDoubleMinMax(String field, double min, double max, double avg, XContentBuilder builder) throws IOException { + private static void addDoubleMinMax(String field, double min, double max, double avg, XContentBuilder builder) throws IOException { builder.startObject(field); builder.field(Fields.MIN, min); builder.field(Fields.MAX, max); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java index ca9a318d415dd..3a044273f7aca 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java @@ -25,16 +25,13 @@ public class TransportDeleteStoredScriptAction extends AcknowledgedTransportMasterNodeAction { - private final ScriptService scriptService; - @Inject public TransportDeleteStoredScriptAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, - IndexNameExpressionResolver indexNameExpressionResolver, - ScriptService scriptService + IndexNameExpressionResolver indexNameExpressionResolver ) { super( DeleteStoredScriptAction.NAME, @@ -46,7 +43,6 @@ public TransportDeleteStoredScriptAction( indexNameExpressionResolver, ThreadPool.Names.SAME ); - this.scriptService = scriptService; } @Override @@ -56,7 +52,7 @@ protected void masterOperation( ClusterState state, ActionListener listener ) throws Exception { - scriptService.deleteStoredScript(clusterService, request, listener); + ScriptService.deleteStoredScript(clusterService, request, listener); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java index 9c649ca6c44f4..8b1353dbc7f23 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java @@ -24,16 +24,13 @@ public class TransportGetStoredScriptAction extends TransportMasterNodeReadAction { - private final ScriptService scriptService; - @Inject public TransportGetStoredScriptAction( TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, - IndexNameExpressionResolver indexNameExpressionResolver, - ScriptService scriptService + IndexNameExpressionResolver indexNameExpressionResolver ) { super( GetStoredScriptAction.NAME, @@ -46,7 +43,6 @@ public TransportGetStoredScriptAction( GetStoredScriptResponse::new, ThreadPool.Names.SAME ); - this.scriptService = scriptService; } @Override @@ -56,7 +52,7 @@ protected void masterOperation( ClusterState state, ActionListener listener ) throws Exception { - listener.onResponse(new GetStoredScriptResponse(request.id(), scriptService.getStoredScript(state, request))); + listener.onResponse(new GetStoredScriptResponse(request.id(), ScriptService.getStoredScript(state, request))); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java index 1943e2cbd196a..97a37f42ca6cd 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java @@ -192,7 +192,7 @@ private static void checkSystemIndexAccess( ); } if (netNewSystemIndices.isEmpty() == false) { - throw systemIndices.netNewSystemIndexAccessException(threadContext, netNewSystemIndices); + throw SystemIndices.netNewSystemIndexAccessException(threadContext, netNewSystemIndices); } } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java index a7767a96a2cdb..b1d2f53715345 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java @@ -96,17 +96,17 @@ protected void masterOperation( final boolean isSystemIndex = mainDescriptor != null; final boolean isManagedSystemIndex = isSystemIndex && mainDescriptor.isAutomaticallyManaged(); if (mainDescriptor != null && mainDescriptor.isNetNew()) { - final SystemIndexAccessLevel systemIndexAccessLevel = systemIndices.getSystemIndexAccessLevel(threadPool.getThreadContext()); + final SystemIndexAccessLevel systemIndexAccessLevel = SystemIndices.getSystemIndexAccessLevel(threadPool.getThreadContext()); if (systemIndexAccessLevel != SystemIndexAccessLevel.ALL) { if (systemIndexAccessLevel == SystemIndexAccessLevel.RESTRICTED) { if (systemIndices.getProductSystemIndexNamePredicate(threadPool.getThreadContext()).test(indexName) == false) { - throw systemIndices.netNewSystemIndexAccessException(threadPool.getThreadContext(), List.of(indexName)); + throw SystemIndices.netNewSystemIndexAccessException(threadPool.getThreadContext(), List.of(indexName)); } } else { // BACKWARDS_COMPATIBLE_ONLY should never be a possibility here, it cannot be returned from getSystemIndexAccessLevel assert systemIndexAccessLevel == SystemIndexAccessLevel.NONE : "Expected no system index access but level is " + systemIndexAccessLevel; - throw systemIndices.netNewSystemIndexAccessException(threadPool.getThreadContext(), List.of(indexName)); + throw SystemIndices.netNewSystemIndexAccessException(threadPool.getThreadContext(), List.of(indexName)); } } } @@ -171,7 +171,7 @@ private CreateIndexClusterStateUpdateRequest buildUpdateRequest( .waitForActiveShards(request.waitForActiveShards()); } - private CreateIndexClusterStateUpdateRequest buildSystemIndexUpdateRequest( + private static CreateIndexClusterStateUpdateRequest buildSystemIndexUpdateRequest( CreateIndexRequest request, String cause, SystemIndexDescriptor descriptor diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzer.java b/server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzer.java index a3a1921ef4e0f..9a643ada375ba 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzer.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzer.java @@ -275,7 +275,7 @@ void analyzeDocValues(SegmentReader reader, IndexDiskUsageStats stats) throws IO } } - private void readProximity(Terms terms, PostingsEnum postings) throws IOException { + private static void readProximity(Terms terms, PostingsEnum postings) throws IOException { if (terms.hasPositions()) { for (int pos = 0; pos < postings.freq(); pos++) { postings.nextPosition(); @@ -286,7 +286,7 @@ private void readProximity(Terms terms, PostingsEnum postings) throws IOExceptio } } - private BlockTermState getBlockTermState(TermsEnum termsEnum, BytesRef term) throws IOException { + private static BlockTermState getBlockTermState(TermsEnum termsEnum, BytesRef term) throws IOException { if (term != null && termsEnum.seekExact(term)) { final TermState termState = termsEnum.termState(); if (termState instanceof final Lucene90PostingsFormat.IntBlockTermState blockTermState) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageStats.java index 741707309f43b..bde645a139e15 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageStats.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageStats.java @@ -78,7 +78,7 @@ long getIndexSizeInBytes() { return indexSizeInBytes; } - private void checkByteSize(long bytes) { + private static void checkByteSize(long bytes) { if (bytes < 0) { throw new IllegalArgumentException("Bytes must be non-negative; got " + bytes); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java index f919be22143f7..196b29950b58f 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java @@ -113,7 +113,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - private void addFieldMappingsToBuilder(XContentBuilder builder, Params params, Map mappings) + private static void addFieldMappingsToBuilder(XContentBuilder builder, Params params, Map mappings) throws IOException { for (Map.Entry fieldEntry : mappings.entrySet()) { builder.startObject(fieldEntry.getKey()); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java index 95c1136fd265f..dbf4d753782a9 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java @@ -83,7 +83,7 @@ public void onFailure(Exception e) { } } - private GetFieldMappingsResponse merge(AtomicReferenceArray indexResponses) { + private static GetFieldMappingsResponse merge(AtomicReferenceArray indexResponses) { Map> mergedResponses = new HashMap<>(); for (int i = 0; i < indexResponses.length(); i++) { Object element = indexResponses.get(i); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java index 486ad203a57e3..a9c6e01a71a0c 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java @@ -74,7 +74,7 @@ protected void doMasterOperation( listener.onResponse(new GetMappingsResponse(mappings)); } - private void checkCancellation(Task task) { + private static void checkCancellation(Task task) { if (task instanceof CancellableTask && ((CancellableTask) task).isCancelled()) { throw new CancellationException("Task cancelled"); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java index 456b541a39cf2..62959f67c38f7 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java @@ -129,14 +129,14 @@ public RolloverResult rolloverClusterState( }; } - public void validateIndexName(ClusterState state, String index) { - createIndexService.validateIndexName(index, state); + public static void validateIndexName(ClusterState state, String index) { + MetadataCreateIndexService.validateIndexName(index, state); } /** * Returns the names that rollover would use, but does not perform the actual rollover */ - public NameResolution resolveRolloverNames( + public static NameResolution resolveRolloverNames( ClusterState currentState, String rolloverTarget, String newIndexName, @@ -155,7 +155,7 @@ public NameResolution resolveRolloverNames( public record NameResolution(String sourceName, @Nullable String unresolvedName, String rolloverName) {} - private NameResolution resolveAliasRolloverNames(Metadata metadata, IndexAbstraction alias, String newIndexName) { + private static NameResolution resolveAliasRolloverNames(Metadata metadata, IndexAbstraction alias, String newIndexName) { final IndexMetadata writeIndex = metadata.index(alias.getWriteIndex()); final String sourceProvidedName = writeIndex.getSettings() .get(IndexMetadata.SETTING_INDEX_PROVIDED_NAME, writeIndex.getIndex().getName()); @@ -165,7 +165,7 @@ private NameResolution resolveAliasRolloverNames(Metadata metadata, IndexAbstrac return new NameResolution(sourceIndexName, unresolvedName, rolloverIndexName); } - private NameResolution resolveDataStreamRolloverNames(Metadata metadata, IndexAbstraction.DataStream dataStream) { + private static NameResolution resolveDataStreamRolloverNames(Metadata metadata, IndexAbstraction.DataStream dataStream) { final DataStream ds = dataStream.getDataStream(); final IndexMetadata originalWriteIndex = metadata.index(dataStream.getWriteIndex()); return new NameResolution(originalWriteIndex.getIndex().getName(), null, ds.nextWriteIndexAndGeneration(metadata).v1()); @@ -192,7 +192,7 @@ private RolloverResult rolloverAlias( final Boolean isHidden = IndexMetadata.INDEX_HIDDEN_SETTING.exists(createIndexRequest.settings()) ? IndexMetadata.INDEX_HIDDEN_SETTING.get(createIndexRequest.settings()) : null; - createIndexService.validateIndexName(rolloverIndexName, currentState); // fails if the index already exists + MetadataCreateIndexService.validateIndexName(rolloverIndexName, currentState); // fails if the index already exists checkNoDuplicatedAliasInIndexTemplate(metadata, rolloverIndexName, aliasName, isHidden); if (onlyValidate) { return new RolloverResult(rolloverIndexName, sourceIndexName, currentState); @@ -260,7 +260,7 @@ private RolloverResult rolloverDataStream( final Tuple nextIndexAndGeneration = ds.nextWriteIndexAndGeneration(currentState.metadata()); final String newWriteIndexName = nextIndexAndGeneration.v1(); final long newGeneration = nextIndexAndGeneration.v2(); - createIndexService.validateIndexName(newWriteIndexName, currentState); // fails if the index already exists + MetadataCreateIndexService.validateIndexName(newWriteIndexName, currentState); // fails if the index already exists if (onlyValidate) { return new RolloverResult(newWriteIndexName, originalWriteIndex.getName(), currentState); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java index 25c8a8401370e..6334c1d86245d 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java @@ -60,7 +60,6 @@ public class TransportRolloverAction extends TransportMasterNodeAction { // Now that we have the stats for the cluster, we need to know the names of the index for which we should evaluate // conditions, as well as what our newly created index *would* be. - final MetadataRolloverService.NameResolution trialRolloverNames = rolloverService.resolveRolloverNames( + final MetadataRolloverService.NameResolution trialRolloverNames = MetadataRolloverService.resolveRolloverNames( oldState, rolloverRequest.getRolloverTarget(), rolloverRequest.getNewIndexName(), @@ -147,7 +145,7 @@ protected void masterOperation( final String trialSourceIndexName = trialRolloverNames.sourceName(); final String trialRolloverIndexName = trialRolloverNames.rolloverName(); - rolloverService.validateIndexName(oldState, trialRolloverIndexName); + MetadataRolloverService.validateIndexName(oldState, trialRolloverIndexName); // Evaluate the conditions, so that we can tell without a cluster state update whether a rollover would occur. final Map trialConditionResults = evaluateConditions( @@ -304,7 +302,7 @@ public ClusterState executeTask( final var rolloverRequest = rolloverTask.rolloverRequest(); // Regenerate the rollover names, as a rollover could have happened in between the pre-check and the cluster state update - final var rolloverNames = rolloverService.resolveRolloverNames( + final var rolloverNames = MetadataRolloverService.resolveRolloverNames( currentState, rolloverRequest.getRolloverTarget(), rolloverRequest.getNewIndexName(), diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java index 9f82b231388ad..45d2d96c99448 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java @@ -286,7 +286,7 @@ private IndicesShardStoresResponse.StoreStatus.AllocationStatus getAllocationSta /** * A shard exists/existed in a node only if shard state file exists in the node */ - private boolean shardExistsInNode(final NodeGatewayStartedShards response) { + private static boolean shardExistsInNode(final NodeGatewayStartedShards response) { return response.storeException() != null || response.allocationId() != null; } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java index 9b72222fdd7b7..13750ca94ca7f 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java @@ -28,6 +28,7 @@ import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettingProvider; import org.elasticsearch.index.IndexSettingProviders; import org.elasticsearch.index.mapper.DocumentMapper; @@ -256,7 +257,7 @@ public static Template resolveTemplate( // the context is only used for validation so it's fine to pass fake values for the // shard id and the current timestamp tempIndexService.newSearchExecutionContext(0, 0, null, () -> 0L, null, emptyMap()), - tempIndexService.dateMathExpressionResolverAt(), + IndexService.dateMathExpressionResolverAt(), systemIndices::isSystemName ) ); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java index 6814d616ab62e..017ef29faeffd 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java @@ -222,7 +222,7 @@ protected ShardValidateQueryResponse shardOperation(ShardValidateQueryRequest re return new ShardValidateQueryResponse(request.shardId(), valid, explanation, error); } - private String explain(SearchContext context, boolean rewritten) { + private static String explain(SearchContext context, boolean rewritten) { Query query = rewritten ? context.rewrittenQuery() : context.query(); if (rewritten && query instanceof MatchNoDocsQuery) { return context.parsedQuery().query().toString(); diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestParser.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestParser.java index fbb8f4079368d..365ba67ba9a9c 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestParser.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestParser.java @@ -419,7 +419,7 @@ public void parse( } } - private void checkBulkActionIsProperlyClosed(XContentParser parser) throws IOException { + private static void checkBulkActionIsProperlyClosed(XContentParser parser) throws IOException { XContentParser.Token token; try { token = parser.nextToken(); diff --git a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java index 1ee1d0dcf7030..f5598d8b9bc03 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java @@ -414,11 +414,11 @@ static void prohibitCustomRoutingOnDataStream(DocWriteRequest writeRequest, M } } - boolean isOnlySystem(BulkRequest request, SortedMap indicesLookup, SystemIndices systemIndices) { + static boolean isOnlySystem(BulkRequest request, SortedMap indicesLookup, SystemIndices systemIndices) { return request.getIndices().stream().allMatch(indexName -> isSystemIndex(indicesLookup, systemIndices, indexName)); } - private boolean isSystemIndex(SortedMap indicesLookup, SystemIndices systemIndices, String indexName) { + private static boolean isSystemIndex(SortedMap indicesLookup, SystemIndices systemIndices, String indexName) { final IndexAbstraction abstraction = indicesLookup.get(indexName); if (abstraction != null) { return abstraction.isSystem(); @@ -435,7 +435,7 @@ void createIndex(String index, TimeValue timeout, Version minNodeVersion, Action client.execute(AutoCreateAction.INSTANCE, createIndexRequest, listener); } - private boolean setResponseFailureIfIndexMatches( + private static boolean setResponseFailureIfIndexMatches( AtomicArray responses, int idx, DocWriteRequest request, diff --git a/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java index 518ef2a9d9196..0b0f340cf61e9 100644 --- a/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java +++ b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java @@ -198,7 +198,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - private void buildExplanation(XContentBuilder builder, Explanation explanation) throws IOException { + private static void buildExplanation(XContentBuilder builder, Explanation explanation) throws IOException { builder.field(VALUE.getPreferredName(), explanation.getValue()); builder.field(DESCRIPTION.getPreferredName(), explanation.getDescription()); Explanation[] innerExps = explanation.getDetails(); diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java index 983da5855b711..08486b6a4aca3 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java @@ -172,7 +172,7 @@ private static boolean checkIncludeParents(String[] filters) { return true; } - private boolean canMatchShard( + private static boolean canMatchShard( ShardId shardId, QueryBuilder indexFilter, long nowInMillis, diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java index 6508eb0b6686b..e720079a356db 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java @@ -169,7 +169,7 @@ protected void doExecute(Task task, FieldCapabilitiesRequest request, final Acti } } - private void checkIndexBlocks(ClusterState clusterState, String[] concreteIndices) { + private static void checkIndexBlocks(ClusterState clusterState, String[] concreteIndices) { clusterState.blocks().globalBlockedRaiseException(ClusterBlockLevel.READ); for (String index : concreteIndices) { clusterState.blocks().indexBlockedRaiseException(ClusterBlockLevel.READ, index); @@ -258,7 +258,7 @@ private FieldCapabilitiesResponse merge( return new FieldCapabilitiesResponse(indices, Collections.unmodifiableMap(responseMap), failures); } - private void addUnmappedFields(String[] indices, String field, Map typeMap) { + private static void addUnmappedFields(String[] indices, String field, Map typeMap) { final Set mappedIndices = new HashSet<>(); typeMap.values().forEach(t -> t.getIndices(mappedIndices)); if (mappedIndices.size() != indices.length) { diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java index fca5a2ea43b42..46d69317a2580 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java @@ -32,7 +32,7 @@ class SimulateExecutionService { this.threadPool = threadPool; } - void executeDocument( + static void executeDocument( Pipeline pipeline, IngestDocument ingestDocument, boolean verbose, diff --git a/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java index 0c9840213ff0a..e947ebfcaea11 100644 --- a/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java @@ -285,7 +285,7 @@ private boolean checkMinimumVersion(GroupShardsIterator sha return true; } - private boolean assertExecuteOnStartThread() { + private static boolean assertExecuteOnStartThread() { // Ensure that the current code has the following stacktrace: // AbstractSearchAsyncAction#start -> AbstractSearchAsyncAction#executePhase -> AbstractSearchAsyncAction#performPhaseOnShard final StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); diff --git a/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java index fe542b9685c8e..2df8b60cd9728 100644 --- a/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java +++ b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java @@ -106,7 +106,7 @@ public void run() { } } - private SearchSourceBuilder buildExpandSearchSourceBuilder(InnerHitBuilder options, CollapseBuilder innerCollapseBuilder) { + private static SearchSourceBuilder buildExpandSearchSourceBuilder(InnerHitBuilder options, CollapseBuilder innerCollapseBuilder) { SearchSourceBuilder groupSource = new SearchSourceBuilder(); groupSource.from(options.getFrom()); groupSource.size(options.getSize()); diff --git a/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java index 57faaccf2e60e..6cafc5303fd0e 100644 --- a/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java +++ b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java @@ -36,7 +36,6 @@ */ final class FetchSearchPhase extends SearchPhase { private final ArraySearchPhaseResults fetchResults; - private final SearchPhaseController searchPhaseController; private final AtomicArray queryResults; private final BiFunction, SearchPhase> nextPhaseFactory; private final SearchPhaseContext context; @@ -45,15 +44,9 @@ final class FetchSearchPhase extends SearchPhase { private final SearchProgressListener progressListener; private final AggregatedDfs aggregatedDfs; - FetchSearchPhase( - SearchPhaseResults resultConsumer, - SearchPhaseController searchPhaseController, - AggregatedDfs aggregatedDfs, - SearchPhaseContext context - ) { + FetchSearchPhase(SearchPhaseResults resultConsumer, AggregatedDfs aggregatedDfs, SearchPhaseContext context) { this( resultConsumer, - searchPhaseController, aggregatedDfs, context, (response, queryPhaseResults) -> new ExpandSearchPhase( @@ -66,7 +59,6 @@ final class FetchSearchPhase extends SearchPhase { FetchSearchPhase( SearchPhaseResults resultConsumer, - SearchPhaseController searchPhaseController, AggregatedDfs aggregatedDfs, SearchPhaseContext context, BiFunction, SearchPhase> nextPhaseFactory @@ -81,7 +73,6 @@ final class FetchSearchPhase extends SearchPhase { ); } this.fetchResults = new ArraySearchPhaseResults<>(resultConsumer.getNumShards()); - this.searchPhaseController = searchPhaseController; this.queryResults = resultConsumer.getAtomicArray(); this.aggregatedDfs = aggregatedDfs; this.nextPhaseFactory = nextPhaseFactory; @@ -116,7 +107,6 @@ private void innerRun() throws Exception { final SearchPhaseController.ReducedQueryPhase reducedQueryPhase = resultConsumer.reduce(); final boolean queryAndFetchOptimization = queryResults.length() == 1; final Runnable finishPhase = () -> moveToNextPhase( - searchPhaseController, queryResults, reducedQueryPhase, queryAndFetchOptimization ? queryResults : fetchResults.getAtomicArray() @@ -128,7 +118,7 @@ private void innerRun() throws Exception { finishPhase.run(); } else { ScoreDoc[] scoreDocs = reducedQueryPhase.sortedTopDocs().scoreDocs(); - final IntArrayList[] docIdsToLoad = searchPhaseController.fillDocIdsToLoad(numShards, scoreDocs); + final IntArrayList[] docIdsToLoad = SearchPhaseController.fillDocIdsToLoad(numShards, scoreDocs); // no docs to fetch -- sidestep everything and return if (scoreDocs.length == 0) { // we have to release contexts here to free up resources @@ -136,7 +126,7 @@ private void innerRun() throws Exception { finishPhase.run(); } else { final ScoreDoc[] lastEmittedDocPerShard = isScrollSearch - ? searchPhaseController.getLastEmittedDocPerShard(reducedQueryPhase, numShards) + ? SearchPhaseController.getLastEmittedDocPerShard(reducedQueryPhase, numShards) : null; final CountedCollector counter = new CountedCollector<>( fetchResults, @@ -272,12 +262,11 @@ private void releaseIrrelevantSearchContext(QuerySearchResult queryResult) { } private void moveToNextPhase( - SearchPhaseController searchPhaseController, AtomicArray queryPhaseResults, SearchPhaseController.ReducedQueryPhase reducedQueryPhase, AtomicArray fetchResultsArr ) { - final InternalSearchResponse internalResponse = searchPhaseController.merge( + final InternalSearchResponse internalResponse = SearchPhaseController.merge( context.getRequest().scroll() != null, reducedQueryPhase, fetchResultsArr.asList(), diff --git a/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java b/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java index 9bb45ebb33b62..f426d4f5ce256 100644 --- a/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java +++ b/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java @@ -55,7 +55,6 @@ public class QueryPhaseResultConsumer extends ArraySearchPhaseResults { - private final SearchPhaseController searchPhaseController; - private final QueryPhaseResultConsumer queryPhaseResultConsumer; SearchDfsQueryThenFetchAsyncAction( @@ -35,7 +33,6 @@ final class SearchDfsQueryThenFetchAsyncAction extends AbstractSearchAsyncAction final BiFunction nodeIdToConnection, final Map aliasFilter, final Map concreteIndexBoosts, - final SearchPhaseController searchPhaseController, final Executor executor, final QueryPhaseResultConsumer queryPhaseResultConsumer, final SearchRequest request, @@ -65,7 +62,6 @@ final class SearchDfsQueryThenFetchAsyncAction extends AbstractSearchAsyncAction clusters ); this.queryPhaseResultConsumer = queryPhaseResultConsumer; - this.searchPhaseController = searchPhaseController; SearchProgressListener progressListener = task.getProgressListener(); if (progressListener != SearchProgressListener.NOOP) { notifyListShards(progressListener, clusters, request.source()); @@ -89,13 +85,13 @@ protected void executePhaseOnShard( @Override protected SearchPhase getNextPhase(final SearchPhaseResults results, SearchPhaseContext context) { final List dfsSearchResults = results.getAtomicArray().asList(); - final AggregatedDfs aggregatedDfs = searchPhaseController.aggregateDfs(dfsSearchResults); + final AggregatedDfs aggregatedDfs = SearchPhaseController.aggregateDfs(dfsSearchResults); return new DfsQueryPhase( dfsSearchResults, aggregatedDfs, queryPhaseResultConsumer, - (queryResults) -> new FetchSearchPhase(queryResults, searchPhaseController, aggregatedDfs, context), + (queryResults) -> new FetchSearchPhase(queryResults, aggregatedDfs, context), context ); } diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java index 4b607191b9fca..a61424d307f3f 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java @@ -69,7 +69,7 @@ public SearchPhaseController( this.requestToAggReduceContextBuilder = requestToAggReduceContextBuilder; } - public AggregatedDfs aggregateDfs(Collection results) { + public static AggregatedDfs aggregateDfs(Collection results) { Map termStatistics = new HashMap<>(); Map fieldStatistics = new HashMap<>(); long aggMaxDoc = 0; @@ -216,7 +216,7 @@ static void setShardIndex(TopDocs topDocs, int shardIndex) { } } - public ScoreDoc[] getLastEmittedDocPerShard(ReducedQueryPhase reducedQueryPhase, int numShards) { + public static ScoreDoc[] getLastEmittedDocPerShard(ReducedQueryPhase reducedQueryPhase, int numShards) { final ScoreDoc[] lastEmittedDocPerShard = new ScoreDoc[numShards]; if (reducedQueryPhase.isEmptyResult == false) { final ScoreDoc[] sortedScoreDocs = reducedQueryPhase.sortedTopDocs.scoreDocs; @@ -235,7 +235,7 @@ public ScoreDoc[] getLastEmittedDocPerShard(ReducedQueryPhase reducedQueryPhase, /** * Builds an array, with potential null elements, with docs to load. */ - public IntArrayList[] fillDocIdsToLoad(int numShards, ScoreDoc[] shardDocs) { + public static IntArrayList[] fillDocIdsToLoad(int numShards, ScoreDoc[] shardDocs) { IntArrayList[] docIdsToLoad = new IntArrayList[numShards]; for (ScoreDoc shardDoc : shardDocs) { IntArrayList shardDocIdsToLoad = docIdsToLoad[shardDoc.shardIndex]; @@ -254,7 +254,7 @@ public IntArrayList[] fillDocIdsToLoad(int numShards, ScoreDoc[] shardDocs) { * Expects sortedDocs to have top search docs across all shards, optionally followed by top suggest docs for each named * completion suggestion ordered by suggestion name */ - public InternalSearchResponse merge( + public static InternalSearchResponse merge( boolean ignoreFrom, ReducedQueryPhase reducedQueryPhase, Collection fetchResults, @@ -298,7 +298,7 @@ public InternalSearchResponse merge( return reducedQueryPhase.buildResponse(hits, fetchResults); } - private SearchHits getHits( + private static SearchHits getHits( ReducedQueryPhase reducedQueryPhase, boolean ignoreFrom, Collection fetchResults, @@ -368,7 +368,7 @@ private SearchHits getHits( * Reduces the given query results and consumes all aggregations and profile results. * @param queryResults a list of non-null query shard results */ - ReducedQueryPhase reducedScrollQueryPhase(Collection queryResults) { + static ReducedQueryPhase reducedScrollQueryPhase(Collection queryResults) { AggregationReduceContext.Builder aggReduceContextBuilder = new AggregationReduceContext.Builder() { @Override public AggregationReduceContext forPartialReduction() { @@ -405,7 +405,7 @@ public AggregationReduceContext forFinalReduction() { * @see QuerySearchResult#consumeAggs() * @see QuerySearchResult#consumeProfileResult() */ - ReducedQueryPhase reducedQueryPhase( + static ReducedQueryPhase reducedQueryPhase( Collection queryResults, List bufferedAggs, List bufferedTopDocs, diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java index 1e4a3c884919d..ef24833d39df0 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java @@ -29,7 +29,6 @@ class SearchQueryThenFetchAsyncAction extends AbstractSearchAsyncAction { - private final SearchPhaseController searchPhaseController; private final SearchProgressListener progressListener; // informations to track the best bottom top doc globally. @@ -43,7 +42,6 @@ class SearchQueryThenFetchAsyncAction extends AbstractSearchAsyncAction nodeIdToConnection, final Map aliasFilter, final Map concreteIndexBoosts, - final SearchPhaseController searchPhaseController, final Executor executor, final QueryPhaseResultConsumer resultConsumer, final SearchRequest request, @@ -74,7 +72,6 @@ class SearchQueryThenFetchAsyncAction extends AbstractSearchAsyncAction results, SearchPhaseContext context) { - return new FetchSearchPhase(results, searchPhaseController, null, this); + return new FetchSearchPhase(results, null, this); } private ShardSearchRequest rewriteShardSearchRequest(ShardSearchRequest request) { diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchResponseMerger.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponseMerger.java index 004df4ba852c5..b35b31db13294 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchResponseMerger.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchResponseMerger.java @@ -260,7 +260,7 @@ public int compare(ShardSearchFailure o1, ShardSearchFailure o2) { return clusterAlias1.compareTo(clusterAlias2); } - private ShardId extractShardId(ShardSearchFailure failure) { + private static ShardId extractShardId(ShardSearchFailure failure) { SearchShardTarget shard = failure.shard(); if (shard != null) { return shard.getShardId(); diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java index 8bef32135b802..f54fd6e968740 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java @@ -46,7 +46,6 @@ abstract class SearchScrollAsyncAction implements R protected final ActionListener listener; protected final ParsedScrollId scrollId; protected final DiscoveryNodes nodes; - protected final SearchPhaseController searchPhaseController; protected final SearchScrollRequest request; protected final SearchTransportService searchTransportService; private final long startTime; @@ -58,7 +57,6 @@ protected SearchScrollAsyncAction( Logger logger, DiscoveryNodes nodes, ActionListener listener, - SearchPhaseController searchPhaseController, SearchScrollRequest request, SearchTransportService searchTransportService ) { @@ -68,7 +66,6 @@ protected SearchScrollAsyncAction( this.logger = logger; this.listener = listener; this.nodes = nodes; - this.searchPhaseController = searchPhaseController; this.request = request; this.searchTransportService = searchTransportService; } @@ -244,7 +241,7 @@ protected final void sendResponse( final AtomicArray fetchResults ) { try { - final InternalSearchResponse internalResponse = searchPhaseController.merge( + final InternalSearchResponse internalResponse = SearchPhaseController.merge( true, queryPhase, fetchResults.asList(), diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java index 8763f823605fb..44a7525b9aef9 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java @@ -29,13 +29,12 @@ final class SearchScrollQueryAndFetchAsyncAction extends SearchScrollAsyncAction Logger logger, ClusterService clusterService, SearchTransportService searchTransportService, - SearchPhaseController searchPhaseController, SearchScrollRequest request, SearchTask task, ParsedScrollId scrollId, ActionListener listener ) { - super(scrollId, logger, clusterService.state().nodes(), listener, searchPhaseController, request, searchTransportService); + super(scrollId, logger, clusterService.state().nodes(), listener, request, searchTransportService); this.task = task; this.queryFetchResults = new AtomicArray<>(scrollId.getContext().length); } @@ -51,7 +50,7 @@ protected void executeInitialPhase( @Override protected SearchPhase moveToNextPhase(BiFunction clusterNodeLookup) { - return sendResponsePhase(searchPhaseController.reducedScrollQueryPhase(queryFetchResults.asList()), queryFetchResults); + return sendResponsePhase(SearchPhaseController.reducedScrollQueryPhase(queryFetchResults.asList()), queryFetchResults); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java index 603264978af7b..b6adca6f5e925 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java @@ -37,13 +37,12 @@ final class SearchScrollQueryThenFetchAsyncAction extends SearchScrollAsyncActio Logger logger, ClusterService clusterService, SearchTransportService searchTransportService, - SearchPhaseController searchPhaseController, SearchScrollRequest request, SearchTask task, ParsedScrollId scrollId, ActionListener listener ) { - super(scrollId, logger, clusterService.state().nodes(), listener, searchPhaseController, request, searchTransportService); + super(scrollId, logger, clusterService.state().nodes(), listener, request, searchTransportService); this.task = task; this.fetchResults = new AtomicArray<>(scrollId.getContext().length); this.queryResults = new AtomicArray<>(scrollId.getContext().length); @@ -67,7 +66,7 @@ protected SearchPhase moveToNextPhase(BiFunction return new SearchPhase("fetch") { @Override public void run() { - final SearchPhaseController.ReducedQueryPhase reducedQueryPhase = searchPhaseController.reducedScrollQueryPhase( + final SearchPhaseController.ReducedQueryPhase reducedQueryPhase = SearchPhaseController.reducedScrollQueryPhase( queryResults.asList() ); ScoreDoc[] scoreDocs = reducedQueryPhase.sortedTopDocs().scoreDocs(); @@ -76,8 +75,8 @@ public void run() { return; } - final IntArrayList[] docIdsToLoad = searchPhaseController.fillDocIdsToLoad(queryResults.length(), scoreDocs); - final ScoreDoc[] lastEmittedDocPerShard = searchPhaseController.getLastEmittedDocPerShard( + final IntArrayList[] docIdsToLoad = SearchPhaseController.fillDocIdsToLoad(queryResults.length(), scoreDocs); + final ScoreDoc[] lastEmittedDocPerShard = SearchPhaseController.getLastEmittedDocPerShard( reducedQueryPhase, queryResults.length() ); diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java b/server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java index 83181beee6ee2..ccf58bfeadd6e 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java @@ -611,7 +611,7 @@ public Transport.Connection getConnection(@Nullable String clusterAlias, Discove } } - final class ConnectionCountingHandler extends ActionListenerResponseHandler { + static final class ConnectionCountingHandler extends ActionListenerResponseHandler { private final Map clientConnections; private final String nodeId; diff --git a/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java index 0493136b576f9..6c78fa06b3bfa 100644 --- a/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java @@ -1191,7 +1191,6 @@ private SearchPhase searchAsyncAction( connectionLookup, aliasFilter, concreteIndexBoosts, - searchPhaseController, executor, queryResultConsumer, searchRequest, @@ -1208,7 +1207,6 @@ private SearchPhase searchAsyncAction( connectionLookup, aliasFilter, concreteIndexBoosts, - searchPhaseController, executor, queryResultConsumer, searchRequest, diff --git a/server/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java index 537e98693e831..8077a286a5765 100644 --- a/server/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java @@ -13,7 +13,6 @@ import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.tasks.Task; import org.elasticsearch.transport.TransportService; @@ -25,20 +24,17 @@ public class TransportSearchScrollAction extends HandledTransportAction) SearchScrollRequest::new); + super(SearchScrollAction.NAME, transportService, actionFilters, SearchScrollRequest::new); this.clusterService = clusterService; this.searchTransportService = searchTransportService; - this.searchPhaseController = searchPhaseController; } @Override @@ -50,7 +46,6 @@ protected void doExecute(Task task, SearchScrollRequest request, ActionListener< logger, clusterService, searchTransportService, - searchPhaseController, request, (SearchTask) task, scrollId, @@ -61,7 +56,6 @@ protected void doExecute(Task task, SearchScrollRequest request, ActionListener< logger, clusterService, searchTransportService, - searchPhaseController, request, (SearchTask) task, scrollId, diff --git a/server/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java b/server/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java index 9e66fd07aea63..eb374a4ae9258 100644 --- a/server/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java +++ b/server/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java @@ -119,7 +119,7 @@ void setAutoCreate(AutoCreate autoCreate) { this.autoCreate = autoCreate; } - private ComposableIndexTemplate findTemplate(String indexName, Metadata metadata) { + private static ComposableIndexTemplate findTemplate(String indexName, Metadata metadata) { final String templateName = MetadataIndexTemplateService.findV2Template(metadata, indexName, false); return metadata.templatesV2().get(templateName); } diff --git a/server/src/main/java/org/elasticsearch/action/support/RetryableAction.java b/server/src/main/java/org/elasticsearch/action/support/RetryableAction.java index ff9f377a6ddfd..9644291737e08 100644 --- a/server/src/main/java/org/elasticsearch/action/support/RetryableAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/RetryableAction.java @@ -118,7 +118,7 @@ protected long calculateDelayBound(long previousDelayBound) { return Math.min(previousDelayBound * 2, Integer.MAX_VALUE); } - protected long minimumDelayMillis() { + protected static long minimumDelayMillis() { return 0L; } diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java index 434c77b89bf6e..3738a6a0e33f0 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java @@ -313,13 +313,13 @@ private ClusterBlockException blockExceptions(final ClusterState state, final St return null; } - protected boolean retryPrimaryException(final Throwable e) { + protected static boolean retryPrimaryException(final Throwable e) { return e.getClass() == ReplicationOperation.RetryOnPrimaryException.class || TransportActions.isShardNotAvailableException(e) || isRetryableClusterBlockException(e); } - boolean isRetryableClusterBlockException(final Throwable e) { + static boolean isRetryableClusterBlockException(final Throwable e) { if (e instanceof ClusterBlockException) { return ((ClusterBlockException) e).retryable(); } diff --git a/server/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java index f87afc138ad27..deb584e450ae6 100644 --- a/server/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java @@ -85,7 +85,7 @@ protected void doExecute(Task task, Request request, ActionListener li protected abstract Response newResponse(StreamInput in) throws IOException; - protected ClusterBlockException checkGlobalBlock(ClusterState state) { + protected static ClusterBlockException checkGlobalBlock(ClusterState state) { return state.blocks().globalBlockedException(ClusterBlockLevel.WRITE); } @@ -102,7 +102,7 @@ protected boolean retryOnFailure(Exception e) { return false; } - protected TransportRequestOptions transportOptions() { + protected static TransportRequestOptions transportOptions() { return TransportRequestOptions.EMPTY; } diff --git a/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java index 6184a565a32fd..830a63cf4e874 100644 --- a/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java @@ -108,7 +108,7 @@ protected void asyncShardOperation(Request request, ShardId shardId, ActionListe protected abstract boolean resolveIndex(Request request); - protected ClusterBlockException checkGlobalBlock(ClusterState state) { + protected static ClusterBlockException checkGlobalBlock(ClusterState state) { return state.blocks().globalBlockedException(ClusterBlockLevel.READ); } diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java index a64694ecdb300..2a32c1051c779 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java @@ -396,7 +396,7 @@ public boolean hasPayloads() { } } - private final class TermVectorPostingsEnum extends PostingsEnum { + private static final class TermVectorPostingsEnum extends PostingsEnum { private boolean hasPositions; private boolean hasOffsets; private boolean hasPayloads; @@ -492,7 +492,7 @@ public long cost() { // the writer writes a 0 for -1 or value +1 and accordingly we have to // subtract 1 again // adds one to mock not existing term freq - int readPotentiallyNegativeVInt(StreamInput stream) throws IOException { + static int readPotentiallyNegativeVInt(StreamInput stream) throws IOException { return stream.readVInt() - 1; } @@ -500,7 +500,7 @@ int readPotentiallyNegativeVInt(StreamInput stream) throws IOException { // case, the writer writes a 0 for -1 or value +1 and accordingly we have to // subtract 1 again // adds one to mock not existing term freq - long readPotentiallyNegativeVLong(StreamInput stream) throws IOException { + static long readPotentiallyNegativeVLong(StreamInput stream) throws IOException { return stream.readVLong() - 1; } } diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java index f64a5a5dd93e9..b30cb8a7a7f8b 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java @@ -229,7 +229,7 @@ private void buildTerm( builder.endObject(); } - private void buildTermStatistics(XContentBuilder builder, TermsEnum termIter) throws IOException { + private static void buildTermStatistics(XContentBuilder builder, TermsEnum termIter) throws IOException { // write term statistics. At this point we do not naturally have a // boolean that says if these values actually were requested. // However, we can assume that they were not if the statistic values are @@ -302,7 +302,7 @@ private void initMemory(Terms curTerms, int termFreq) { } } - private void buildFieldStatistics(XContentBuilder builder, Terms curTerms) throws IOException { + private static void buildFieldStatistics(XContentBuilder builder, Terms curTerms) throws IOException { long sumDocFreq = curTerms.getSumDocFreq(); int docCount = curTerms.getDocCount(); long sumTotalTermFrequencies = curTerms.getSumTotalTermFreq(); diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java index 5dcfcefdf7651..575ec265bbd73 100644 --- a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java +++ b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java @@ -180,7 +180,7 @@ static String calculateRouting(GetResult getResult, @Nullable IndexRequest updat * Prepare the request for merging the existing document with a new one, can optionally detect a noop change. Returns a {@code Result} * containing a new {@code IndexRequest} to be executed on the primary and replicas. */ - Result prepareUpdateIndexRequest(ShardId shardId, UpdateRequest request, GetResult getResult, boolean detectNoop) { + static Result prepareUpdateIndexRequest(ShardId shardId, UpdateRequest request, GetResult getResult, boolean detectNoop) { final IndexRequest currentRequest = request.doc(); final String routing = calculateRouting(getResult, currentRequest); final Tuple> sourceAndContent = XContentHelper.convertToMap(getResult.internalSourceRef(), true); diff --git a/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java index b6391fbd7f931..5f26cf0d4d119 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java @@ -299,7 +299,7 @@ public final BootstrapCheckResult check(BootstrapContext context) { // visible for testing long getMaxFileDescriptorCount() { - return ProcessProbe.getInstance().getMaxFileDescriptorCount(); + return ProcessProbe.getMaxFileDescriptorCount(); } } @@ -458,7 +458,7 @@ long getMaxMapCount(Logger logger) { } @SuppressForbidden(reason = "access /proc/sys/vm/max_map_count") - private Path getProcSysVmMaxMapCountPath() { + private static Path getProcSysVmMaxMapCountPath() { return PathUtils.get("/proc/sys/vm/max_map_count"); } @@ -468,12 +468,12 @@ BufferedReader getBufferedReader(final Path path) throws IOException { } // visible for testing - String readProcSysVmMaxMapCount(final BufferedReader bufferedReader) throws IOException { + static String readProcSysVmMaxMapCount(final BufferedReader bufferedReader) throws IOException { return bufferedReader.readLine(); } // visible for testing - long parseProcSysVmMaxMapCount(final String procSysVmMaxMapCount) throws NumberFormatException { + static long parseProcSysVmMaxMapCount(final String procSysVmMaxMapCount) throws NumberFormatException { return Long.parseLong(procSysVmMaxMapCount); } diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java b/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java index a395a1a134d98..1fdaf7efc3d50 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java @@ -84,7 +84,7 @@ void spawnNativeControllers(final Environment environment, final boolean inherit * Attempt to spawn the controller daemon for a given module. The spawned process will remain connected to this JVM via its stdin, * stdout, and stderr streams, but the references to these streams are not available to code outside this package. */ - private Process spawnNativeController(final Path spawnPath, final Path tmpPath, final boolean inheritIo) throws IOException { + private static Process spawnNativeController(final Path spawnPath, final Path tmpPath, final boolean inheritIo) throws IOException { final String command; if (Constants.WINDOWS) { /* diff --git a/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java b/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java index a4ecf33196b5d..1b88961c34d06 100644 --- a/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java +++ b/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java @@ -396,7 +396,7 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params par * @param entry restore operation metadata * @param builder XContent builder */ - public void toXContent(Entry entry, XContentBuilder builder) throws IOException { + public static void toXContent(Entry entry, XContentBuilder builder) throws IOException { builder.startObject(); builder.field("snapshot", entry.snapshot().getSnapshotId().getName()); builder.field("repository", entry.snapshot().getRepository()); diff --git a/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java b/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java index 6b41e43b9daf5..48178d5801c91 100644 --- a/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java +++ b/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java @@ -1261,7 +1261,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - private void writeShardSnapshotStatus(XContentBuilder builder, ToXContent indexId, int shardId, ShardSnapshotStatus status) + private static void writeShardSnapshotStatus(XContentBuilder builder, ToXContent indexId, int shardId, ShardSnapshotStatus status) throws IOException { builder.startObject(); builder.field("index", indexId); diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelper.java b/server/src/main/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelper.java index 315eb8cc85ad0..ee482a0c0169d 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelper.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelper.java @@ -223,7 +223,7 @@ String getDescription() { ); } - private String describeQuorum(VotingConfiguration votingConfiguration) { + private static String describeQuorum(VotingConfiguration votingConfiguration) { final Set nodeIds = votingConfiguration.getNodeIds(); assert nodeIds.isEmpty() == false; final int requiredNodes = nodeIds.size() / 2 + 1; diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/ElasticsearchNodeCommand.java b/server/src/main/java/org/elasticsearch/cluster/coordination/ElasticsearchNodeCommand.java index 18fbbe2c0f911..21a6e3c7e8ffc 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/ElasticsearchNodeCommand.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/ElasticsearchNodeCommand.java @@ -144,7 +144,7 @@ protected void processNodePaths(Terminal terminal, OptionSet options, Environmen } } - protected void confirm(Terminal terminal, String msg) { + protected static void confirm(Terminal terminal, String msg) { terminal.println(msg); String text = terminal.readText("Confirm [y/N] "); if (text.equalsIgnoreCase("y") == false) { @@ -180,7 +180,7 @@ protected boolean validateBeforeLock(Terminal terminal, Environment env) { protected abstract void processNodePaths(Terminal terminal, Path[] dataPaths, OptionSet options, Environment env) throws IOException, UserException; - protected NodeEnvironment.NodePath[] toNodePaths(Path[] dataPaths) { + protected static NodeEnvironment.NodePath[] toNodePaths(Path[] dataPaths) { return Arrays.stream(dataPaths).map(ElasticsearchNodeCommand::createNodePath).toArray(NodeEnvironment.NodePath[]::new); } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java index 3b35657e4cbf9..eddbedaf310bf 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java @@ -23,8 +23,6 @@ */ public final class ClusterNameExpressionResolver { - private final WildcardExpressionResolver wildcardResolver = new WildcardExpressionResolver(); - /** * Resolves the provided cluster expression to matching cluster names. Supports exact or wildcard matches. * Throws {@link NoSuchRemoteClusterException} in case there are no registered remote clusters matching the provided expression. @@ -34,11 +32,11 @@ public final class ClusterNameExpressionResolver { * @return the resolved cluster aliases. * @throws NoSuchRemoteClusterException if there are no remote clusters matching the provided expression */ - public List resolveClusterNames(Set remoteClusters, String clusterExpression) { + public static List resolveClusterNames(Set remoteClusters, String clusterExpression) { if (remoteClusters.contains(clusterExpression)) { return Collections.singletonList(clusterExpression); } else if (Regex.isSimpleMatchPattern(clusterExpression)) { - return wildcardResolver.resolve(remoteClusters, clusterExpression); + return WildcardExpressionResolver.resolve(remoteClusters, clusterExpression); } else { throw new NoSuchRemoteClusterException(clusterExpression); } @@ -46,7 +44,7 @@ public List resolveClusterNames(Set remoteClusters, String clust private static class WildcardExpressionResolver { - private List resolve(Set remoteClusters, String clusterExpression) { + private static List resolve(Set remoteClusters, String clusterExpression) { if (isTrivialWildcard(clusterExpression)) { return resolveTrivialWildcard(remoteClusters); } @@ -59,11 +57,11 @@ private List resolve(Set remoteClusters, String clusterExpressio } } - private boolean isTrivialWildcard(String clusterExpression) { + private static boolean isTrivialWildcard(String clusterExpression) { return Regex.isMatchAllPattern(clusterExpression); } - private List resolveTrivialWildcard(Set remoteClusters) { + private static List resolveTrivialWildcard(Set remoteClusters) { return new ArrayList<>(remoteClusters); } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java index 6bacd2499daa8..75f4c76293b44 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java @@ -359,7 +359,7 @@ public DataStreamTemplate(boolean hidden, boolean allowCustomRouting, IndexMode } } - public String getTimestampField() { + public static String getTimestampField() { return FIXED_TIMESTAMP_FIELD; } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java index 9cc6aef4edba2..1859616865dda 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java @@ -124,7 +124,7 @@ public List getDeletes() { return deletes; } - public Map> getDiffs() { + public static Map> getDiffs() { return Collections.emptyMap(); } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifier.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifier.java index 0a99a36dfc1f2..f8f77409db89d 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifier.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifier.java @@ -97,7 +97,7 @@ public IndexMetadata verifyIndexMetadata(IndexMetadata indexMetadata, Version mi * Check that the index version is compatible. Elasticsearch does not support indices created before the * previous major version. */ - private void checkSupportedVersion(IndexMetadata indexMetadata, Version minimumIndexCompatibilityVersion) { + private static void checkSupportedVersion(IndexMetadata indexMetadata, Version minimumIndexCompatibilityVersion) { boolean isSupportedVersion = indexMetadata.getCompatibilityVersion().onOrAfter(minimumIndexCompatibilityVersion); if (isSupportedVersion == false) { throw new IllegalStateException( @@ -236,7 +236,7 @@ IndexMetadata archiveBrokenIndexSettings(IndexMetadata indexMetadata) { * Convert shared_cache searchable snapshot indices to only specify * _tier_preference: data_frozen, removing any pre-existing tier allocation rules. */ - IndexMetadata convertSharedCacheTierPreference(IndexMetadata indexMetadata) { + static IndexMetadata convertSharedCacheTierPreference(IndexMetadata indexMetadata) { // Only remove these settings for a shared_cache searchable snapshot if (indexMetadata.isPartialSearchableSnapshot()) { final Settings settings = indexMetadata.getSettings(); @@ -261,7 +261,7 @@ IndexMetadata convertSharedCacheTierPreference(IndexMetadata indexMetadata) { /** * Removes index level ._tier allocation filters, if they exist */ - IndexMetadata removeTierFiltering(IndexMetadata indexMetadata) { + static IndexMetadata removeTierFiltering(IndexMetadata indexMetadata) { final Settings settings = indexMetadata.getSettings(); final Settings.Builder settingsBuilder = Settings.builder().put(settings); // Clear any allocation rules other than preference for tier diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java index 4939d1da885d3..4429838be0a53 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java @@ -489,10 +489,10 @@ private void checkSystemIndexAccess(Context context, Set concreteIndices) ); } if (resolvedSystemDataStreams.isEmpty() == false) { - throw systemIndices.dataStreamAccessException(threadContext, resolvedSystemDataStreams); + throw SystemIndices.dataStreamAccessException(threadContext, resolvedSystemDataStreams); } if (resolvedNetNewSystemIndices.isEmpty() == false) { - throw systemIndices.netNewSystemIndexAccessException(threadContext, resolvedNetNewSystemIndices); + throw SystemIndices.netNewSystemIndexAccessException(threadContext, resolvedNetNewSystemIndices); } } @@ -932,7 +932,7 @@ static boolean isExplicitAllPattern(Collection aliasesOrIndices) { } public SystemIndexAccessLevel getSystemIndexAccessLevel() { - final SystemIndexAccessLevel accessLevel = systemIndices.getSystemIndexAccessLevel(threadContext); + final SystemIndexAccessLevel accessLevel = SystemIndices.getSystemIndexAccessLevel(threadContext); assert accessLevel != SystemIndexAccessLevel.BACKWARDS_COMPATIBLE_ONLY : "BACKWARDS_COMPATIBLE_ONLY access level should never be used automatically, it should only be used in known special cases"; return accessLevel; diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java index a384550015cc2..bcddacf699671 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java @@ -757,7 +757,7 @@ private static String resolveRouting(@Nullable String routing, String aliasOrInd return routing; } - private void rejectSingleIndexOperation(String aliasOrIndex, IndexAbstraction result) { + private static void rejectSingleIndexOperation(String aliasOrIndex, IndexAbstraction result) { String[] indexNames = new String[result.getIndices().size()]; int i = 0; for (Index indexName : result.getIndices()) { @@ -1293,7 +1293,7 @@ public Builder put(IndexMetadata indexMetadata, boolean incrementVersion) { return this; } - boolean unsetPreviousIndicesLookup(IndexMetadata previous, IndexMetadata current) { + static boolean unsetPreviousIndicesLookup(IndexMetadata previous, IndexMetadata current) { if (previous == null) { return true; } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamService.java index cc6574deb83a0..d33432320bb21 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamService.java @@ -249,7 +249,7 @@ static ClusterState createDataStream( assert writeIndex != null; assert writeIndex.mapping() != null : "no mapping found for backing index [" + writeIndex.getIndex().getName() + "]"; - String fieldName = template.getDataStreamTemplate().getTimestampField(); + String fieldName = ComposableIndexTemplate.DataStreamTemplate.getTimestampField(); DataStream.TimestampField timestampField = new DataStream.TimestampField(fieldName); List dsBackingIndices = backingIndices.stream() .map(IndexMetadata::getIndex) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexService.java index a8deefe7fbf1a..c30a45dfcaee6 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexService.java @@ -162,7 +162,7 @@ public MetadataCreateIndexService( /** * Validate the name for an index against some static rules and a cluster state. */ - public void validateIndexName(String index, ClusterState state) { + public static void validateIndexName(String index, ClusterState state) { validateIndexOrAliasName(index, InvalidIndexNameException::new); if (index.toLowerCase(Locale.ROOT).equals(index) == false) { throw new InvalidIndexNameException(index, "must be lowercase"); @@ -559,7 +559,7 @@ private ClusterState applyCreateIndexRequestWithV1Templates( // shard id and the current timestamp xContentRegistry, indexService.newSearchExecutionContext(0, 0, null, () -> 0L, null, emptyMap()), - indexService.dateMathExpressionResolverAt(request.getNameResolvedAt()), + IndexService.dateMathExpressionResolverAt(request.getNameResolvedAt()), systemIndices::isSystemName ), templates.stream().map(IndexTemplateMetadata::getName).collect(toList()), @@ -625,7 +625,7 @@ private ClusterState applyCreateIndexRequestWithV2Template( xContentRegistry, // the context is used ony for validation so it's fine to pass fake values for the shard id and the current timestamp indexService.newSearchExecutionContext(0, 0, null, () -> 0L, null, emptyMap()), - indexService.dateMathExpressionResolverAt(request.getNameResolvedAt()), + IndexService.dateMathExpressionResolverAt(request.getNameResolvedAt()), systemIndices::isSystemName ), Collections.singletonList(templateName), @@ -681,7 +681,7 @@ private ClusterState applyCreateIndexRequestForSystemDataStream( // shard id and the current timestamp xContentRegistry, indexService.newSearchExecutionContext(0, 0, null, () -> 0L, null, emptyMap()), - indexService.dateMathExpressionResolverAt(request.getNameResolvedAt()), + IndexService.dateMathExpressionResolverAt(request.getNameResolvedAt()), systemIndices::isSystemName ), List.of(), @@ -775,7 +775,7 @@ private ClusterState applyCreateIndexRequestWithExistingMetadata( // the context is only used for validation so it's fine to pass fake values for the // shard id and the current timestamp indexService.newSearchExecutionContext(0, 0, null, () -> 0L, null, emptyMap()), - indexService.dateMathExpressionResolverAt(request.getNameResolvedAt()), + IndexService.dateMathExpressionResolverAt(request.getNameResolvedAt()), systemIndices::isSystemName ), List.of(), @@ -1214,7 +1214,7 @@ private static ClusterBlocks.Builder createClusterBlocksBuilder(ClusterState cur return blocksBuilder; } - private void updateIndexMappingsAndBuildSortOrder( + private static void updateIndexMappingsAndBuildSortOrder( IndexService indexService, CreateIndexClusterStateUpdateRequest request, List mappings, diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java index b8e23113e3cb1..98ce315f1b799 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesService.java @@ -232,7 +232,7 @@ private void validateFilter( ); } - private void validateAliasTargetIsNotDSBackingIndex(ClusterState currentState, AliasAction action) { + private static void validateAliasTargetIsNotDSBackingIndex(ClusterState currentState, AliasAction action) { IndexAbstraction indexAbstraction = currentState.metadata().getIndicesLookup().get(action.getIndex()); assert indexAbstraction != null : "invalid cluster metadata. index [" + action.getIndex() + "] was not found"; if (indexAbstraction.getParentDataStream() != null) { 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 53d07509e4903..d12b1986bbdef 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java @@ -1471,7 +1471,7 @@ private static void validateCompositeTemplate( // shard id and the current timestamp xContentRegistry, tempIndexService.newSearchExecutionContext(0, 0, null, () -> 0L, null, emptyMap()), - tempIndexService.dateMathExpressionResolverAt(System.currentTimeMillis()), + IndexService.dateMathExpressionResolverAt(System.currentTimeMillis()), systemIndices::isSystemName ); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMappingService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMappingService.java index 063404c43664e..bc73193d9b3c4 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMappingService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMappingService.java @@ -123,7 +123,7 @@ public ClusterState execute(ClusterState currentState, List indexMapperServices diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java index 0eddeab72e99b..c6ed702795f3a 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java @@ -243,7 +243,7 @@ Optional, Set>> calculateTemplateChang private static final ToXContent.Params PARAMS = new ToXContent.MapParams(singletonMap("reduce_mappings", "true")); - private BytesReference toBytesReference(IndexTemplateMetadata templateMetadata) { + private static BytesReference toBytesReference(IndexTemplateMetadata templateMetadata) { try { return XContentHelper.toXContent((builder, params) -> { IndexTemplateMetadata.Builder.toInnerXContentWithTypes(templateMetadata, builder, params); diff --git a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java index 37c534fc553fc..0a390559091f4 100644 --- a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java +++ b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java @@ -73,7 +73,7 @@ private DiscoveryNodeFilters(OpType opType, Map filters) { this.withoutTierPreferences = doTrimTier(this); } - private boolean matchByIP(String[] values, @Nullable String hostIp, @Nullable String publishIp) { + private static boolean matchByIP(String[] values, @Nullable String hostIp, @Nullable String publishIp) { for (String ipOrHost : values) { String value = InetAddresses.isInetAddress(ipOrHost) ? NetworkAddress.format(InetAddresses.forString(ipOrHost)) : ipOrHost; boolean matchIp = Regex.simpleMatch(value, hostIp) || Regex.simpleMatch(value, publishIp); diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/IndexRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexRouting.java index 899501f22cb5d..ec807fc15e8d2 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/IndexRouting.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/IndexRouting.java @@ -262,7 +262,7 @@ public String createId(Map flat, byte[] suffix) { return createId(hashSource(flat), suffix); } - private String createId(int routingHash, byte[] suffix) { + private static String createId(int routingHash, byte[] suffix) { byte[] idBytes = new byte[4 + suffix.length]; ByteUtils.writeIntLE(routingHash, idBytes, 0); System.arraycopy(suffix, 0, idBytes, 4, suffix.length); diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java index 67a7403cea162..af6607b4f977d 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java @@ -117,7 +117,7 @@ public static ShardIterator getShards(ClusterState clusterState, ShardId shardId private static final Map> EMPTY_ROUTING = Collections.emptyMap(); - private Set computeTargetedShards( + private static Set computeTargetedShards( ClusterState clusterState, String[] concreteIndices, @Nullable Map> routing @@ -223,7 +223,7 @@ private ShardIterator shardRoutings( } } - protected IndexRoutingTable indexRoutingTable(ClusterState clusterState, String index) { + protected static IndexRoutingTable indexRoutingTable(ClusterState clusterState, String index) { IndexRoutingTable indexRouting = clusterState.routingTable().index(index); if (indexRouting == null) { throw new IndexNotFoundException(index); @@ -231,7 +231,7 @@ protected IndexRoutingTable indexRoutingTable(ClusterState clusterState, String return indexRouting; } - private IndexMetadata indexMetadata(ClusterState clusterState, String index) { + private static IndexMetadata indexMetadata(ClusterState clusterState, String index) { IndexMetadata indexMetadata = clusterState.metadata().index(index); if (indexMetadata == null) { throw new IndexNotFoundException(index); diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java index af6ae2dce502a..d98618ca0b391 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java @@ -797,7 +797,7 @@ private void assignedShardsAdd(ShardRouting shard) { shards.add(shard); } - private boolean assertInstanceNotInList(ShardRouting shard, List shards) { + private static boolean assertInstanceNotInList(ShardRouting shard, List shards) { for (ShardRouting s : shards) { assert s != shard; } diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java index 97fd7d5cb184d..c368bffacf281 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java @@ -117,7 +117,7 @@ public static XContentBuilder discoveryNodeToXContent(DiscoveryNode node, boolea /** * Sorts a list of node level decisions by the decision type, then by weight ranking, and finally by node id. */ - public List sortNodeDecisions(List nodeDecisions) { + public static List sortNodeDecisions(List nodeDecisions) { return nodeDecisions.stream().sorted().toList(); } @@ -125,7 +125,7 @@ public List sortNodeDecisions(List n * Generates X-Content for the node-level decisions, creating the outer "node_decisions" object * in which they are serialized. */ - public XContentBuilder nodeDecisionsToXContent(List nodeDecisions, XContentBuilder builder, Params params) + public static XContentBuilder nodeDecisionsToXContent(List nodeDecisions, XContentBuilder builder, Params params) throws IOException { if (nodeDecisions != null && nodeDecisions.isEmpty() == false) { diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java index 859621247e92c..8755ee87c5977 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java @@ -143,7 +143,7 @@ public ClusterState applyStartedShards(ClusterState clusterState, List nodesShutdownMetadata = allocation.metadata().nodeShutdowns(); for (Iterator it = allocation.routingNodes().mutableIterator(); it.hasNext();) { @@ -594,7 +598,7 @@ private void disassociateDeadNodes(RoutingAllocation allocation) { } } - private void applyStartedShards(RoutingAllocation routingAllocation, List startedShardEntries) { + private static void applyStartedShards(RoutingAllocation routingAllocation, List startedShardEntries) { assert startedShardEntries.isEmpty() == false : "non-empty list of started shard entries expected"; RoutingNodes routingNodes = routingAllocation.routingNodes(); for (ShardRouting startedShard : startedShardEntries) { @@ -614,7 +618,7 @@ private void applyStartedShards(RoutingAllocation routingAllocation, List usages, Set indicesToMarkIneligibleForAutoRelease @@ -480,7 +480,7 @@ private static void cleanUpRemovedNodes(Set nodesToKeep, Set nod } } - private boolean isDedicatedFrozenNode(RoutingNode routingNode) { + private static boolean isDedicatedFrozenNode(RoutingNode routingNode) { if (routingNode == null) { return false; } diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetadataUpdater.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetadataUpdater.java index bdbb9728a0336..9a7d32b4e2b7a 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetadataUpdater.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetadataUpdater.java @@ -141,7 +141,7 @@ public Metadata applyChanges(Metadata oldMetadata, RoutingTable newRoutingTable) /** * Updates in-sync allocations with routing changes that were made to the routing table. */ - private IndexMetadata.Builder updateInSyncAllocations( + private static IndexMetadata.Builder updateInSyncAllocations( RoutingTable newRoutingTable, IndexMetadata oldIndexMetadata, IndexMetadata.Builder indexMetadataBuilder, @@ -310,7 +310,7 @@ public static ClusterState removeStaleIdsWithoutRoutings(ClusterState clusterSta /** * Increases the primary term if {@link #increasePrimaryTerm} was called for this shard id. */ - private IndexMetadata.Builder updatePrimaryTerm( + private static IndexMetadata.Builder updatePrimaryTerm( IndexMetadata oldIndexMetadata, IndexMetadata.Builder indexMetadataBuilder, ShardId shardId, diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java index cbf35d2fac176..7959469c05e92 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java @@ -564,7 +564,7 @@ public Decision canRemain(ShardRouting shardRouting, RoutingNode node, RoutingAl ); } - private DiskUsageWithRelocations getDiskUsage( + private static DiskUsageWithRelocations getDiskUsage( RoutingNode node, RoutingAllocation allocation, ImmutableOpenMap usages, @@ -606,7 +606,7 @@ private DiskUsageWithRelocations getDiskUsage( * @param usages Map of nodeId to DiskUsage for all known nodes * @return DiskUsage representing given node using the average disk usage */ - DiskUsage averageUsage(RoutingNode node, ImmutableOpenMap usages) { + static DiskUsage averageUsage(RoutingNode node, ImmutableOpenMap usages) { if (usages.size() == 0) { return new DiskUsage(node.nodeId(), node.node().getName(), "_na_", 0, 0); } @@ -626,7 +626,7 @@ DiskUsage averageUsage(RoutingNode node, ImmutableOpenMap usa * @param shardSize Size in bytes of the shard * @return Percentage of free space after the shard is assigned to the node */ - double freeDiskPercentageAfterShardAssigned(DiskUsageWithRelocations usage, Long shardSize) { + static double freeDiskPercentageAfterShardAssigned(DiskUsageWithRelocations usage, Long shardSize) { shardSize = (shardSize == null) ? 0 : shardSize; DiskUsage newUsage = new DiskUsage( usage.getNodeId(), diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java index 4da3f6a925949..9ead9b7cedee5 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java @@ -148,7 +148,7 @@ private Decision shouldFilter(IndexMetadata indexMd, DiscoveryNode node, Routing return allocation.decision(Decision.YES, NAME, "node passes include/exclude/require filters"); } - private Decision shouldIndexFilter(IndexMetadata indexMd, DiscoveryNode node, RoutingAllocation allocation) { + private static Decision shouldIndexFilter(IndexMetadata indexMd, DiscoveryNode node, RoutingAllocation allocation) { DiscoveryNodeFilters indexRequireFilters = DiscoveryNodeFilters.trimTier(indexMd.requireFilters()); DiscoveryNodeFilters indexIncludeFilters = DiscoveryNodeFilters.trimTier(indexMd.includeFilters()); DiscoveryNodeFilters indexExcludeFilters = DiscoveryNodeFilters.trimTier(indexMd.excludeFilters()); diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java index 4deba308e35fc..78c92f47f2b19 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java @@ -58,7 +58,7 @@ public Decision canForceAllocateDuringReplace(ShardRouting shardRouting, Routing return canAllocate(shardRouting, node, allocation); } - private Decision isVersionCompatibleRelocatePrimary( + private static Decision isVersionCompatibleRelocatePrimary( final RoutingNodes routingNodes, final String sourceNodeId, final RoutingNode target, @@ -84,7 +84,7 @@ private Decision isVersionCompatibleRelocatePrimary( } } - private Decision isVersionCompatibleAllocatingReplica( + private static Decision isVersionCompatibleAllocatingReplica( final RoutingNodes routingNodes, final String sourceNodeId, final RoutingNode target, @@ -113,7 +113,7 @@ private Decision isVersionCompatibleAllocatingReplica( } } - private Decision isVersionCompatible( + private static Decision isVersionCompatible( SnapshotRecoverySource recoverySource, final RoutingNode target, final RoutingAllocation allocation diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java index 2ee5c3812d7fa..44ec04a3e1ae0 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java @@ -126,7 +126,7 @@ public Decision canForceAllocatePrimary(ShardRouting shardRouting, RoutingNode n private static final Decision YES_NO_COPY = Decision.single(Decision.Type.YES, NAME, "this node does not hold a copy of this shard"); - private Decision decideSameNode( + private static Decision decideSameNode( ShardRouting shardRouting, RoutingNode node, RoutingAllocation allocation, diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java index b90afc7099983..f0234f6217a76 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java @@ -51,7 +51,7 @@ public Decision canForceAllocateDuringReplace(ShardRouting shardRouting, Routing return canAllocate(shardRouting, node, allocation); } - private Decision canMove(ShardRouting shardRouting, RoutingAllocation allocation) { + private static Decision canMove(ShardRouting shardRouting, RoutingAllocation allocation) { if (shardRouting.primary()) { // Only primary shards are snapshotted diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java index a6b807fb25fb8..2ccce7cb0547a 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java @@ -214,7 +214,7 @@ public Decision canForceAllocateDuringReplace(ShardRouting shardRouting, Routing * * This method returns the corresponding initializing shard that would be allocated to this node. */ - private ShardRouting initializingShard(ShardRouting shardRouting, String currentNodeId) { + private static ShardRouting initializingShard(ShardRouting shardRouting, String currentNodeId) { final ShardRouting initializingShard; if (shardRouting.unassigned()) { initializingShard = shardRouting.initialize(currentNodeId, null, ShardRouting.UNAVAILABLE_EXPECTED_SHARD_SIZE); diff --git a/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java index 122659c64422e..fbdec21827bd7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java +++ b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java @@ -551,7 +551,7 @@ private void callClusterStateListeners(ClusterChangedEvent clusterChangedEvent, callClusterStateListener(clusterChangedEvent, stopWatch, timeoutClusterStateListeners.keySet()); } - private void callClusterStateListener( + private static void callClusterStateListener( ClusterChangedEvent clusterChangedEvent, Recorder stopWatch, Collection listeners diff --git a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java index aa440e83f52ec..e9e2574ea6661 100644 --- a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java +++ b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java @@ -862,7 +862,7 @@ public String toString() { } } - private ClusterState executeTasks( + private static ClusterState executeTasks( ClusterState previousClusterState, List> executionResults, ClusterStateTaskExecutor executor, @@ -890,7 +890,7 @@ private static List>) executionResults; } - private ClusterState innerExecuteTasks( + private static ClusterState innerExecuteTasks( ClusterState previousClusterState, List> executionResults, ClusterStateTaskExecutor executor, diff --git a/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java index fe3e4bba45acd..f9541f9627b84 100644 --- a/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java +++ b/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java @@ -30,7 +30,7 @@ public String getBase64UUID() { * Returns a Base64 encoded {@link SecureString} of a Version 4.0 compatible UUID * as defined here: http://www.ietf.org/rfc/rfc4122.txt */ - public SecureString getBase64UUIDSecureString() { + public static SecureString getBase64UUIDSecureString() { byte[] uuidBytes = null; byte[] encodedBytes = null; try { @@ -52,11 +52,11 @@ public SecureString getBase64UUIDSecureString() { * randomly initialized by the given {@link java.util.Random} instance * as defined here: http://www.ietf.org/rfc/rfc4122.txt */ - public String getBase64UUID(Random random) { + public static String getBase64UUID(Random random) { return Base64.getUrlEncoder().withoutPadding().encodeToString(getUUIDBytes(random)); } - private byte[] getUUIDBytes(Random random) { + private static byte[] getUUIDBytes(Random random) { final byte[] randomBytes = new byte[16]; random.nextBytes(randomBytes); /* Set the version to version 4 (see http://www.ietf.org/rfc/rfc4122.txt) diff --git a/server/src/main/java/org/elasticsearch/common/Rounding.java b/server/src/main/java/org/elasticsearch/common/Rounding.java index bef854c867681..f99da4902db66 100644 --- a/server/src/main/java/org/elasticsearch/common/Rounding.java +++ b/server/src/main/java/org/elasticsearch/common/Rounding.java @@ -379,7 +379,7 @@ public Rounding build() { } } - private abstract class PreparedRounding implements Prepared { + private abstract static class PreparedRounding implements Prepared { /** * Attempt to build a {@link Prepared} implementation that relies on pre-calcuated * "round down" points. If there would be more than {@code max} points then return @@ -1038,7 +1038,7 @@ public String toString() { return "Rounding[" + interval + " in " + timeZone + "]"; } - private long roundKey(long value, long interval) { + private static long roundKey(long value, long interval) { if (value < 0) { return (value - interval + 1) / interval; } else { diff --git a/server/src/main/java/org/elasticsearch/common/UUIDs.java b/server/src/main/java/org/elasticsearch/common/UUIDs.java index da23e6c8d8fe7..43a232e82510e 100644 --- a/server/src/main/java/org/elasticsearch/common/UUIDs.java +++ b/server/src/main/java/org/elasticsearch/common/UUIDs.java @@ -26,7 +26,7 @@ public static String base64UUID() { /** Returns a Base64 encoded version of a Version 4.0 compatible UUID as defined here: http://www.ietf.org/rfc/rfc4122.txt, using the * provided {@code Random} instance */ public static String randomBase64UUID(Random random) { - return RANDOM_UUID_GENERATOR.getBase64UUID(random); + return RandomBasedUUIDGenerator.getBase64UUID(random); } /** Returns a Base64 encoded version of a Version 4.0 compatible UUID as defined here: http://www.ietf.org/rfc/rfc4122.txt, using a @@ -38,6 +38,6 @@ public static String randomBase64UUID() { /** Returns a Base64 encoded {@link SecureString} of a Version 4.0 compatible UUID as defined here: http://www.ietf.org/rfc/rfc4122.txt, * using a private {@code SecureRandom} instance */ public static SecureString randomBase64UUIDSecureString() { - return RANDOM_UUID_GENERATOR.getBase64UUIDSecureString(); + return RandomBasedUUIDGenerator.getBase64UUIDSecureString(); } } diff --git a/server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java b/server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java index c0e03a5223675..d137c71791903 100644 --- a/server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java +++ b/server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java @@ -304,7 +304,7 @@ public void writeBlobAtomic(final String blobName, BytesReference bytes, boolean } } - private void writeToPath(BytesReference bytes, Path tempBlobPath) throws IOException { + private static void writeToPath(BytesReference bytes, Path tempBlobPath) throws IOException { try (OutputStream outputStream = Files.newOutputStream(tempBlobPath, StandardOpenOption.CREATE_NEW)) { bytes.writeTo(outputStream); } 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 ed2429bf72fdc..d3b62416b802b 100644 --- a/server/src/main/java/org/elasticsearch/common/cli/EnvironmentAwareCommand.java +++ b/server/src/main/java/org/elasticsearch/common/cli/EnvironmentAwareCommand.java @@ -87,7 +87,7 @@ protected Environment createEnv(final Map settings) throws UserE } /** Create an {@link Environment} for the command to use. Overrideable for tests. */ - protected final Environment createEnv(final Settings baseSettings, final Map settings) throws UserException { + protected static Environment createEnv(final Settings baseSettings, final Map settings) throws UserException { final String esPathConf = System.getProperty("es.path.conf"); if (esPathConf == null) { throw new UserException(ExitCodes.CONFIG, "the system property [es.path.conf] must be set"); diff --git a/server/src/main/java/org/elasticsearch/common/geo/GeoJson.java b/server/src/main/java/org/elasticsearch/common/geo/GeoJson.java index dc4d998438ace..4578d1c9ce60f 100644 --- a/server/src/main/java/org/elasticsearch/common/geo/GeoJson.java +++ b/server/src/main/java/org/elasticsearch/common/geo/GeoJson.java @@ -311,7 +311,7 @@ public Void visit(Rectangle rectangle) { return null; } - private List coordinatesToList(double lat, double lon, double alt) { + private static List coordinatesToList(double lat, double lon, double alt) { List coords = new ArrayList<>(3); coords.add(lon); coords.add(lat); @@ -321,7 +321,7 @@ private List coordinatesToList(double lat, double lon, double alt) { return coords; } - private List coordinatesToList(Line line) { + private static List coordinatesToList(Line line) { List lines = new ArrayList<>(line.length()); for (int i = 0; i < line.length(); i++) { List coords = new ArrayList<>(3); @@ -335,7 +335,7 @@ private List coordinatesToList(Line line) { return lines; } - private List coordinatesToList(Polygon polygon) { + private static List coordinatesToList(Polygon polygon) { List coords = new ArrayList<>(polygon.getNumberOfHoles() + 1); coords.add(coordinatesToList(polygon.getPolygon())); for (int i = 0; i < polygon.getNumberOfHoles(); i++) { diff --git a/server/src/main/java/org/elasticsearch/common/geo/GeometryParser.java b/server/src/main/java/org/elasticsearch/common/geo/GeometryParser.java index e93f302607122..e624908b0f39b 100644 --- a/server/src/main/java/org/elasticsearch/common/geo/GeometryParser.java +++ b/server/src/main/java/org/elasticsearch/common/geo/GeometryParser.java @@ -95,7 +95,7 @@ public Geometry parseGeometry(Object value) throws ElasticsearchParseException { } } - private boolean isPoint(Object value) { + private static boolean isPoint(Object value) { // can we do this better? if (value instanceof Map map) { return map.containsKey("lat") && map.containsKey("lon"); diff --git a/server/src/main/java/org/elasticsearch/common/hash/Murmur3Hasher.java b/server/src/main/java/org/elasticsearch/common/hash/Murmur3Hasher.java index 733d897aaf3b9..0d4d6fd4f61f2 100644 --- a/server/src/main/java/org/elasticsearch/common/hash/Murmur3Hasher.java +++ b/server/src/main/java/org/elasticsearch/common/hash/Murmur3Hasher.java @@ -92,7 +92,7 @@ public byte[] digest() { return hash; } - public String getAlgorithm() { + public static String getAlgorithm() { return METHOD; } diff --git a/server/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java index 8b0b658a508fd..99a9d6fab9c1d 100644 --- a/server/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java +++ b/server/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java @@ -183,7 +183,7 @@ private void validateKey(Object source, Key key) { Annotations.checkForMisplacedScopeAnnotations(key.getRawType(), source, errors); } - UntargettedBindingImpl invalidBinding(InjectorImpl injector, Key key, Object source) { + static UntargettedBindingImpl invalidBinding(InjectorImpl injector, Key key, Object source) { return new UntargettedBindingImpl<>(injector, key, source); } diff --git a/server/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java index b96293e155230..737176c77de54 100644 --- a/server/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java +++ b/server/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java @@ -146,7 +146,7 @@ private void injectDynamically() { * Loads eager singletons, or all singletons if we're in Stage.PRODUCTION. Bindings discovered * while we're binding these singletons are not be eager. */ - public void loadEagerSingletons(InjectorImpl injector, Stage stage, Errors errors) { + public static void loadEagerSingletons(InjectorImpl injector, Stage stage, Errors errors) { for (final Binding binding : injector.state.getExplicitBindingsThisLevel().values()) { loadEagerSingletons(injector, stage, errors, (BindingImpl) binding); } @@ -155,7 +155,7 @@ public void loadEagerSingletons(InjectorImpl injector, Stage stage, Errors error } } - private void loadEagerSingletons(InjectorImpl injector, Stage stage, final Errors errors, BindingImpl binding) { + private static void loadEagerSingletons(InjectorImpl injector, Stage stage, final Errors errors, BindingImpl binding) { if (binding.getScoping().isEagerSingleton(stage)) { try { injector.callInContext(new ContextualCallable() { diff --git a/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java index a02ffefb2e4f1..6a1d7aabed962 100644 --- a/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java +++ b/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java @@ -113,7 +113,7 @@ ProviderMethod createProviderMethod(Binder binder, final Method method) { return new ProviderMethod<>(key, method, delegate, parameterProviders, scopeAnnotation); } - Key getKey(Errors errors, TypeLiteral type, Member member, Annotation[] annotations) { + static Key getKey(Errors errors, TypeLiteral type, Member member, Annotation[] annotations) { Annotation bindingAnnotation = Annotations.findBindingAnnotation(errors, member, annotations); return bindingAnnotation == null ? Key.get(type) : Key.get(type, bindingAnnotation); } diff --git a/server/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java index 694745d3a346d..f8646ecf5fa22 100644 --- a/server/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java +++ b/server/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java @@ -211,7 +211,7 @@ public LinkedBindingBuilder addBinding(K key) { Multibinder.checkNotNull(key, "key"); Multibinder.checkConfiguration(isInitialized() == false, "MapBinder was already initialized"); - Key valueKey = Key.get(valueType, new RealElement(entrySetBinder.getSetName())); + Key valueKey = Key.get(valueType, new RealElement(RealMultibinder.getSetName())); entrySetBinder.addBinding().toInstance(new MapEntry<>(key, binder.getProvider(valueKey))); return binder.bind(valueKey); } diff --git a/server/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java index e9253b08df077..26609b4e2bdb9 100644 --- a/server/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java +++ b/server/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java @@ -192,7 +192,7 @@ public Set get() { return Collections.unmodifiableSet(result); } - String getSetName() { + static String getSetName() { return ""; } diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java index 0c91458999e7f..529d39e58d2d5 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java @@ -95,7 +95,7 @@ public long readLong() throws IOException { } } - private EOFException newEOFException(RuntimeException ex) { + private static EOFException newEOFException(RuntimeException ex) { EOFException eofException = new EOFException(); eofException.initCause(ex); return eofException; diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java index a917b44e5ee8c..ed0364a246cba 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java @@ -552,7 +552,7 @@ public final boolean readBoolean() throws IOException { return readBoolean(readByte()); } - private boolean readBoolean(final byte value) { + private static boolean readBoolean(final byte value) { if (value == 0) { return false; } else if (value == 1) { diff --git a/server/src/main/java/org/elasticsearch/common/logging/ECSJsonLayout.java b/server/src/main/java/org/elasticsearch/common/logging/ECSJsonLayout.java index 2abb22f4a3d02..0555178bf5353 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/ECSJsonLayout.java +++ b/server/src/main/java/org/elasticsearch/common/logging/ECSJsonLayout.java @@ -55,7 +55,7 @@ public EcsLayout build() { .build(); } - private KeyValuePair[] additionalFields() { + private static KeyValuePair[] additionalFields() { return new KeyValuePair[] { new KeyValuePair("trace.id", "%trace_id"), new KeyValuePair("elasticsearch.cluster.uuid", "%cluster_id"), diff --git a/server/src/main/java/org/elasticsearch/common/logging/ESJsonLayout.java b/server/src/main/java/org/elasticsearch/common/logging/ESJsonLayout.java index 89abd4a5d7e27..ae6440ac7775d 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/ESJsonLayout.java +++ b/server/src/main/java/org/elasticsearch/common/logging/ESJsonLayout.java @@ -73,7 +73,7 @@ protected ESJsonLayout(String typeName, Charset charset, String[] overrideFields .build(); } - private String pattern(String type, String[] esmessagefields) { + private static String pattern(String type, String[] esmessagefields) { if (Strings.isEmpty(type)) { throw new IllegalArgumentException("layout parameter 'type_name' cannot be empty"); } @@ -94,7 +94,7 @@ private String pattern(String type, String[] esmessagefields) { return createPattern(map, Set.of(esmessagefields)); } - private String createPattern(Map map, Set esmessagefields) { + private static String createPattern(Map map, Set esmessagefields) { StringBuilder sb = new StringBuilder(); sb.append("{"); String separator = ""; @@ -117,20 +117,20 @@ private String createPattern(Map map, Set esmessagefield return sb.toString(); } - private void appendField(StringBuilder sb, Map.Entry entry) { + private static void appendField(StringBuilder sb, Map.Entry entry) { sb.append(jsonKey(entry.getKey())); sb.append(entry.getValue().toString()); } - private String notEmpty(String value) { + private static String notEmpty(String value) { return "%notEmpty{" + value + "}"; } - private CharSequence jsonKey(String s) { + private static CharSequence jsonKey(String s) { return inQuotes(s) + ": "; } - private String inQuotes(String s) { + private static String inQuotes(String s) { return "\"" + s + "\""; } diff --git a/server/src/main/java/org/elasticsearch/common/logging/JsonThrowablePatternConverter.java b/server/src/main/java/org/elasticsearch/common/logging/JsonThrowablePatternConverter.java index c34c8f040dcb7..935eab0073ac9 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/JsonThrowablePatternConverter.java +++ b/server/src/main/java/org/elasticsearch/common/logging/JsonThrowablePatternConverter.java @@ -94,7 +94,7 @@ private String formatJson(String consoleStacktrace) { return stringJoiner.toString(); } - private String wrapAsJson(String line) { + private static String wrapAsJson(String line) { byte[] bytes = JsonStringEncoder.getInstance().quoteAsUTF8(line); return "\"" + new String(bytes, Charset.defaultCharset()) + "\""; } diff --git a/server/src/main/java/org/elasticsearch/common/logging/LoggingOutputStream.java b/server/src/main/java/org/elasticsearch/common/logging/LoggingOutputStream.java index b934d67266d1c..2f38986716df1 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/LoggingOutputStream.java +++ b/server/src/main/java/org/elasticsearch/common/logging/LoggingOutputStream.java @@ -26,7 +26,7 @@ class LoggingOutputStream extends OutputStream { // limit a single log message to 64k static final int MAX_BUFFER_LENGTH = DEFAULT_BUFFER_LENGTH * 64; - class Buffer { + static class Buffer { /** The buffer of bytes sent to the stream */ byte[] bytes = new byte[DEFAULT_BUFFER_LENGTH]; diff --git a/server/src/main/java/org/elasticsearch/common/logging/NodeAndClusterIdConverter.java b/server/src/main/java/org/elasticsearch/common/logging/NodeAndClusterIdConverter.java index 389deae7188a1..138363f4228d9 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/NodeAndClusterIdConverter.java +++ b/server/src/main/java/org/elasticsearch/common/logging/NodeAndClusterIdConverter.java @@ -53,7 +53,7 @@ public void format(LogEvent event, StringBuilder toAppendTo) { // nodeId/clusterUuid not received yet, not appending } - private String formatIds(String nodeId, String clusterUUID) { + private static String formatIds(String nodeId, String clusterUUID) { return String.format(Locale.ROOT, "\"cluster.uuid\": \"%s\", \"node.id\": \"%s\"", clusterUUID, nodeId); } } diff --git a/server/src/main/java/org/elasticsearch/common/logging/NodeAndClusterIdStateListener.java b/server/src/main/java/org/elasticsearch/common/logging/NodeAndClusterIdStateListener.java index 4c371f183837c..a51e06af837f3 100644 --- a/server/src/main/java/org/elasticsearch/common/logging/NodeAndClusterIdStateListener.java +++ b/server/src/main/java/org/elasticsearch/common/logging/NodeAndClusterIdStateListener.java @@ -61,7 +61,7 @@ public void onNewClusterState(ClusterState state) { setNodeIdAndClusterId(nodeId, clusterUUID); } - void setNodeIdAndClusterId(String nodeId, String clusterUUID) { + static void setNodeIdAndClusterId(String nodeId, String clusterUUID) { nodeAndClusterId.set(Tuple.tuple(nodeId, clusterUUID)); } diff --git a/server/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java index d23ddb5feaab1..fe29b81f7c72a 100644 --- a/server/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java +++ b/server/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java @@ -280,7 +280,7 @@ private int termArraysHashCode() { } // Breakout calculation of the termArrays equals - private boolean termArraysEquals(List termArrays1, List termArrays2) { + private static boolean termArraysEquals(List termArrays1, List termArrays2) { if (termArrays1.size() != termArrays2.size()) { return false; } diff --git a/server/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java b/server/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java index 17768bda72bc8..abe0e5baebb77 100644 --- a/server/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java +++ b/server/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java @@ -22,7 +22,7 @@ public final class CounterMetric { private final LongAdder counter = new LongAdder(); private final AtomicLong assertingCounter = Assertions.ENABLED ? new AtomicLong() : null; - private boolean assertNonNegative(long n) { + private static boolean assertNonNegative(long n) { assert n >= 0 : "CounterMetric value must always be non-negative; got: " + n; return true; } diff --git a/server/src/main/java/org/elasticsearch/common/path/PathTrie.java b/server/src/main/java/org/elasticsearch/common/path/PathTrie.java index aadfeefd81cf9..2c84e6c6817ea 100644 --- a/server/src/main/java/org/elasticsearch/common/path/PathTrie.java +++ b/server/src/main/java/org/elasticsearch/common/path/PathTrie.java @@ -170,7 +170,7 @@ private synchronized void insertOrUpdate(String[] path, int index, T value, BiFu node.insertOrUpdate(path, index + 1, value, updater); } - private boolean isNamedWildcard(String key) { + private static boolean isNamedWildcard(String key) { return key.indexOf('{') != -1 && key.indexOf('}') != -1; } diff --git a/server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java b/server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java index 75a19aa6128dc..083ca1e9aa8d6 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java +++ b/server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java @@ -349,7 +349,7 @@ public boolean hasPassword() { return hasPassword; } - private Cipher createCipher(int opmode, char[] password, byte[] salt, byte[] iv) throws GeneralSecurityException { + private static Cipher createCipher(int opmode, char[] password, byte[] salt, byte[] iv) throws GeneralSecurityException { PBEKeySpec keySpec = new PBEKeySpec(password, salt, KDF_ITERS, CIPHER_KEY_BITS); SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(KDF_ALGO); SecretKey secretKey; @@ -434,7 +434,7 @@ public void decrypt(char[] password) throws GeneralSecurityException, IOExceptio } } - private byte[] readByteArray(DataInput input) throws IOException { + private static byte[] readByteArray(DataInput input) throws IOException { final int len = input.readInt(); final byte[] b = new byte[len]; input.readBytes(b, 0, len); diff --git a/server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java b/server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java index ae66ffe29a46a..83669ae94cb39 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java +++ b/server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java @@ -36,7 +36,7 @@ private SecureSetting(String key, Property... properties) { KeyStoreWrapper.validateSettingName(key); } - private boolean assertAllowedProperties(Setting.Property... properties) { + private static boolean assertAllowedProperties(Setting.Property... properties) { for (Setting.Property property : properties) { if (ALLOWED_PROPERTIES.contains(property) == false) { return false; diff --git a/server/src/main/java/org/elasticsearch/common/settings/Settings.java b/server/src/main/java/org/elasticsearch/common/settings/Settings.java index b622f81f8fe64..7ec96bfce679f 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/Settings.java +++ b/server/src/main/java/org/elasticsearch/common/settings/Settings.java @@ -147,7 +147,7 @@ private Map getAsStructuredMap() { return map; } - private void processSetting(Map map, String prefix, String setting, Object value) { + private static void processSetting(Map map, String prefix, String setting, Object value) { int prefixLength = setting.indexOf('.'); if (prefixLength == -1) { @SuppressWarnings("unchecked") @@ -182,7 +182,7 @@ private void processSetting(Map map, String prefix, String setti } } - private Object convertMapsToArrays(Map map) { + private static Object convertMapsToArrays(Map map) { if (map.isEmpty()) { return map; } @@ -652,7 +652,7 @@ private static void toXContent(XContentBuilder builder, Settings settings) throw } @SuppressWarnings("unchecked") - private void toXContentFlat(XContentBuilder builder, Settings settings) throws IOException { + private static void toXContentFlat(XContentBuilder builder, Settings settings) throws IOException { for (Map.Entry entry : settings.getAsStructuredMap().entrySet()) { final Object value = entry.getValue(); final String key = entry.getKey(); diff --git a/server/src/main/java/org/elasticsearch/common/time/JavaDateFormatter.java b/server/src/main/java/org/elasticsearch/common/time/JavaDateFormatter.java index 8169dd3d4b1c3..6a84a7f215f16 100644 --- a/server/src/main/java/org/elasticsearch/common/time/JavaDateFormatter.java +++ b/server/src/main/java/org/elasticsearch/common/time/JavaDateFormatter.java @@ -205,7 +205,7 @@ private TemporalAccessor doParse(String input) { return this.parsers[0].parse(input); } - private boolean parsingSucceeded(Object object, String input, ParsePosition pos) { + private static boolean parsingSucceeded(Object object, String input, ParsePosition pos) { return object != null && pos.getIndex() == input.length(); } diff --git a/server/src/main/java/org/elasticsearch/common/time/JavaDateMathParser.java b/server/src/main/java/org/elasticsearch/common/time/JavaDateMathParser.java index e3fff78f3c8b1..7702a0344c7df 100644 --- a/server/src/main/java/org/elasticsearch/common/time/JavaDateMathParser.java +++ b/server/src/main/java/org/elasticsearch/common/time/JavaDateMathParser.java @@ -69,7 +69,7 @@ public Instant parse(String text, LongSupplier now, boolean roundUpProperty, Zon return parseMath(mathString, time, roundUpProperty, timeZone); } - private Instant parseMath(final String mathString, final Instant time, final boolean roundUpProperty, ZoneId timeZone) + private static Instant parseMath(final String mathString, final Instant time, final boolean roundUpProperty, ZoneId timeZone) throws ElasticsearchParseException { if (timeZone == null) { timeZone = ZoneOffset.UTC; diff --git a/server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java b/server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java index 537ba7d318de5..735a750a69c69 100644 --- a/server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java +++ b/server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java @@ -187,7 +187,7 @@ public float asFloat() { return Float.parseFloat(fuzziness); } - private int termLen(String text) { + private static int termLen(String text) { return text == null ? 5 : text.codePointCount(0, text.length()); // 5 avg term length in english } diff --git a/server/src/main/java/org/elasticsearch/common/util/BigArrays.java b/server/src/main/java/org/elasticsearch/common/util/BigArrays.java index 9b8b20d4cae55..25336a48f85fc 100644 --- a/server/src/main/java/org/elasticsearch/common/util/BigArrays.java +++ b/server/src/main/java/org/elasticsearch/common/util/BigArrays.java @@ -561,7 +561,7 @@ public ByteArray grow(ByteArray array, long minSize) { } /** @see Arrays#hashCode(byte[]) */ - public int hashCode(ByteArray array) { + public static int hashCode(ByteArray array) { if (array == null) { return 0; } @@ -575,7 +575,7 @@ public int hashCode(ByteArray array) { } /** @see Arrays#equals(byte[], byte[]) */ - public boolean equals(ByteArray array, ByteArray other) { + public static boolean equals(ByteArray array, ByteArray other) { if (array == other) { return true; } diff --git a/server/src/main/java/org/elasticsearch/common/util/CuckooFilter.java b/server/src/main/java/org/elasticsearch/common/util/CuckooFilter.java index 74d957c1a6b19..8ebb71adf6708 100644 --- a/server/src/main/java/org/elasticsearch/common/util/CuckooFilter.java +++ b/server/src/main/java/org/elasticsearch/common/util/CuckooFilter.java @@ -394,7 +394,7 @@ static int fingerprint(int hash, int bitsPerEntry, int fingerprintMask) { /** * Calculate the optimal number of bits per entry */ - private int bitsPerEntry(double fpp, int numEntriesPerBucket) { + private static int bitsPerEntry(double fpp, int numEntriesPerBucket) { return (int) Math.round(log2((2 * numEntriesPerBucket) / fpp)); } @@ -402,7 +402,7 @@ private int bitsPerEntry(double fpp, int numEntriesPerBucket) { * Calculate the optimal number of entries per bucket. Will return 2, 4 or 8 * depending on the false positive rate */ - private int entriesPerBucket(double fpp) { + private static int entriesPerBucket(double fpp) { /* Empirical constants from paper: "the space-optimal bucket size depends on the target false positive rate ε: @@ -423,7 +423,7 @@ private int entriesPerBucket(double fpp) { * Calculates the optimal load factor for the filter, given the number of entries * per bucket. Will return 0.84, 0.955 or 0.98 depending on b */ - private double getLoadFactor(int b) { + private static double getLoadFactor(int b) { if ((b == 2 || b == 4 || b == 8) == false) { throw new IllegalArgumentException("b must be one of [2,4,8]"); } @@ -449,14 +449,14 @@ private double getLoadFactor(int b) { * * TODO: there are schemes to avoid powers of two, might want to investigate those */ - private int getNumBuckets(long capacity, double loadFactor, int b) { + private static int getNumBuckets(long capacity, double loadFactor, int b) { long buckets = Math.round((((double) capacity / loadFactor)) / (double) b); // Rounds up to nearest power of 2 return 1 << -Integer.numberOfLeadingZeros((int) buckets - 1); } - private double log2(double x) { + private static double log2(double x) { return Math.log(x) / LN_2; } diff --git a/server/src/main/java/org/elasticsearch/common/util/URIPattern.java b/server/src/main/java/org/elasticsearch/common/util/URIPattern.java index e8c1627e8d27d..a8c1349c9d4e3 100644 --- a/server/src/main/java/org/elasticsearch/common/util/URIPattern.java +++ b/server/src/main/java/org/elasticsearch/common/util/URIPattern.java @@ -69,7 +69,7 @@ && match(uriPattern.getPath(), uri.getPath()) } } - private boolean match(String pattern, String value) { + private static boolean match(String pattern, String value) { if (value == null) { // If the pattern is empty or matches anything - it's a match if (pattern == null || Regex.isMatchAllPattern(pattern)) { diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java index 34eab26190ed5..6b881414de760 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java @@ -355,7 +355,7 @@ public void rejectedExecution(Runnable task, ThreadPoolExecutor executor) { } } - private void put(ThreadPoolExecutor executor, Runnable task) { + private static void put(ThreadPoolExecutor executor, Runnable task) { final BlockingQueue queue = executor.getQueue(); // force queue policy should only be used with a scaling queue assert queue instanceof ExecutorScalingQueue; diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionHandler.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionHandler.java index 7ef75e4fee41a..3878a4a2dff9d 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionHandler.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionHandler.java @@ -28,7 +28,11 @@ protected void incrementRejections() { rejected.inc(); } - protected final EsRejectedExecutionException newRejectedException(Runnable r, ThreadPoolExecutor executor, boolean isExecutorShutdown) { + protected static EsRejectedExecutionException newRejectedException( + Runnable r, + ThreadPoolExecutor executor, + boolean isExecutorShutdown + ) { final StringBuilder builder = new StringBuilder("rejected execution of ").append(r).append(" on ").append(executor); if (isExecutorShutdown) { builder.append(" (shutdown)"); diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java index 6734ebc27c25c..970d58e179e12 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java @@ -149,6 +149,6 @@ protected Runnable wrapRunnable(Runnable command) { } protected Runnable unwrap(Runnable runnable) { - return contextHolder.unwrap(runnable); + return ThreadContext.unwrap(runnable); } } diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java index cbc638d1beadf..7082442bbafec 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java @@ -130,7 +130,7 @@ public StoredContext stashContext() { }; } - private Map headers(ThreadContextStruct context) { + private static Map headers(ThreadContextStruct context) { Map map = Maps.newMapWithExpectedSize(org.elasticsearch.tasks.Task.HEADERS_TO_COPY.size()); for (String header : org.elasticsearch.tasks.Task.HEADERS_TO_COPY) { final String value = context.requestHeaders.get(header); @@ -445,7 +445,7 @@ public Runnable preserveContext(Runnable command) { /** * Unwraps a command that was previously wrapped by {@link #preserveContext(Runnable)}. */ - public Runnable unwrap(Runnable command) { + public static Runnable unwrap(Runnable command) { if (command instanceof WrappedRunnable) { return ((WrappedRunnable) command).unwrap(); } diff --git a/server/src/main/java/org/elasticsearch/common/xcontent/LoggingDeprecationHandler.java b/server/src/main/java/org/elasticsearch/common/xcontent/LoggingDeprecationHandler.java index 6e1f0622c7c0e..2132ae0c13379 100644 --- a/server/src/main/java/org/elasticsearch/common/xcontent/LoggingDeprecationHandler.java +++ b/server/src/main/java/org/elasticsearch/common/xcontent/LoggingDeprecationHandler.java @@ -115,7 +115,7 @@ public void logRemovedField( } - private String parserLocation(String parserName, Supplier location) { + private static String parserLocation(String parserName, Supplier location) { return parserName == null ? "" : "[" + parserName + "][" + location.get() + "] "; } diff --git a/server/src/main/java/org/elasticsearch/common/xcontent/ObjectParserHelper.java b/server/src/main/java/org/elasticsearch/common/xcontent/ObjectParserHelper.java index 48cfe93bdc3a8..c104d5fe504ff 100644 --- a/server/src/main/java/org/elasticsearch/common/xcontent/ObjectParserHelper.java +++ b/server/src/main/java/org/elasticsearch/common/xcontent/ObjectParserHelper.java @@ -30,7 +30,7 @@ public final class ObjectParserHelper { /** * Helper to declare an object that will be parsed into a {@link BytesReference} */ - public void declareRawObject( + public static void declareRawObject( final AbstractObjectParser parser, final BiConsumer consumer, final ParseField field @@ -39,7 +39,7 @@ public void declareRawObject( parser.declareField(consumer, bytesParser, field, ValueType.OBJECT); } - public void declareRawObjectOrNull( + public static void declareRawObjectOrNull( final AbstractObjectParser parser, final BiConsumer consumer, final ParseField field @@ -48,7 +48,7 @@ public void declareRawObjectOrNull( parser.declareField(consumer, bytesParser, field, ValueType.OBJECT_OR_NULL); } - private CheckedFunction getBytesParser() { + private static CheckedFunction getBytesParser() { return p -> { try (XContentBuilder builder = JsonXContent.contentBuilder()) { builder.copyCurrentStructure(p); diff --git a/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java index 76ee479647343..575414ecb654b 100644 --- a/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java +++ b/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java @@ -1266,7 +1266,7 @@ private static void ensureAtomicMoveSupported(final NodePath[] nodePaths) throws } } - private void ensureNoShardData(final NodePath[] nodePaths) throws IOException { + private static void ensureNoShardData(final NodePath[] nodePaths) throws IOException { List shardDataPaths = collectShardDataPaths(nodePaths); if (shardDataPaths.isEmpty() == false) { final String message = String.format( @@ -1279,7 +1279,7 @@ private void ensureNoShardData(final NodePath[] nodePaths) throws IOException { } } - private void ensureNoIndexMetadata(final NodePath[] nodePaths) throws IOException { + private static void ensureNoIndexMetadata(final NodePath[] nodePaths) throws IOException { List indexMetadataPaths = collectIndexMetadataPaths(nodePaths); if (indexMetadataPaths.isEmpty() == false) { final String message = String.format( diff --git a/server/src/main/java/org/elasticsearch/env/NodeRepurposeCommand.java b/server/src/main/java/org/elasticsearch/env/NodeRepurposeCommand.java index b5ee62cff1bf2..d2b2fba044e91 100644 --- a/server/src/main/java/org/elasticsearch/env/NodeRepurposeCommand.java +++ b/server/src/main/java/org/elasticsearch/env/NodeRepurposeCommand.java @@ -73,7 +73,7 @@ protected void processNodePaths(Terminal terminal, Path[] dataPaths, OptionSet o } } - private void processNoMasterNoDataNode(Terminal terminal, Path[] dataPaths, Environment env) throws IOException { + private static void processNoMasterNoDataNode(Terminal terminal, Path[] dataPaths, Environment env) throws IOException { NodeEnvironment.NodePath[] nodePaths = toNodePaths(dataPaths); terminal.println(Terminal.Verbosity.VERBOSE, "Collecting shard data paths"); @@ -113,7 +113,7 @@ private void processNoMasterNoDataNode(Terminal terminal, Path[] dataPaths, Envi terminal.println("Node successfully repurposed to no-master and no-data."); } - private void processMasterNoDataNode(Terminal terminal, Path[] dataPaths, Environment env) throws IOException { + private static void processMasterNoDataNode(Terminal terminal, Path[] dataPaths, Environment env) throws IOException { NodeEnvironment.NodePath[] nodePaths = toNodePaths(dataPaths); terminal.println(Terminal.Verbosity.VERBOSE, "Collecting shard data paths"); @@ -143,12 +143,17 @@ private void processMasterNoDataNode(Terminal terminal, Path[] dataPaths, Enviro terminal.println("Node successfully repurposed to master and no-data."); } - private ClusterState loadClusterState(Terminal terminal, Environment env, PersistedClusterStateService psf) throws IOException { + private static ClusterState loadClusterState(Terminal terminal, Environment env, PersistedClusterStateService psf) throws IOException { terminal.println(Terminal.Verbosity.VERBOSE, "Loading cluster state"); return clusterState(env, psf.loadBestOnDiskState()); } - private void outputVerboseInformation(Terminal terminal, Collection pathsToCleanup, Set indexUUIDs, Metadata metadata) { + private static void outputVerboseInformation( + Terminal terminal, + Collection pathsToCleanup, + Set indexUUIDs, + Metadata metadata + ) { if (terminal.isPrintable(Terminal.Verbosity.VERBOSE)) { terminal.println(Terminal.Verbosity.VERBOSE, "Paths to clean up:"); pathsToCleanup.forEach(p -> terminal.println(Terminal.Verbosity.VERBOSE, " " + p.toString())); @@ -157,13 +162,13 @@ private void outputVerboseInformation(Terminal terminal, Collection pathsT } } - private void outputHowToSeeVerboseInformation(Terminal terminal) { + private static void outputHowToSeeVerboseInformation(Terminal terminal) { if (terminal.isPrintable(Terminal.Verbosity.VERBOSE) == false) { terminal.println("Use -v to see list of paths and indices affected"); } } - private String toIndexName(String uuid, Metadata metadata) { + private static String toIndexName(String uuid, Metadata metadata) { if (metadata != null) { for (Map.Entry indexMetadata : metadata.indices().entrySet()) { if (indexMetadata.getValue().getIndexUUID().equals(uuid)) { @@ -174,7 +179,7 @@ private String toIndexName(String uuid, Metadata metadata) { return "no name for uuid: " + uuid; } - private Set indexUUIDsFor(Set indexPaths) { + private static Set indexUUIDsFor(Set indexPaths) { return indexPaths.stream().map(Path::getFileName).map(Path::toString).collect(Collectors.toSet()); } @@ -186,12 +191,12 @@ static String shardMessage(int shards, int indices) { return "Found " + shards + " shards in " + indices + " indices to clean up"; } - private void removePaths(Terminal terminal, Collection paths) { + private static void removePaths(Terminal terminal, Collection paths) { terminal.println(Terminal.Verbosity.VERBOSE, "Removing data"); - paths.forEach(this::removePath); + paths.forEach(NodeRepurposeCommand::removePath); } - private void removePath(Path path) { + private static void removePath(Path path) { try { IOUtils.rm(path); } catch (IOException e) { @@ -201,7 +206,7 @@ private void removePath(Path path) { @SafeVarargs @SuppressWarnings("varargs") - private Set uniqueParentPaths(Collection... paths) { + private static Set uniqueParentPaths(Collection... paths) { // equals on Path is good enough here due to the way these are collected. return Arrays.stream(paths).flatMap(Collection::stream).map(Path::getParent).collect(Collectors.toSet()); } diff --git a/server/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java b/server/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java index 143944b77a130..c7145ed444d38 100644 --- a/server/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java +++ b/server/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java @@ -66,7 +66,7 @@ public void allocateUnassigned( } } - protected long getExpectedShardSize(ShardRouting shardRouting, RoutingAllocation allocation) { + protected static long getExpectedShardSize(ShardRouting shardRouting, RoutingAllocation allocation) { if (shardRouting.primary()) { if (shardRouting.recoverySource().getType() == RecoverySource.Type.SNAPSHOT) { return allocation.snapshotShardSizeInfo().getShardSize(shardRouting, ShardRouting.UNAVAILABLE_EXPECTED_SHARD_SIZE); diff --git a/server/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java b/server/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java index ecc9757292a64..bd710291fade2 100644 --- a/server/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java +++ b/server/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java @@ -82,7 +82,7 @@ public Map getDanglingIndices() { * Importing dangling indices with aliases is dangerous, it could for instance result in inability to write to an existing alias if it * previously had only one index with any is_write_index indication. */ - private IndexMetadata stripAliases(IndexMetadata indexMetadata) { + private static IndexMetadata stripAliases(IndexMetadata indexMetadata) { if (indexMetadata.getAliases().isEmpty()) { return indexMetadata; } else { diff --git a/server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java b/server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java index 79ce88d35e880..756fcc668788c 100644 --- a/server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java +++ b/server/src/main/java/org/elasticsearch/http/AbstractHttpServerTransport.java @@ -328,7 +328,7 @@ public void onException(HttpChannel channel, Exception e) { } } - protected void onServerException(HttpServerChannel channel, Exception e) { + protected static void onServerException(HttpServerChannel channel, Exception e) { logger.error(new ParameterizedMessage("exception from http server channel caught on transport layer [channel={}]", channel), e); } diff --git a/server/src/main/java/org/elasticsearch/http/CorsHandler.java b/server/src/main/java/org/elasticsearch/http/CorsHandler.java index 5dbf4c6142588..3c30407bd39f1 100644 --- a/server/src/main/java/org/elasticsearch/http/CorsHandler.java +++ b/server/src/main/java/org/elasticsearch/http/CorsHandler.java @@ -139,7 +139,7 @@ private static boolean isSameOrigin(final String origin, final String host) { return false; } - private void setPreflightHeaders(final HttpResponse response) { + private static void setPreflightHeaders(final HttpResponse response) { response.addHeader(CorsHandler.DATE, dateTimeFormatter.format(ZonedDateTime.now(ZoneOffset.UTC))); response.addHeader("content-length", "0"); } diff --git a/server/src/main/java/org/elasticsearch/http/DefaultRestChannel.java b/server/src/main/java/org/elasticsearch/http/DefaultRestChannel.java index ff07f0cdbdb3e..7e5b8b2c63d8b 100644 --- a/server/src/main/java/org/elasticsearch/http/DefaultRestChannel.java +++ b/server/src/main/java/org/elasticsearch/http/DefaultRestChannel.java @@ -143,17 +143,17 @@ public void sendResponse(RestResponse restResponse) { } } - private void setHeaderField(HttpResponse response, String headerField, String value) { + private static void setHeaderField(HttpResponse response, String headerField, String value) { setHeaderField(response, headerField, value, true); } - private void setHeaderField(HttpResponse response, String headerField, String value, boolean override) { + private static void setHeaderField(HttpResponse response, String headerField, String value, boolean override) { if (override || response.containsHeader(headerField) == false) { response.addHeader(headerField, value); } } - private void addCustomHeaders(HttpResponse response, Map> customHeaders) { + private static void addCustomHeaders(HttpResponse response, Map> customHeaders) { if (customHeaders != null) { for (Map.Entry> headerEntry : customHeaders.entrySet()) { for (String headerValue : headerEntry.getValue()) { diff --git a/server/src/main/java/org/elasticsearch/index/IndexMode.java b/server/src/main/java/org/elasticsearch/index/IndexMode.java index 3d45ff4834f29..c149f214212d5 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexMode.java +++ b/server/src/main/java/org/elasticsearch/index/IndexMode.java @@ -55,7 +55,7 @@ void validateWithOtherSettings(Map, Object> settings) { settingRequiresTimeSeries(settings, IndexSettings.TIME_SERIES_END_TIME); } - private void settingRequiresTimeSeries(Map, Object> settings, Setting setting) { + private static void settingRequiresTimeSeries(Map, Object> settings, Setting setting) { if (false == Objects.equals(setting.getDefault(Settings.EMPTY), settings.get(setting))) { throw new IllegalArgumentException("[" + setting.getKey() + "] requires " + tsdbMode()); } @@ -119,13 +119,13 @@ void validateWithOtherSettings(Map, Object> settings) { checkSetting(settings, IndexMetadata.INDEX_ROUTING_PATH); } - private void checkSetting(Map, Object> settings, Setting setting) { + private static void checkSetting(Map, Object> settings, Setting setting) { if (Objects.equals(setting.getDefault(Settings.EMPTY), settings.get(setting))) { throw new IllegalArgumentException(tsdbMode() + " requires a non-empty [" + setting.getKey() + "]"); } } - private String error(Setting unsupported) { + private static String error(Setting unsupported) { return tsdbMode() + " is incompatible with [" + unsupported.getKey() + "]"; } @@ -161,7 +161,7 @@ public TimestampBounds getTimestampBound(IndexScopedSettings settings) { return new TimestampBounds(settings); } - private String routingRequiredBad() { + private static String routingRequiredBad() { return "routing is forbidden on CRUD operations that target indices in " + tsdbMode(); } @@ -187,7 +187,7 @@ public DocumentDimensions buildDocumentDimensions() { } }; - protected String tsdbMode() { + protected static String tsdbMode() { return "[" + IndexSettings.MODE.getKey() + "=time_series]"; } diff --git a/server/src/main/java/org/elasticsearch/index/IndexService.java b/server/src/main/java/org/elasticsearch/index/IndexService.java index 325678f93904a..35a11568282f7 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexService.java +++ b/server/src/main/java/org/elasticsearch/index/IndexService.java @@ -862,11 +862,11 @@ private void rescheduleRefreshTasks() { } } - public Function dateMathExpressionResolverAt() { + public static Function dateMathExpressionResolverAt() { return expression -> IndexNameExpressionResolver.resolveDateMathExpression(expression, System.currentTimeMillis()); } - public Function dateMathExpressionResolverAt(long instant) { + public static Function dateMathExpressionResolverAt(long instant) { return expression -> IndexNameExpressionResolver.resolveDateMathExpression(expression, instant); } diff --git a/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java b/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java index 3f2740d481425..5744199cd23a2 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java +++ b/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java @@ -257,7 +257,7 @@ public Sort buildIndexSort( return new Sort(sortFields); } - private void validateIndexSortField(SortField sortField) { + private static void validateIndexSortField(SortField sortField) { SortField.Type type = getSortFieldType(sortField); if (ALLOWED_INDEX_SORT_TYPES.contains(type) == false) { throw new IllegalArgumentException("invalid index sort field:[" + sortField.getField() + "]"); diff --git a/server/src/main/java/org/elasticsearch/index/VersionType.java b/server/src/main/java/org/elasticsearch/index/VersionType.java index a6a4b699447b4..eb493319ba627 100644 --- a/server/src/main/java/org/elasticsearch/index/VersionType.java +++ b/server/src/main/java/org/elasticsearch/index/VersionType.java @@ -46,7 +46,7 @@ public String explainConflictForReads(long currentVersion, long expectedVersion) return "current version [" + currentVersion + "] is different than the one provided [" + expectedVersion + "]"; } - private boolean isVersionConflict(long currentVersion, long expectedVersion, boolean deleted) { + private static boolean isVersionConflict(long currentVersion, long expectedVersion, boolean deleted) { if (expectedVersion == Versions.MATCH_ANY) { return false; } diff --git a/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java b/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java index 8a3d575ab7034..c26cd73634637 100644 --- a/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java +++ b/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java @@ -392,7 +392,7 @@ private AnalysisProvider getCharFilterProvider(String charFil ); } - private AnalysisProvider getProvider( + private static AnalysisProvider getProvider( Component componentType, String componentName, IndexSettings indexSettings, @@ -584,7 +584,7 @@ public void close() throws IOException { } } - public IndexAnalyzers build( + public static IndexAnalyzers build( IndexSettings indexSettings, Map> analyzerProviders, Map> normalizerProviders, @@ -710,7 +710,7 @@ private static NamedAnalyzer produceAnalyzer( return analyzer; } - private void processNormalizerFactory( + private static void processNormalizerFactory( String name, AnalyzerProvider normalizerFactory, Map normalizers, diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index 2d0724963c49a..05d1ee68ff1bb 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -600,7 +600,7 @@ public long getWritingBytes() { /** * Reads the current stored history ID from the IW commit data. */ - private String loadHistoryUUID(Map commitData) { + private static String loadHistoryUUID(Map commitData) { final String uuid = commitData.get(HISTORY_UUID_KEY); if (uuid == null) { throw new IllegalStateException("commit doesn't contain history uuid"); @@ -1221,7 +1221,7 @@ && treatDocumentFailureAsTragicError(index) == false) { * If we hit any failure while processing an indexing on a replica, we should treat that error as tragic and fail the engine. * However, we prefer to fail a request individually (instead of a shard) if we hit a document failure on the primary. */ - private boolean treatDocumentFailureAsTragicError(Index index) { + private static boolean treatDocumentFailureAsTragicError(Index index) { // TODO: can we enable this check for all origins except primary on the leader? return index.origin() == Operation.Origin.REPLICA || index.origin() == Operation.Origin.PEER_RECOVERY diff --git a/server/src/main/java/org/elasticsearch/index/engine/LuceneChangesSnapshot.java b/server/src/main/java/org/elasticsearch/index/engine/LuceneChangesSnapshot.java index 18bb2b1a6e17d..33681f577ed59 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/LuceneChangesSnapshot.java +++ b/server/src/main/java/org/elasticsearch/index/engine/LuceneChangesSnapshot.java @@ -388,7 +388,7 @@ private Translog.Operation readDocAsOp(int docIndex) throws IOException { return op; } - private boolean assertDocSoftDeleted(LeafReader leafReader, int segmentDocId) throws IOException { + private static boolean assertDocSoftDeleted(LeafReader leafReader, int segmentDocId) throws IOException { final NumericDocValues ndv = leafReader.getNumericDocValues(Lucene.SOFT_DELETES_FIELD); if (ndv == null || ndv.advanceExact(segmentDocId) == false) { throw new IllegalStateException("DocValues for field [" + Lucene.SOFT_DELETES_FIELD + "] is not found"); diff --git a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java index f3dbf6f392ee5..7019ca1d1b987 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java @@ -539,7 +539,7 @@ public boolean refreshNeeded() { return false; } - private Translog.Snapshot newEmptySnapshot() { + private static Translog.Snapshot newEmptySnapshot() { return new Translog.Snapshot() { @Override public void close() {} diff --git a/server/src/main/java/org/elasticsearch/index/engine/Segment.java b/server/src/main/java/org/elasticsearch/index/engine/Segment.java index 3bae0f19d1015..604e93cf819a0 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/Segment.java +++ b/server/src/main/java/org/elasticsearch/index/engine/Segment.java @@ -172,7 +172,7 @@ public void writeTo(StreamOutput out) throws IOException { } } - private Sort readSegmentSort(StreamInput in) throws IOException { + private static Sort readSegmentSort(StreamInput in) throws IOException { int size = in.readVInt(); if (size == 0) { return null; @@ -214,7 +214,7 @@ private Sort readSegmentSort(StreamInput in) throws IOException { return new Sort(fields); } - private void writeSegmentSort(StreamOutput out, Sort sort) throws IOException { + private static void writeSegmentSort(StreamOutput out, Sort sort) throws IOException { if (sort == null) { out.writeVInt(0); return; diff --git a/server/src/main/java/org/elasticsearch/index/engine/ShuffleForcedMergePolicy.java b/server/src/main/java/org/elasticsearch/index/engine/ShuffleForcedMergePolicy.java index 4b8846f2ef057..2a295c0c154d6 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/ShuffleForcedMergePolicy.java +++ b/server/src/main/java/org/elasticsearch/index/engine/ShuffleForcedMergePolicy.java @@ -59,7 +59,7 @@ public MergeSpecification findForcedMerges( return wrap(in.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, mergeContext)); } - private MergeSpecification wrap(MergeSpecification mergeSpec) throws IOException { + private static MergeSpecification wrap(MergeSpecification mergeSpec) throws IOException { if (mergeSpec == null) { return null; } @@ -86,7 +86,7 @@ public void setMergeInfo(SegmentCommitInfo info) { // Return a new list that sort segments of the original one by name (older first) // and then interleave them to colocate oldest and most recent segments together. - private List interleaveList(List infos) throws IOException { + private static List interleaveList(List infos) throws IOException { List newInfos = new ArrayList<>(infos.size()); Collections.sort(infos, Comparator.comparing(a -> a.info.name)); int left = 0; diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java index ceae9260b45f8..f014803038c30 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java @@ -428,7 +428,7 @@ private void resize(int newSize) { } } - protected String bytesToString(BytesRef bytesRef) { + protected static String bytesToString(BytesRef bytesRef) { return bytesRef.utf8ToString(); } diff --git a/server/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/server/src/main/java/org/elasticsearch/index/get/ShardGetService.java index 992afdeb99881..1bec5c23429ca 100644 --- a/server/src/main/java/org/elasticsearch/index/get/ShardGetService.java +++ b/server/src/main/java/org/elasticsearch/index/get/ShardGetService.java @@ -145,7 +145,7 @@ public GetResult get(Engine.GetResult engineGetResult, String id, String[] field /** * decides what needs to be done based on the request input and always returns a valid non-null FetchSourceContext */ - private FetchSourceContext normalizeFetchSourceContent(@Nullable FetchSourceContext context, @Nullable String[] gFields) { + private static FetchSourceContext normalizeFetchSourceContent(@Nullable FetchSourceContext context, @Nullable String[] gFields) { if (context != null) { return context; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java index a3de6d70f5523..5b637d606b5c8 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java @@ -467,7 +467,7 @@ private static void parseObjectDynamic(DocumentParserContext context, ObjectMapp // hence we don't dynamically create empty objects under properties, but rather carry around an artificial object mapper dynamicObjectMapper = new NoOpObjectMapper(currentFieldName, context.path().pathAsText(currentFieldName)); } else { - dynamicObjectMapper = dynamic.getDynamicFieldsBuilder().createDynamicObjectMapper(context, currentFieldName); + dynamicObjectMapper = DynamicFieldsBuilder.createDynamicObjectMapper(context, currentFieldName); context.addDynamicMapper(dynamicObjectMapper); } if (dynamicObjectMapper instanceof NestedObjectMapper && context.isWithinCopyTo()) { @@ -503,7 +503,7 @@ private static void parseArray(DocumentParserContext context, ObjectMapper paren } else if (dynamic == ObjectMapper.Dynamic.FALSE) { context.parser().skipChildren(); } else { - Mapper objectMapperFromTemplate = dynamic.getDynamicFieldsBuilder().createObjectMapperFromTemplate(context, lastFieldName); + Mapper objectMapperFromTemplate = DynamicFieldsBuilder.createObjectMapperFromTemplate(context, lastFieldName); if (objectMapperFromTemplate == null) { parseNonDynamicArray(context, parentMapper, lastFieldName, lastFieldName); } else { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java b/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java index 90367ea124ceb..6d56b230b6a53 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java @@ -157,7 +157,7 @@ void createDynamicFieldFromValue(final DocumentParserContext context, XContentPa /** * Returns a dynamically created object mapper, eventually based on a matching dynamic template. */ - Mapper createDynamicObjectMapper(DocumentParserContext context, String name) { + static Mapper createDynamicObjectMapper(DocumentParserContext context, String name) { Mapper mapper = createObjectMapperFromTemplate(context, name); return mapper != null ? mapper : new ObjectMapper.Builder(name).enabled(true).build(MapperBuilderContext.forPath(context.path())); } @@ -165,7 +165,7 @@ Mapper createDynamicObjectMapper(DocumentParserContext context, String name) { /** * Returns a dynamically created object mapper, based exclusively on a matching dynamic template, null otherwise. */ - Mapper createObjectMapperFromTemplate(DocumentParserContext context, String name) { + static Mapper createObjectMapperFromTemplate(DocumentParserContext context, String name) { Mapper.Builder templateBuilder = findTemplateBuilderForObject(context, name); return templateBuilder == null ? null : templateBuilder.build(MapperBuilderContext.forPath(context.path())); } @@ -174,7 +174,7 @@ Mapper createObjectMapperFromTemplate(DocumentParserContext context, String name * Creates a dynamic string field based on a matching dynamic template. * No field is created in case there is no matching dynamic template. */ - void createDynamicStringFieldFromTemplate(DocumentParserContext context, String name) throws IOException { + static void createDynamicStringFieldFromTemplate(DocumentParserContext context, String name) throws IOException { createDynamicField(context, name, DynamicTemplate.XContentFieldType.STRING, () -> {}); } 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 96a712cf13520..4f102ccad66eb 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -426,7 +426,7 @@ protected GeoPoint validate(GeoPoint in) { return in; } - private boolean isNormalizable(double coord) { + private static boolean isNormalizable(double coord) { return Double.isNaN(coord) == false && Double.isInfinite(coord) == false; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappingParserContext.java b/server/src/main/java/org/elasticsearch/index/mapper/MappingParserContext.java index 53f3e5322fafe..f2df66b649585 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MappingParserContext.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MappingParserContext.java @@ -124,7 +124,7 @@ public ScriptCompiler scriptCompiler() { return scriptCompiler; } - MappingParserContext createMultiFieldContext(MappingParserContext in) { + static MappingParserContext createMultiFieldContext(MappingParserContext in) { return new MultiFieldParserContext(in); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java index f73cd9b1ae5d7..0731dca810975 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java @@ -253,7 +253,7 @@ public double reduceToStoredPrecision(double value) { * precise control over their rounding behavior that * {@link #parse(Object, boolean)} provides. */ - private float parseToFloat(Object value) { + private static float parseToFloat(Object value) { final float result; if (value instanceof Number) { @@ -368,7 +368,7 @@ public IndexFieldData.Builder getFieldDataBuilder(String name) { return new SortedDoublesIndexFieldData.Builder(name, numericType(), HalfFloatDocValuesField::new); } - private void validateParsed(float value) { + private static void validateParsed(float value) { if (Float.isFinite(HalfFloatPoint.sortableShortToHalfFloat(HalfFloatPoint.halfFloatToSortableShort(value))) == false) { throw new IllegalArgumentException("[half_float] supports only finite values, but got [" + value + "]"); } @@ -494,7 +494,7 @@ public IndexFieldData.Builder getFieldDataBuilder(String name) { return new SortedDoublesIndexFieldData.Builder(name, numericType(), FloatDocValuesField::new); } - private void validateParsed(float value) { + private static void validateParsed(float value) { if (Float.isFinite(value) == false) { throw new IllegalArgumentException("[float] supports only finite values, but got [" + value + "]"); } @@ -598,7 +598,7 @@ public IndexFieldData.Builder getFieldDataBuilder(String name) { return new SortedDoublesIndexFieldData.Builder(name, numericType(), DoubleDocValuesField::new); } - private void validateParsed(double value) { + private static void validateParsed(double value) { if (Double.isFinite(value) == false) { throw new IllegalArgumentException("[double] supports only finite values, but got [" + value + "]"); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java index edb215020b974..8b12abc8aa245 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java @@ -130,7 +130,7 @@ public Mapper build(MapperBuilderContext context) { } } - private ObjectMapper.Builder findChild(String fullChildName, DocumentParserContext context) { + private static ObjectMapper.Builder findChild(String fullChildName, DocumentParserContext context) { // does the child mapper already exist? if so, use that ObjectMapper child = context.mappingLookup().objectMappers().get(fullChildName); if (child != null) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java index 668eba05c78ee..11867911eb36d 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java @@ -166,7 +166,7 @@ public RootObjectMapper.Builder parse(String name, Map node, Map } @SuppressWarnings("unchecked") - private boolean processField( + private static boolean processField( RootObjectMapper.Builder builder, String fieldName, Object fieldNode, diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java index a544eb1ed61a8..6d40e5b0cdcad 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java @@ -116,7 +116,7 @@ public String typeName() { return CONTENT_TYPE; } - private long parse(Object value) { + private static long parse(Object value) { if (value instanceof Number) { double doubleValue = ((Number) value).doubleValue(); if (doubleValue < Long.MIN_VALUE || doubleValue > Long.MAX_VALUE) { @@ -151,7 +151,7 @@ public Query termQuery(Object value, @Nullable SearchExecutionContext context) { @Override public Query termsQuery(Collection values, @Nullable SearchExecutionContext context) { - long[] v = values.stream().mapToLong(this::parse).toArray(); + long[] v = values.stream().mapToLong(SeqNoFieldType::parse).toArray(); return LongPoint.newSetQuery(name(), v); } 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 e7b48ba6bd075..f0b8b6de41493 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java @@ -834,7 +834,7 @@ public Query multiPhraseQuery(TokenStream stream, int slop, boolean enablePositi return createPhraseQuery(stream, field, slop, enablePositionIncrements); } - private int countTokens(TokenStream ts) throws IOException { + private static int countTokens(TokenStream ts) throws IOException { ts.reset(); int count = 0; while (ts.incrementToken()) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapper.java index ae6bbd1a49718..c4118fc6e68bd 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapper.java @@ -146,7 +146,7 @@ public void postParse(DocumentParserContext context) throws IOException { TimeSeriesIdBuilder timeSeriesIdBuilder = (TimeSeriesIdBuilder) context.getDimensions(); BytesRef timeSeriesId = timeSeriesIdBuilder.build().toBytesRef(); context.doc().add(new SortedDocValuesField(fieldType().name(), timeSeriesId)); - TsidExtractingIdFieldMapper.INSTANCE.createField(context, timeSeriesId); + TsidExtractingIdFieldMapper.createField(context, timeSeriesId); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TsidExtractingIdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TsidExtractingIdFieldMapper.java index f00d0e988cb74..e6c943d237b3e 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TsidExtractingIdFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TsidExtractingIdFieldMapper.java @@ -110,7 +110,7 @@ private TsidExtractingIdFieldMapper() { private static final long SEED = 0; - public void createField(DocumentParserContext context, BytesRef tsid) { + public static void createField(DocumentParserContext context, BytesRef tsid) { IndexableField[] timestampFields = context.rootDoc().getFields(DataStreamTimestampFieldMapper.DEFAULT_PATH); if (timestampFields.length == 0) { throw new IllegalArgumentException( @@ -190,7 +190,7 @@ public String documentDescription(ParsedDocument parsedDocument) { return "[" + parsedDocument.id() + "][" + tsidDescription(tsidField) + "@" + timestampStr + "]"; } - private String tsidDescription(IndexableField tsidField) { + private static String tsidDescription(IndexableField tsidField) { String tsid = TimeSeriesIdFieldMapper.decodeTsid(tsidField.binaryValue()).toString(); if (tsid.length() <= DESCRIPTION_TSID_LIMIT) { return tsid; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java index 4e2ac927d7667..4662c680d1561 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java @@ -110,7 +110,7 @@ public static boolean parseMultiField( } } - parserContext = parserContext.createMultiFieldContext(parserContext); + parserContext = MappingParserContext.createMultiFieldContext(parserContext); final Map multiFieldsPropNodes; if (propNode instanceof List && ((List) propNode).isEmpty()) { 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 e22eff5d4ec44..525cc72d74c97 100644 --- a/server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java @@ -354,7 +354,7 @@ protected Query doToQuery(SearchExecutionContext context) { * Name or path of the field in the Shape Document where the * Shape itself is located */ - private void fetch(Client client, GetRequest getRequest, String path, ActionListener listener) { + private static void fetch(Client client, GetRequest getRequest, String path, ActionListener listener) { getRequest.preference("_local"); client.get(getRequest, listener.delegateFailure((l, response) -> { try { diff --git a/server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java index e4c1f3196f6d0..3bea284aa2e3b 100644 --- a/server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java @@ -242,7 +242,7 @@ public boolean autoGenerateSynonymsPhraseQuery() { return autoGenerateSynonymsPhraseQuery; } - private void validateFieldBoost(float boost) { + private static void validateFieldBoost(float boost) { if (boost < 1.0f) { throw new IllegalArgumentException("[" + NAME + "] requires field boosts to be >= 1.0"); } @@ -334,7 +334,7 @@ protected Query doToQuery(SearchExecutionContext context) throws IOException { return query; } - private void validateSimilarity(SearchExecutionContext context, Map fields) { + private static void validateSimilarity(SearchExecutionContext context, Map fields) { for (Map.Entry entry : fields.entrySet()) { String name = entry.getKey(); MappedFieldType fieldType = context.getFieldType(name); diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java index 8810efadbb17b..b3f42fde3b926 100644 --- a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java +++ b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java @@ -127,7 +127,7 @@ public Match(StreamInput in) throws IOException { } } - private IntervalsSource intervals( + private static IntervalsSource intervals( MappedFieldType fieldType, String text, int maxGaps, diff --git a/server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java index 65ae19a962571..5a6c871d7a8de 100644 --- a/server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java @@ -1029,7 +1029,7 @@ protected Query doToQuery(SearchExecutionContext context) throws IOException { } } - private Query handleItems( + private static Query handleItems( SearchExecutionContext context, MoreLikeThisQuery mltQuery, Item[] likeItems, @@ -1089,7 +1089,7 @@ private static void setDefaultIndexTypeFields( } } - private MultiTermVectorsResponse fetchResponse(Client client, Item[] items) throws IOException { + private static MultiTermVectorsResponse fetchResponse(Client client, Item[] items) throws IOException { MultiTermVectorsRequest request = new MultiTermVectorsRequest(); for (Item item : items) { request.add(item.toTermVectorsRequest()); diff --git a/server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java index c6d75162a1233..addd5f1ceca7a 100644 --- a/server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java @@ -94,7 +94,7 @@ public RangeQueryBuilder(StreamInput in) throws IOException { } } - private boolean isRelationAllowed(ShapeRelation relation) { + private static boolean isRelationAllowed(ShapeRelation relation) { return relation == ShapeRelation.INTERSECTS || relation == ShapeRelation.CONTAINS || relation == ShapeRelation.WITHIN; } diff --git a/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java b/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java index 4252cb3b012e8..80094f97346dc 100644 --- a/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java +++ b/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java @@ -611,7 +611,7 @@ public Client getClient() { return client; } - public QueryBuilder parseInnerQueryBuilder(XContentParser parser) throws IOException { + public static QueryBuilder parseInnerQueryBuilder(XContentParser parser) throws IOException { return AbstractQueryBuilder.parseInnerQueryBuilder(parser); } diff --git a/server/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java index 1e5323d53be2a..d6cf1dacfcb5b 100644 --- a/server/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java @@ -253,7 +253,7 @@ protected Query doToQuery(SearchExecutionContext context) throws IOException { return builder.build(); } - private String queryFieldName(SearchExecutionContext context, String fieldName) { + private static String queryFieldName(SearchExecutionContext context, String fieldName) { MappedFieldType fieldType = context.getFieldType(fieldName); return fieldType != null ? fieldType.name() : fieldName; } diff --git a/server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java index d1aa9923fb3e6..c88a0ee73da8a 100644 --- a/server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java @@ -345,7 +345,7 @@ protected Query doToQuery(SearchExecutionContext context) throws IOException { return fieldType.termsQuery(values, context); } - private void fetch(TermsLookup termsLookup, Client client, ActionListener> actionListener) { + private static void fetch(TermsLookup termsLookup, Client client, ActionListener> actionListener) { GetRequest getRequest = new GetRequest(termsLookup.index(), termsLookup.id()); getRequest.preference("_local").routing(termsLookup.routing()); client.get(getRequest, actionListener.map(getResponse -> { @@ -581,7 +581,7 @@ public int hashCode() { return Objects.hash(valueRef); } - private int consumerHeadersAndGetListSize(StreamInput in) throws IOException { + private static int consumerHeadersAndGetListSize(StreamInput in) throws IOException { byte genericSign = in.readByte(); assert genericSign == 7; return in.readVInt(); diff --git a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java index bf4dedae5cda7..6df8a5dbdd0f8 100644 --- a/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java @@ -61,7 +61,7 @@ public final FB setWeight(float weight) { return (FB) this; } - private Float checkWeight(Float weight) { + private static Float checkWeight(Float weight) { if (weight != null && Float.compare(weight, 0) < 0) { throw new IllegalArgumentException("[weight] cannot be negative for a filtering function"); } diff --git a/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java b/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java index 45d6d6fd70fe8..b9e40a67097df 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java @@ -851,14 +851,14 @@ public boolean equals(Object o) { } } - private int checkPositive(int value, String name) { + private static int checkPositive(int value, String name) { if (value < 0) { throw new IllegalArgumentException(name + " must be greater than 0 but was [" + value + "]"); } return value; } - private long checkPositive(long value, String name) { + private static long checkPositive(long value, String name) { if (value < 0) { throw new IllegalArgumentException(name + " must be greater than 0 but was [" + value + "]"); } diff --git a/server/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java b/server/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java index 3b04c79effae2..125048abff007 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java @@ -82,7 +82,7 @@ protected void doStartNextScroll(String scrollId, TimeValue extraKeepAlive, Reje client.searchScroll(request, wrapListener(searchListener)); } - private ActionListener wrapListener(RejectAwareActionListener searchListener) { + private static ActionListener wrapListener(RejectAwareActionListener searchListener) { return new ActionListener<>() { @Override public void onResponse(SearchResponse searchResponse) { @@ -128,7 +128,7 @@ protected void cleanup(Runnable onCompletion) { onCompletion.run(); } - private Response wrapSearchResponse(SearchResponse response) { + private static Response wrapSearchResponse(SearchResponse response) { List failures; if (response.getShardFailures() == null) { failures = emptyList(); diff --git a/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java index e3dbf6ed67ec5..f0b5d48c9a88a 100644 --- a/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java +++ b/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java @@ -254,7 +254,7 @@ public void setFuzzyTranspositions(boolean fuzzyTranspositions) { this.fuzzyTranspositions = fuzzyTranspositions; } - private Query applyBoost(Query q, Float boost) { + private static Query applyBoost(Query q, Float boost) { if (boost != null && boost != 1f) { return new BoostQuery(q, boost); } @@ -779,7 +779,7 @@ protected Query getBooleanQuery(List clauses) throws ParseExcepti return fixNegativeQueryIfNeeded(q); } - private Query applySlop(Query q, int slop) { + private static Query applySlop(Query q, int slop) { if (q instanceof PhraseQuery) { // make sure that the boost hasn't been set beforehand, otherwise we'd lose it assert q instanceof BoostQuery == false; @@ -795,7 +795,7 @@ private Query applySlop(Query q, int slop) { } } - private Query addSlopToSpan(SpanQuery query, int slop) { + private static Query addSlopToSpan(SpanQuery query, int slop) { if (query instanceof SpanNearQuery) { return new SpanNearQuery(((SpanNearQuery) query).getClauses(), slop, ((SpanNearQuery) query).isInOrder()); } else if (query instanceof SpanOrQuery) { @@ -813,7 +813,7 @@ private Query addSlopToSpan(SpanQuery query, int slop) { /** * Rebuild a phrase query with a slop value */ - private PhraseQuery addSlopToPhrase(PhraseQuery query, int slop) { + private static PhraseQuery addSlopToPhrase(PhraseQuery query, int slop) { PhraseQuery.Builder builder = new PhraseQuery.Builder(); builder.setSlop(slop); final Term[] terms = query.getTerms(); diff --git a/server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java b/server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java index 0568a64276a91..d466d0988abfb 100644 --- a/server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java +++ b/server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java @@ -91,7 +91,7 @@ protected void shardOperationOnReplica(Request shardRequest, IndexShard replica, }); } - private void maybeSyncTranslog(final IndexShard indexShard) throws IOException { + private static void maybeSyncTranslog(final IndexShard indexShard) throws IOException { if (indexShard.getTranslogDurability() == Translog.Durability.REQUEST && indexShard.getLastSyncedGlobalCheckpoint() < indexShard.getLastKnownGlobalCheckpoint()) { indexShard.sync(); diff --git a/server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncAction.java b/server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncAction.java index bf736ab0c7630..ed94e43cd097c 100644 --- a/server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncAction.java +++ b/server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncAction.java @@ -58,7 +58,7 @@ public class RetentionLeaseBackgroundSyncAction extends TransportReplicationActi public static final String ACTION_NAME = "indices:admin/seq_no/retention_lease_background_sync"; private static final Logger LOGGER = LogManager.getLogger(RetentionLeaseSyncAction.class); - protected Logger getLogger() { + protected static Logger getLogger() { return LOGGER; } diff --git a/server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseSyncAction.java b/server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseSyncAction.java index cd359678b6d1d..38d5ee9dfd07d 100644 --- a/server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseSyncAction.java +++ b/server/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseSyncAction.java @@ -59,7 +59,7 @@ public class RetentionLeaseSyncAction extends TransportWriteAction< public static final String ACTION_NAME = "indices:admin/seq_no/retention_lease_sync"; private static final Logger LOGGER = LogManager.getLogger(RetentionLeaseSyncAction.class); - protected Logger getLogger() { + protected static Logger getLogger() { return LOGGER; } diff --git a/server/src/main/java/org/elasticsearch/index/shard/GlobalCheckpointListeners.java b/server/src/main/java/org/elasticsearch/index/shard/GlobalCheckpointListeners.java index 31aadfe09bdd2..eeb381e766dd1 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/GlobalCheckpointListeners.java +++ b/server/src/main/java/org/elasticsearch/index/shard/GlobalCheckpointListeners.java @@ -233,7 +233,7 @@ private void notifyListener(final GlobalCheckpointListener listener, final long }); } - private void assertNotification(final long globalCheckpoint, final Exception e) { + private static void assertNotification(final long globalCheckpoint, final Exception e) { if (Assertions.ENABLED) { assert globalCheckpoint >= UNASSIGNED_SEQ_NO : globalCheckpoint; if (globalCheckpoint != UNASSIGNED_SEQ_NO) { diff --git a/server/src/main/java/org/elasticsearch/index/shard/RemoveCorruptedLuceneSegmentsAction.java b/server/src/main/java/org/elasticsearch/index/shard/RemoveCorruptedLuceneSegmentsAction.java index 224c5e5af5084..03fc7f428222d 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/RemoveCorruptedLuceneSegmentsAction.java +++ b/server/src/main/java/org/elasticsearch/index/shard/RemoveCorruptedLuceneSegmentsAction.java @@ -22,7 +22,7 @@ */ public class RemoveCorruptedLuceneSegmentsAction { - public Tuple getCleanStatus( + public static Tuple getCleanStatus( Directory indexDirectory, Lock writeLock, PrintStream printStream, @@ -58,7 +58,7 @@ public Tuple getCleanStatus } } - public void execute(Terminal terminal, Directory indexDirectory, Lock writeLock, PrintStream printStream, boolean verbose) + public static void execute(Terminal terminal, Directory indexDirectory, Lock writeLock, PrintStream printStream, boolean verbose) throws IOException { final CheckIndex.Status status; try (CheckIndex checker = new CheckIndex(indexDirectory, writeLock)) { diff --git a/server/src/main/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommand.java b/server/src/main/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommand.java index 619144ca5d1ec..a08874db8bab3 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommand.java +++ b/server/src/main/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommand.java @@ -71,9 +71,6 @@ public class RemoveCorruptedShardDataCommand extends ElasticsearchNodeCommand { private final OptionSpec shardIdOption; static final String TRUNCATE_CLEAN_TRANSLOG_FLAG = "truncate-clean-translog"; - private final RemoveCorruptedLuceneSegmentsAction removeCorruptedLuceneSegmentsAction; - private final TruncateTranslogAction truncateTranslogAction; - public RemoveCorruptedShardDataCommand() { super("Removes corrupted shard files"); @@ -84,9 +81,6 @@ public RemoveCorruptedShardDataCommand() { shardIdOption = parser.accepts("shard-id", "Shard id").withRequiredArg().ofType(Integer.class); parser.accepts(TRUNCATE_CLEAN_TRANSLOG_FLAG, "Truncate the translog even if it is not corrupt"); - - removeCorruptedLuceneSegmentsAction = new RemoveCorruptedLuceneSegmentsAction(); - truncateTranslogAction = new TruncateTranslogAction(namedXContentRegistry); } @Override @@ -100,7 +94,7 @@ public OptionParser getParser() { } @SuppressForbidden(reason = "Necessary to use the path passed in") - protected Path getPath(String dirValue) { + protected static Path getPath(String dirValue) { return PathUtils.get(dirValue, "", ""); } @@ -195,7 +189,7 @@ public static boolean isCorruptMarkerFileIsPresent(final Directory directory) th return found; } - protected void dropCorruptMarkerFiles(Terminal terminal, Path path, Directory directory, boolean clean) throws IOException { + protected static void dropCorruptMarkerFiles(Terminal terminal, Path path, Directory directory, boolean clean) throws IOException { if (clean) { confirm(""" This shard has been marked as corrupted but no corruption can now be detected. @@ -230,7 +224,7 @@ private static void confirm(String msg, Terminal terminal) { } } - private void warnAboutIndexBackup(Terminal terminal) { + private static void warnAboutIndexBackup(Terminal terminal) { terminal.println("-----------------------------------------------------------------------"); terminal.println(""); terminal.println(" Please make a complete backup of your index before using this tool."); @@ -276,7 +270,7 @@ public void write(int b) { terminal.println("Opening Lucene index at " + indexPath); terminal.println(""); try { - indexCleanStatus = removeCorruptedLuceneSegmentsAction.getCleanStatus( + indexCleanStatus = RemoveCorruptedLuceneSegmentsAction.getCleanStatus( indexDir, writeIndexLock, printStream, @@ -303,7 +297,7 @@ public void write(int b) { terminal.println("Opening translog at " + translogPath); terminal.println(""); try { - translogCleanStatus = truncateTranslogAction.getCleanStatus(shardPath, clusterState, indexDir); + translogCleanStatus = TruncateTranslogAction.getCleanStatus(shardPath, clusterState, indexDir); } catch (Exception e) { terminal.println(e.getMessage()); throw e; @@ -355,11 +349,11 @@ public void write(int b) { confirm("Continue and remove corrupted data from the shard ?", terminal); if (indexStatus != CleanStatus.CLEAN) { - removeCorruptedLuceneSegmentsAction.execute(terminal, indexDir, writeIndexLock, printStream, verbose); + RemoveCorruptedLuceneSegmentsAction.execute(terminal, indexDir, writeIndexLock, printStream, verbose); } if (translogStatus != CleanStatus.CLEAN) { - truncateTranslogAction.execute(terminal, shardPath, indexDir); + TruncateTranslogAction.execute(terminal, shardPath, indexDir); } } catch (LockObtainFailedException lofe) { final String msg = "Failed to lock shard's directory at [" + indexPath + "], is Elasticsearch still running?"; @@ -380,7 +374,7 @@ public void write(int b) { }); } - private Directory getDirectory(Path indexPath) { + private static Directory getDirectory(Path indexPath) { Directory directory; try { directory = FSDirectory.open(indexPath, NativeFSLockFactory.INSTANCE); @@ -390,7 +384,8 @@ private Directory getDirectory(Path indexPath) { return directory; } - protected void addNewHistoryCommit(Directory indexDirectory, Terminal terminal, boolean updateLocalCheckpoint) throws IOException { + protected static void addNewHistoryCommit(Directory indexDirectory, Terminal terminal, boolean updateLocalCheckpoint) + throws IOException { final String historyUUID = UUIDs.randomBase64UUID(); terminal.println("Marking index with the new history uuid : " + historyUUID); @@ -423,7 +418,7 @@ protected void addNewHistoryCommit(Directory indexDirectory, Terminal terminal, } } - private void newAllocationId(ShardPath shardPath, Terminal terminal) throws IOException { + private static void newAllocationId(ShardPath shardPath, Terminal terminal) throws IOException { final Path shardStatePath = shardPath.getShardStatePath(); final ShardStateMetadata shardStateMetadata = ShardStateMetadata.FORMAT.loadLatestState( logger, @@ -453,7 +448,7 @@ private void newAllocationId(ShardPath shardPath, Terminal terminal) throws IOEx printRerouteCommand(shardPath, terminal, true); } - private void printRerouteCommand(ShardPath shardPath, Terminal terminal, boolean allocateStale) throws IOException { + private static void printRerouteCommand(ShardPath shardPath, Terminal terminal, boolean allocateStale) throws IOException { final Path nodePath = getNodePath(shardPath); final NodeMetadata nodeMetadata = PersistedClusterStateService.nodeMetadata(nodePath); @@ -477,7 +472,7 @@ private void printRerouteCommand(ShardPath shardPath, Terminal terminal, boolean terminal.println(""); } - private Path getNodePath(ShardPath shardPath) { + private static Path getNodePath(ShardPath shardPath) { final Path nodePath = shardPath.getDataPath().getParent().getParent().getParent(); if (Files.exists(nodePath) == false || Files.exists(nodePath.resolve(PersistedClusterStateService.METADATA_DIRECTORY_NAME)) == false) { diff --git a/server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java b/server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java index df95df33f71c6..84e8e3e521f8c 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java +++ b/server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java @@ -154,7 +154,7 @@ public boolean isCacheable(LeafReaderContext ctx) { }; } - private void markChildDocs(BitSet parentDocs, BitSet matchingDocs) { + private static void markChildDocs(BitSet parentDocs, BitSet matchingDocs) { int currentDeleted = 0; while (currentDeleted < matchingDocs.length() && (currentDeleted = matchingDocs.nextSetBit(currentDeleted)) != DocIdSetIterator.NO_MORE_DOCS) { diff --git a/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java b/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java index 3f13ad6997bef..73c87fcacf5a1 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java +++ b/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java @@ -154,7 +154,7 @@ void recoverFromLocalShards( } } - void addIndices( + static void addIndices( final RecoveryState.Index indexRecoveryStats, final Directory target, final Sort indexSort, @@ -475,7 +475,7 @@ private static void writeEmptyRetentionLeasesFile(IndexShard indexShard) throws assert indexShard.loadRetentionLeases().leases().isEmpty(); } - private void addRecoveredFileDetails(SegmentInfos si, Store store, RecoveryState.Index index) throws IOException { + private static void addRecoveredFileDetails(SegmentInfos si, Store store, RecoveryState.Index index) throws IOException { final Directory directory = store.directory(); for (String name : Lucene.files(si)) { long length = directory.fileLength(name); diff --git a/server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java b/server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java index b5fcd92763dc0..84490c9766e5a 100644 --- a/server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java +++ b/server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java @@ -130,7 +130,7 @@ public void close() throws IOException { IOUtils.close(super::close, delegate); } - boolean useDelegate(String name, IOContext ioContext) { + static boolean useDelegate(String name, IOContext ioContext) { if (ioContext == Store.READONCE_CHECKSUM) { // If we're just reading the footer for the checksum then mmap() isn't really necessary, and it's desperately inefficient // if pre-loading is enabled on this file. diff --git a/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogAction.java b/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogAction.java index 93ea6fa467a2f..831cc374cee22 100644 --- a/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogAction.java +++ b/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogAction.java @@ -52,7 +52,7 @@ public TruncateTranslogAction(NamedXContentRegistry namedXContentRegistry) { this.namedXContentRegistry = namedXContentRegistry; } - public Tuple getCleanStatus( + public static Tuple getCleanStatus( ShardPath shardPath, ClusterState clusterState, Directory indexDirectory @@ -94,7 +94,7 @@ public Tuple getCleanStatus return Tuple.tuple(RemoveCorruptedShardDataCommand.CleanStatus.CORRUPTED, details); } - public void execute(Terminal terminal, ShardPath shardPath, Directory indexDirectory) throws IOException { + public static void execute(Terminal terminal, ShardPath shardPath, Directory indexDirectory) throws IOException { final Path indexPath = shardPath.resolveIndex(); final Path translogPath = shardPath.resolveTranslog(); @@ -154,7 +154,7 @@ public void execute(Terminal terminal, ShardPath shardPath, Directory indexDirec IOUtils.fsync(translogPath, true); } - private boolean isTranslogClean(ShardPath shardPath, ClusterState clusterState, String translogUUID) throws IOException { + private static boolean isTranslogClean(ShardPath shardPath, ClusterState clusterState, String translogUUID) throws IOException { // perform clean check of translog instead of corrupted marker file try { final Path translogPath = shardPath.resolveTranslog(); @@ -221,7 +221,7 @@ private static int writeEmptyTranslog(Path filename, String translogUUID) throws } /** Show a warning about deleting files, asking for a confirmation if {@code batchMode} is false */ - private String deletingFilesDetails(Path translogPath, Set files) { + private static String deletingFilesDetails(Path translogPath, Set files) { StringBuilder builder = new StringBuilder(); builder.append("Documents inside of translog files will be lost.\n") diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java b/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java index 85c41113df6c5..069f1c2703997 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java @@ -242,7 +242,7 @@ public String toString() { } } - private boolean empty(Stats stats) { + private static boolean empty(Stats stats) { if (stats == null) { return true; } diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java index 28e218516ee60..af8ba2317837c 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -462,7 +462,7 @@ public NodeIndicesStats stats(CommonStatsFlags flags) { return new NodeIndicesStats(commonStats, statsByShard(this, flags)); } - Map> statsByShard(final IndicesService indicesService, final CommonStatsFlags flags) { + static Map> statsByShard(final IndicesService indicesService, final CommonStatsFlags flags) { final Map> statsByShard = new HashMap<>(); for (final IndexService indexService : indicesService) { @@ -1449,7 +1449,7 @@ public void close() { /** * Can the shard request be cached at all? */ - public boolean canCache(ShardSearchRequest request, SearchContext context) { + public static boolean canCache(ShardSearchRequest request, SearchContext context) { // Queries that create a scroll context cannot use the cache. // They modify the search context during their execution so using the cache // may invalidate the scroll for the next query. @@ -1501,7 +1501,7 @@ public boolean canCache(ShardSearchRequest request, SearchContext context) { * to have a single load operation that will cause other requests with the same key to wait till its loaded an reuse * the same cache. */ - public void loadIntoContext(ShardSearchRequest request, SearchContext context, QueryPhase queryPhase) throws Exception { + public void loadIntoContext(ShardSearchRequest request, SearchContext context) throws Exception { assert canCache(request, context); final DirectoryReader directoryReader = context.searcher().getDirectoryReader(); @@ -1513,7 +1513,7 @@ public void loadIntoContext(ShardSearchRequest request, SearchContext context, Q directoryReader, cacheKey, out -> { - queryPhase.execute(context); + QueryPhase.execute(context); context.queryResult().writeToNoId(out); loadedFromCache[0] = false; } diff --git a/server/src/main/java/org/elasticsearch/indices/ShardLimitValidator.java b/server/src/main/java/org/elasticsearch/indices/ShardLimitValidator.java index 54565386611ac..501bdd7a9e0af 100644 --- a/server/src/main/java/org/elasticsearch/indices/ShardLimitValidator.java +++ b/server/src/main/java/org/elasticsearch/indices/ShardLimitValidator.java @@ -162,7 +162,7 @@ public void validateShardLimitOnReplicaUpdate(ClusterState currentState, Index[] } } - private int getTotalNewShards(Index index, ClusterState currentState, int updatedNumberOfReplicas) { + private static int getTotalNewShards(Index index, ClusterState currentState, int updatedNumberOfReplicas) { IndexMetadata indexMetadata = currentState.metadata().index(index); int shardsInIndex = indexMetadata.getNumberOfShards(); int oldNumberOfReplicas = indexMetadata.getNumberOfReplicas(); diff --git a/server/src/main/java/org/elasticsearch/indices/SystemIndexManager.java b/server/src/main/java/org/elasticsearch/indices/SystemIndexManager.java index b3349c5872ef0..737332f9e9faf 100644 --- a/server/src/main/java/org/elasticsearch/indices/SystemIndexManager.java +++ b/server/src/main/java/org/elasticsearch/indices/SystemIndexManager.java @@ -158,7 +158,7 @@ enum UpgradeStatus { * @param descriptor information about the system index to check * @return a value that indicates the index's state. */ - UpgradeStatus getUpgradeStatus(ClusterState clusterState, SystemIndexDescriptor descriptor) { + static UpgradeStatus getUpgradeStatus(ClusterState clusterState, SystemIndexDescriptor descriptor) { final State indexState = calculateIndexState(clusterState, descriptor); final String indexDescription = "[" + descriptor.getPrimaryIndex() + "] (alias [" + descriptor.getAliasName() + "])"; @@ -235,7 +235,7 @@ public void onFailure(Exception e) { * @param descriptor the system index to check * @return a summary of the index state, or null if the index doesn't exist */ - State calculateIndexState(ClusterState state, SystemIndexDescriptor descriptor) { + static State calculateIndexState(ClusterState state, SystemIndexDescriptor descriptor) { final IndexMetadata indexMetadata = state.metadata().index(descriptor.getPrimaryIndex()); if (indexMetadata == null) { @@ -269,7 +269,7 @@ State calculateIndexState(ClusterState state, SystemIndexDescriptor descriptor) * Checks whether an index's mappings are up-to-date. If an index is encountered that has * a version higher than Version.CURRENT, it is still considered up-to-date. */ - private boolean checkIndexMappingUpToDate(SystemIndexDescriptor descriptor, IndexMetadata indexMetadata) { + private static boolean checkIndexMappingUpToDate(SystemIndexDescriptor descriptor, IndexMetadata indexMetadata) { final MappingMetadata mappingMetadata = indexMetadata.mapping(); if (mappingMetadata == null) { return false; @@ -281,7 +281,7 @@ private boolean checkIndexMappingUpToDate(SystemIndexDescriptor descriptor, Inde /** * Fetches the mapping version from an index's mapping's `_meta` info. */ - private Version readMappingVersion(SystemIndexDescriptor descriptor, MappingMetadata mappingMetadata) { + private static Version readMappingVersion(SystemIndexDescriptor descriptor, MappingMetadata mappingMetadata) { final String indexName = descriptor.getPrimaryIndex(); try { @SuppressWarnings("unchecked") diff --git a/server/src/main/java/org/elasticsearch/indices/SystemIndices.java b/server/src/main/java/org/elasticsearch/indices/SystemIndices.java index b6ad87f7b2661..bf723d4b6179d 100644 --- a/server/src/main/java/org/elasticsearch/indices/SystemIndices.java +++ b/server/src/main/java/org/elasticsearch/indices/SystemIndices.java @@ -428,14 +428,14 @@ public SystemDataStreamDescriptor validateDataStreamAccess(String dataStreamName } } - public IllegalArgumentException dataStreamAccessException(ThreadContext threadContext, Collection names) { + public static IllegalArgumentException dataStreamAccessException(ThreadContext threadContext, Collection names) { return dataStreamAccessException( threadContext.getHeader(EXTERNAL_SYSTEM_INDEX_ACCESS_CONTROL_HEADER_KEY), names.toArray(Strings.EMPTY_ARRAY) ); } - public IllegalArgumentException netNewSystemIndexAccessException(ThreadContext threadContext, Collection names) { + public static IllegalArgumentException netNewSystemIndexAccessException(ThreadContext threadContext, Collection names) { final String product = threadContext.getHeader(EXTERNAL_SYSTEM_INDEX_ACCESS_CONTROL_HEADER_KEY); if (product == null) { return new IllegalArgumentException( @@ -448,7 +448,7 @@ public IllegalArgumentException netNewSystemIndexAccessException(ThreadContext t } } - IllegalArgumentException dataStreamAccessException(@Nullable String product, String... dataStreamNames) { + static IllegalArgumentException dataStreamAccessException(@Nullable String product, String... dataStreamNames) { if (product == null) { return new IllegalArgumentException( "Data stream(s) " + Arrays.toString(dataStreamNames) + " use and access is reserved for system operations" @@ -468,7 +468,7 @@ IllegalArgumentException dataStreamAccessException(@Nullable String product, Str * {@link SystemIndexAccessLevel#RESTRICTED} if a subset of system index access should be allowed, or * {@link SystemIndexAccessLevel#NONE} if no system index access should be allowed. */ - public SystemIndexAccessLevel getSystemIndexAccessLevel(ThreadContext threadContext) { + public static SystemIndexAccessLevel getSystemIndexAccessLevel(ThreadContext threadContext) { // This method intentionally cannot return BACKWARDS_COMPATIBLE_ONLY - that access level should only be used manually // in known special cases. final String headerValue = threadContext.getHeader(SYSTEM_INDEX_ACCESS_CONTROL_HEADER_KEY); diff --git a/server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java b/server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java index 865617e1ddb7a..a46aeed7fb17f 100644 --- a/server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java +++ b/server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java @@ -104,19 +104,19 @@ public AnalysisRegistry getAnalysisRegistry() { return analysisRegistry; } - private NamedRegistry> setupCharFilters(List plugins) { + private static NamedRegistry> setupCharFilters(List plugins) { NamedRegistry> charFilters = new NamedRegistry<>("char_filter"); charFilters.extractAndRegister(plugins, AnalysisPlugin::getCharFilters); return charFilters; } - public NamedRegistry setupHunspellDictionaries(List plugins) { + public static NamedRegistry setupHunspellDictionaries(List plugins) { NamedRegistry hunspellDictionaries = new NamedRegistry<>("dictionary"); hunspellDictionaries.extractAndRegister(plugins, AnalysisPlugin::getHunspellDictionaries); return hunspellDictionaries; } - private NamedRegistry> setupTokenFilters( + private static NamedRegistry> setupTokenFilters( List plugins, HunspellService hunspellService ) { @@ -241,14 +241,14 @@ static Map setupPreConfiguredTokenizers(List> setupTokenizers(List plugins) { + private static NamedRegistry> setupTokenizers(List plugins) { NamedRegistry> tokenizers = new NamedRegistry<>("tokenizer"); tokenizers.register("standard", StandardTokenizerFactory::new); tokenizers.extractAndRegister(plugins, AnalysisPlugin::getTokenizers); return tokenizers; } - private NamedRegistry>> setupAnalyzers(List plugins) { + private static NamedRegistry>> setupAnalyzers(List plugins) { NamedRegistry>> analyzers = new NamedRegistry<>("analyzer"); analyzers.register("default", StandardAnalyzerProvider::new); analyzers.register("standard", StandardAnalyzerProvider::new); @@ -260,7 +260,7 @@ private NamedRegistry>> setupAnalyzers(List return analyzers; } - private NamedRegistry>> setupNormalizers(List plugins) { + private static NamedRegistry>> setupNormalizers(List plugins) { NamedRegistry>> normalizers = new NamedRegistry<>("normalizer"); normalizers.register("lowercase", LowercaseNormalizerProvider::new); // TODO: pluggability? diff --git a/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java b/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java index 40eab9404eb79..4efa7f13b664f 100644 --- a/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java +++ b/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java @@ -119,7 +119,7 @@ public Dictionary getDictionary(String locale) { return dictionary; } - private Path resolveHunspellDirectory(Environment env) { + private static Path resolveHunspellDirectory(Environment env) { return env.configFile().resolve("hunspell"); } diff --git a/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java index ad4ad4546d67a..4e6a88e53b8d3 100644 --- a/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java +++ b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java @@ -26,7 +26,7 @@ protected Tokenizer create(Version version) { protected abstract Tokenizer create(Version version); - protected TokenFilterFactory getMultiTermComponent(Version version) { + protected static TokenFilterFactory getMultiTermComponent(Version version) { return null; } diff --git a/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java index a7ecc050fc40f..27f71855f9553 100644 --- a/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java +++ b/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java @@ -218,7 +218,7 @@ public HierarchyCircuitBreakerService(Settings settings, List c clusterSettings.addSettingsUpdateConsumer( TOTAL_CIRCUIT_BREAKER_LIMIT_SETTING, this::setTotalCircuitBreakerLimit, - this::validateTotalCircuitBreakerLimit + HierarchyCircuitBreakerService::validateTotalCircuitBreakerLimit ); clusterSettings.addSettingsUpdateConsumer( FIELDDATA_CIRCUIT_BREAKER_LIMIT_SETTING, @@ -255,7 +255,7 @@ private void updateCircuitBreakerSettings(String name, ByteSizeValue newLimit, D } } - private void validateTotalCircuitBreakerLimit(ByteSizeValue byteSizeValue) { + private static void validateTotalCircuitBreakerLimit(ByteSizeValue byteSizeValue) { BreakerSettings newParentSettings = new BreakerSettings( CircuitBreaker.PARENT, byteSizeValue.getBytes(), diff --git a/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java index c0259619c5858..be8bb97689103 100644 --- a/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java +++ b/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java @@ -280,7 +280,7 @@ protected void updateGlobalCheckpointForShard(final ShardId shardId) { } // overrideable by tests - Logger getLogger() { + static Logger getLogger() { return logger; } diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java index 102a122c90020..440ca1486a2ed 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java @@ -608,7 +608,7 @@ public void messageReceived(final RecoverySnapshotFileRequest request, Transport } } - private ActionListener createOrFinishListener( + private static ActionListener createOrFinishListener( final RecoveryRef recoveryRef, final TransportChannel channel, final String action, @@ -618,7 +618,7 @@ private ActionListener createOrFinishListener( } @Nullable - private ActionListener createOrFinishListener( + private static ActionListener createOrFinishListener( final RecoveryRef recoveryRef, final TransportChannel channel, final String action, diff --git a/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java index abe1017ace558..5bf6860cc7900 100644 --- a/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java +++ b/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java @@ -398,7 +398,7 @@ public void sendResult(boolean shardActive) { } } - private boolean shardActive(IndexShard indexShard) { + private static boolean shardActive(IndexShard indexShard) { if (indexShard != null) { return ACTIVE_STATES.contains(indexShard.state()); } diff --git a/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java b/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java index 3addd991baa20..322adad81f2b5 100644 --- a/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java +++ b/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java @@ -208,7 +208,7 @@ void executeOnFailureAsync( }); } - private void putFailureMetadata(IngestDocument ingestDocument, ElasticsearchException cause) { + private static void putFailureMetadata(IngestDocument ingestDocument, ElasticsearchException cause) { List processorTypeHeader = cause.getHeader("processor_type"); List processorTagHeader = cause.getHeader("processor_tag"); List processorOriginHeader = cause.getHeader("pipeline_origin"); @@ -224,7 +224,7 @@ private void putFailureMetadata(IngestDocument ingestDocument, ElasticsearchExce } } - private void removeFailureMetadata(IngestDocument ingestDocument) { + private static void removeFailureMetadata(IngestDocument ingestDocument) { Map ingestMetadata = ingestDocument.getIngestMetadata(); ingestMetadata.remove(ON_FAILURE_MESSAGE_FIELD); ingestMetadata.remove(ON_FAILURE_PROCESSOR_TYPE_FIELD); diff --git a/server/src/main/java/org/elasticsearch/lucene/queries/BlendedTermQuery.java b/server/src/main/java/org/elasticsearch/lucene/queries/BlendedTermQuery.java index d06d475503fad..a57feef2f9b23 100644 --- a/server/src/main/java/org/elasticsearch/lucene/queries/BlendedTermQuery.java +++ b/server/src/main/java/org/elasticsearch/lucene/queries/BlendedTermQuery.java @@ -162,7 +162,7 @@ protected int compare(int i, int j) { } } - private TermStates adjustTTF(IndexReaderContext readerContext, TermStates termContext, long sumTTF) throws IOException { + private static TermStates adjustTTF(IndexReaderContext readerContext, TermStates termContext, long sumTTF) throws IOException { assert termContext.wasBuiltFor(readerContext); TermStates newTermContext = new TermStates(readerContext); List leaves = readerContext.leaves(); @@ -246,7 +246,7 @@ public void visit(QueryVisitor visitor) { visitor.getSubVisitor(BooleanClause.Occur.SHOULD, this).consumeTerms(this, terms); } - private class TermAndBoost implements Comparable { + private static class TermAndBoost implements Comparable { protected final Term term; protected float boost; diff --git a/server/src/main/java/org/elasticsearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java b/server/src/main/java/org/elasticsearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java index a000244f00e4e..443520ac47d55 100644 --- a/server/src/main/java/org/elasticsearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java +++ b/server/src/main/java/org/elasticsearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java @@ -220,7 +220,7 @@ protected Collection preSpanQueryRewrite(Query query) { /** * Translate custom queries in queries that are supported by the unified highlighter. */ - private Collection rewriteCustomQuery(Query query) { + private static Collection rewriteCustomQuery(Query query) { if (query instanceof MultiPhrasePrefixQuery mpq) { Term[][] terms = mpq.getTerms(); int[] positions = mpq.getPositions(); diff --git a/server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java b/server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java index 1b7ba960316a3..492b262e0d6e1 100644 --- a/server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java +++ b/server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java @@ -93,7 +93,7 @@ public ByteSizeValue getAvailable() { return new ByteSizeValue(available); } - private long addLong(long current, long other) { + private static long addLong(long current, long other) { if (current == -1 && other == -1) { return 0; } diff --git a/server/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java b/server/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java index 5bb2a7fb3212f..f8538d6aad31c 100644 --- a/server/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java +++ b/server/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java @@ -49,7 +49,7 @@ public Deadlock[] findDeadlocks() { return createDeadlockDescriptions(cycles); } - private Deadlock[] createDeadlockDescriptions(Set> cycles) { + private static Deadlock[] createDeadlockDescriptions(Set> cycles) { Deadlock result[] = new Deadlock[cycles.size()]; int count = 0; for (LinkedHashSet cycle : cycles) { @@ -60,7 +60,7 @@ private Deadlock[] createDeadlockDescriptions(Set> cyc return result; } - private Set> calculateCycles(Map threadInfoMap) { + private static Set> calculateCycles(Map threadInfoMap) { Set> cycles = new HashSet<>(); for (Map.Entry entry : threadInfoMap.entrySet()) { LinkedHashSet cycle = new LinkedHashSet<>(); diff --git a/server/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java b/server/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java index 73a5ff6b3d43a..630ff57059338 100644 --- a/server/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java +++ b/server/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java @@ -223,7 +223,7 @@ ThreadInfo[][] captureThreadStacks(ThreadMXBean threadBean, long[] threadIds) th return result; } - private boolean isThreadWaitBlockTimeMonitoringEnabled(ThreadMXBean threadBean) { + private static boolean isThreadWaitBlockTimeMonitoringEnabled(ThreadMXBean threadBean) { if (threadBean.isThreadContentionMonitoringSupported()) { return threadBean.isThreadContentionMonitoringEnabled(); } @@ -401,7 +401,7 @@ String innerDetect(ThreadMXBean threadBean, SunThreadInfo sunThreadInfo, long cu return sb.toString(); } - int similarity(ThreadInfo threadInfo, ThreadInfo threadInfo0) { + static int similarity(ThreadInfo threadInfo, ThreadInfo threadInfo0) { StackTraceElement[] s1 = threadInfo == null ? EMPTY : threadInfo.getStackTrace(); StackTraceElement[] s2 = threadInfo0 == null ? EMPTY : threadInfo0.getStackTrace(); int i = s1.length - 1; @@ -433,7 +433,7 @@ static class ThreadTimeAccumulator { this.interval = interval; } - private long millisecondsToNanos(long millis) { + private static long millisecondsToNanos(long millis) { return millis * 1_000_000; } diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java b/server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java index 6839baa6f3ff2..fc0de10b75aaf 100644 --- a/server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java +++ b/server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java @@ -252,7 +252,7 @@ String readProcLoadavg() throws IOException { return readSingleLine(PathUtils.get("/proc/loadavg")); } - public short getSystemCpuPercent() { + public static short getSystemCpuPercent() { return Probes.getLoadAndScaleToPercent(getSystemCpuLoad, osMxBean); } @@ -263,7 +263,7 @@ public short getSystemCpuPercent() { * @return the single line * @throws IOException if an I/O exception occurs reading the file */ - private String readSingleLine(final Path path) throws IOException { + private static String readSingleLine(final Path path) throws IOException { final List lines = Files.readAllLines(path); assert lines.size() == 1 : String.join("\n", lines); return lines.get(0); diff --git a/server/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java index a0eb5715e2341..d5917231ba583 100644 --- a/server/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java +++ b/server/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java @@ -48,7 +48,7 @@ private ProcessProbe() {} /** * Returns the maximum number of file descriptors allowed on the system, or -1 if not supported. */ - public long getMaxFileDescriptorCount() { + public static long getMaxFileDescriptorCount() { if (getMaxFileDescriptorCountField == null) { return -1; } @@ -62,7 +62,7 @@ public long getMaxFileDescriptorCount() { /** * Returns the number of opened file descriptors associated with the current process, or -1 if not supported. */ - public long getOpenFileDescriptorCount() { + public static long getOpenFileDescriptorCount() { if (getOpenFileDescriptorCountField == null) { return -1; } @@ -76,14 +76,14 @@ public long getOpenFileDescriptorCount() { /** * Returns the process CPU usage in percent */ - public short getProcessCpuPercent() { + public static short getProcessCpuPercent() { return Probes.getLoadAndScaleToPercent(getProcessCpuLoad, osMxBean); } /** * Returns the CPU time (in milliseconds) used by the process on which the Java virtual machine is running, or -1 if not supported. */ - public long getProcessCpuTotalTime() { + public static long getProcessCpuTotalTime() { if (getProcessCpuTime != null) { try { long time = (long) getProcessCpuTime.invoke(osMxBean); @@ -100,7 +100,7 @@ public long getProcessCpuTotalTime() { /** * Returns the size (in bytes) of virtual memory that is guaranteed to be available to the running process */ - public long getTotalVirtualMemorySize() { + public static long getTotalVirtualMemorySize() { if (getCommittedVirtualMemorySize != null) { try { long virtual = (long) getCommittedVirtualMemorySize.invoke(osMxBean); @@ -114,11 +114,11 @@ public long getTotalVirtualMemorySize() { return -1; } - public ProcessInfo processInfo(long refreshInterval) { + public static ProcessInfo processInfo(long refreshInterval) { return new ProcessInfo(jvmInfo().pid(), BootstrapInfo.isMemoryLocked(), refreshInterval); } - public ProcessStats processStats() { + public static ProcessStats processStats() { ProcessStats.Cpu cpu = new ProcessStats.Cpu(getProcessCpuPercent(), getProcessCpuTotalTime()); ProcessStats.Mem mem = new ProcessStats.Mem(getTotalVirtualMemorySize()); return new ProcessStats(System.currentTimeMillis(), getOpenFileDescriptorCount(), getMaxFileDescriptorCount(), cpu, mem); diff --git a/server/src/main/java/org/elasticsearch/monitor/process/ProcessService.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessService.java index 839380d42d22b..765df588232e8 100644 --- a/server/src/main/java/org/elasticsearch/monitor/process/ProcessService.java +++ b/server/src/main/java/org/elasticsearch/monitor/process/ProcessService.java @@ -21,7 +21,6 @@ public final class ProcessService implements ReportingService { private static final Logger logger = LogManager.getLogger(ProcessService.class); - private final ProcessProbe probe; private final ProcessInfo info; private final SingleObjectCache processStatsCache; @@ -33,10 +32,9 @@ public final class ProcessService implements ReportingService { ); public ProcessService(Settings settings) { - this.probe = ProcessProbe.getInstance(); final TimeValue refreshInterval = REFRESH_INTERVAL_SETTING.get(settings); - processStatsCache = new ProcessStatsCache(refreshInterval, probe.processStats()); - this.info = probe.processInfo(refreshInterval.millis()); + processStatsCache = new ProcessStatsCache(refreshInterval, ProcessProbe.processStats()); + this.info = ProcessProbe.processInfo(refreshInterval.millis()); logger.debug("using refresh_interval [{}]", refreshInterval); } @@ -49,14 +47,14 @@ public ProcessStats stats() { return processStatsCache.getOrRefresh(); } - private class ProcessStatsCache extends SingleObjectCache { + private static class ProcessStatsCache extends SingleObjectCache { ProcessStatsCache(TimeValue interval, ProcessStats initValue) { super(interval, initValue); } @Override protected ProcessStats refresh() { - return probe.processStats(); + return ProcessProbe.processStats(); } } } diff --git a/server/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java index f0c70796fcb93..a741fd853565b 100644 --- a/server/src/main/java/org/elasticsearch/node/Node.java +++ b/server/src/main/java/org/elasticsearch/node/Node.java @@ -458,7 +458,7 @@ protected Node( additionalSettingsFilter, settingsUpgraders ); - scriptModule.registerClusterSettingsListeners(scriptService, settingsModule.getClusterSettings()); + ScriptModule.registerClusterSettingsListeners(scriptService, settingsModule.getClusterSettings()); final NetworkService networkService = new NetworkService( getCustomNameResolvers(pluginsService.filterPlugins(DiscoveryPlugin.class)) ); diff --git a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java index d284a39d2b19c..8684fab52027c 100644 --- a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java +++ b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksClusterService.java @@ -455,7 +455,7 @@ boolean shouldReassignPersistentTasks(final ClusterChangedEvent event) { /** * Returns true if any persistent task is unassigned. */ - private boolean isAnyTaskUnassigned(final PersistentTasksCustomMetadata tasks) { + private static boolean isAnyTaskUnassigned(final PersistentTasksCustomMetadata tasks) { return tasks != null && tasks.tasks().stream().anyMatch(task -> task.getAssignment().isAssigned() == false); } diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginsService.java b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java index fa08c74035b21..2d50f20979137 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginsService.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java @@ -726,7 +726,7 @@ static void reloadLuceneSPI(ClassLoader loader) { Codec.reloadCodecs(loader); } - private Class loadPluginClass(String className, ClassLoader loader) { + private static Class loadPluginClass(String className, ClassLoader loader) { try { return Class.forName(className, false, loader).asSubclass(Plugin.class); } catch (ClassNotFoundException e) { @@ -734,7 +734,7 @@ private Class loadPluginClass(String className, ClassLoader lo } } - private Plugin loadPlugin(Class pluginClass, Settings settings, Path configPath) { + private static Plugin loadPlugin(Class pluginClass, Settings settings, Path configPath) { final Constructor[] constructors = pluginClass.getConstructors(); if (constructors.length == 0) { throw new IllegalStateException("no public constructor for [" + pluginClass.getName() + "]"); @@ -765,7 +765,7 @@ private Plugin loadPlugin(Class pluginClass, Settings settings } } - private String signatureMessage(final Class clazz) { + private static String signatureMessage(final Class clazz) { return String.format( Locale.ROOT, "no public constructor of correct signature for [%s]; must be [%s], [%s], or [%s]", diff --git a/server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java index 76079c4eee61c..84b628d1ecc2f 100644 --- a/server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java +++ b/server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java @@ -148,7 +148,7 @@ public void registerRepository(final PutRepositoryRequest request, final ActionL // Trying to create the new repository on master to make sure it works try { - closeRepository(createRepository(newRepositoryMetadata, typesRegistry, this::throwRepositoryTypeDoesNotExists)); + closeRepository(createRepository(newRepositoryMetadata, typesRegistry, RepositoriesService::throwRepositoryTypeDoesNotExists)); } catch (Exception e) { listener.onFailure(e); return; @@ -506,7 +506,11 @@ public void applyClusterState(ClusterChangedEvent event) { archiveRepositoryStats(repository, state.version()); repository = null; try { - repository = createRepository(repositoryMetadata, typesRegistry, this::createUnknownTypeRepository); + repository = createRepository( + repositoryMetadata, + typesRegistry, + RepositoriesService::createUnknownTypeRepository + ); } catch (RepositoryException ex) { // TODO: this catch is bogus, it means the old repo is already closed, // but we have nothing to replace it @@ -515,7 +519,7 @@ public void applyClusterState(ClusterChangedEvent event) { } } else { try { - repository = createRepository(repositoryMetadata, typesRegistry, this::createUnknownTypeRepository); + repository = createRepository(repositoryMetadata, typesRegistry, RepositoriesService::createUnknownTypeRepository); } catch (RepositoryException ex) { logger.warn(() -> new ParameterizedMessage("failed to create repository [{}]", repositoryMetadata.name()), ex); } @@ -535,7 +539,7 @@ public void applyClusterState(ClusterChangedEvent event) { } } - private boolean canUpdateInPlace(RepositoryMetadata updatedMetadata, Repository repository) { + private static boolean canUpdateInPlace(RepositoryMetadata updatedMetadata, Repository repository) { assert updatedMetadata.name().equals(repository.getMetadata().name()); return repository.getMetadata().type().equals(updatedMetadata.type()) && repository.canUpdateInPlace(updatedMetadata.settings(), Collections.emptySet()); @@ -608,7 +612,7 @@ public void registerInternalRepository(String name, String type) { RepositoryMetadata metadata = new RepositoryMetadata(name, type, Settings.EMPTY); Repository repository = internalRepositories.computeIfAbsent(name, (n) -> { logger.debug("put internal repository [{}][{}]", name, type); - return createRepository(metadata, internalTypesRegistry, this::throwRepositoryTypeDoesNotExists); + return createRepository(metadata, internalTypesRegistry, RepositoriesService::throwRepositoryTypeDoesNotExists); }); if (type.equals(repository.getMetadata().type()) == false) { logger.warn( @@ -646,7 +650,7 @@ public void unregisterInternalRepository(String name) { /** * Closes the given repository. */ - private void closeRepository(Repository repository) { + private static void closeRepository(Repository repository) { logger.debug("closing repository [{}][{}]", repository.getMetadata().type(), repository.getMetadata().name()); repository.close(); } @@ -663,7 +667,7 @@ private void archiveRepositoryStats(Repository repository, long clusterStateVers /** * Creates repository holder. This method starts the repository */ - private Repository createRepository( + private static Repository createRepository( RepositoryMetadata repositoryMetadata, Map factories, Function defaultFactory @@ -688,11 +692,11 @@ private Repository createRepository( } } - private Repository throwRepositoryTypeDoesNotExists(RepositoryMetadata repositoryMetadata) { + private static Repository throwRepositoryTypeDoesNotExists(RepositoryMetadata repositoryMetadata) { throw new RepositoryException(repositoryMetadata.name(), "repository type [" + repositoryMetadata.type() + "] does not exist"); } - private Repository createUnknownTypeRepository(RepositoryMetadata repositoryMetadata) { + private static Repository createUnknownTypeRepository(RepositoryMetadata repositoryMetadata) { logger.warn( "[{}] repository type [{}] is unknown; ensure that all required plugins are installed on this node", repositoryMetadata.name(), diff --git a/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java index 0a238e4f03b0a..08402eec53f32 100644 --- a/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java +++ b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java @@ -2017,7 +2017,7 @@ private RepositoryException corruptedStateException(@Nullable Exception cause, @ ); } - private String previousWriterMessage(@Nullable Tuple previousWriterInfo) { + private static String previousWriterMessage(@Nullable Tuple previousWriterInfo) { return previousWriterInfo == null ? "" : " The last cluster to write to this repository was [" diff --git a/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java b/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java index a27a4f286d087..7682662f611b4 100644 --- a/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java +++ b/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java @@ -108,7 +108,7 @@ public boolean mediaTypesValid(RestRequest request) { return request.getXContentType() != null; } - protected final String unrecognized( + protected static String unrecognized( final RestRequest request, final Set invalids, final Set candidates, diff --git a/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java b/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java index 6abe6b400f1a6..f4534974f3519 100644 --- a/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java +++ b/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java @@ -134,8 +134,13 @@ protected boolean skipStackTrace() { return false; } - private void build(XContentBuilder builder, ToXContent.Params params, RestStatus status, boolean detailedErrorsEnabled, Exception e) - throws IOException { + private static void build( + XContentBuilder builder, + ToXContent.Params params, + RestStatus status, + boolean detailedErrorsEnabled, + Exception e + ) throws IOException { builder.startObject(); ElasticsearchException.generateFailureXContent(builder, params, e, detailedErrorsEnabled); builder.field(STATUS, status.getStatus()); diff --git a/server/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java index a9e0ca22abe63..ebf8a02a6b16a 100644 --- a/server/src/main/java/org/elasticsearch/rest/RestController.java +++ b/server/src/main/java/org/elasticsearch/rest/RestController.java @@ -399,7 +399,7 @@ private void dispatchRequest(RestRequest request, RestChannel channel, RestHandl * see https://www.elastic.co/blog/strict-content-type-checking-for-elasticsearch-rest-requests * @param request */ - private boolean isContentTypeDisallowed(RestRequest request) { + private static boolean isContentTypeDisallowed(RestRequest request) { return request.getParsedContentType() != null && SAFELISTED_MEDIA_TYPES.contains(request.getParsedContentType().mediaTypeWithoutParameters()); } @@ -423,7 +423,7 @@ private boolean handleNoHandlerFound(String rawPath, RestRequest.Method method, return false; } - private void sendContentTypeErrorMessage(@Nullable List contentTypeHeader, RestChannel channel) throws IOException { + private static void sendContentTypeErrorMessage(@Nullable List contentTypeHeader, RestChannel channel) throws IOException { final String errorMessage; if (contentTypeHeader == null) { errorMessage = "Content-Type header is missing"; @@ -478,7 +478,7 @@ private void tryAllHandlers(final RestRequest request, final RestChannel channel handleBadRequest(uri, requestMethod, channel); } - private void validateErrorTrace(RestRequest request, RestChannel channel) { + private static void validateErrorTrace(RestRequest request, RestChannel channel) { // error_trace cannot be used when we disable detailed errors // we consume the error_trace parameter first to ensure that it is always consumed if (request.paramAsBoolean("error_trace", false) && channel.detailedErrorsEnabled() == false) { @@ -534,7 +534,7 @@ Iterator getAllHandlers(@Nullable Map requestPar * HTTP/1.1 - * 10.4.6 - 405 Method Not Allowed). */ - private void handleUnsupportedHttpMethod( + private static void handleUnsupportedHttpMethod( String uri, @Nullable RestRequest.Method method, final RestChannel channel, @@ -570,7 +570,7 @@ private void handleUnsupportedHttpMethod( * HTTP/1.1 - 9.2 * - Options). */ - private void handleOptionsRequest(RestChannel channel, Set validMethodSet) { + private static void handleOptionsRequest(RestChannel channel, Set validMethodSet) { BytesRestResponse bytesRestResponse = new BytesRestResponse(OK, TEXT_CONTENT_TYPE, BytesArray.EMPTY); // When we have an OPTIONS HTTP request and no valid handlers, simply send OK by default (with the Access Control Origin header // which gets automatically added). @@ -584,7 +584,7 @@ private void handleOptionsRequest(RestChannel channel, Set v * Handle a requests with no candidate handlers (return a 400 Bad Request * error). */ - private void handleBadRequest(String uri, RestRequest.Method method, RestChannel channel) throws IOException { + private static void handleBadRequest(String uri, RestRequest.Method method, RestChannel channel) throws IOException { try (XContentBuilder builder = channel.newErrorBuilder()) { builder.startObject(); { diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java index e52f1b31e21b6..edca13c69f87e 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java @@ -58,7 +58,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC } // default scope for testing types in mapping - CreateIndexRequest prepareRequestV7(RestRequest request) { + static CreateIndexRequest prepareRequestV7(RestRequest request) { CreateIndexRequest createIndexRequest = new CreateIndexRequest(request.param("index")); if (request.hasParam(INCLUDE_TYPE_NAME_PARAMETER)) { request.param(INCLUDE_TYPE_NAME_PARAMETER);// just consume, it is always replaced with _doc @@ -103,7 +103,7 @@ static Map prepareMappingsV7(Map source, RestReq } } - CreateIndexRequest prepareRequest(RestRequest request) { + static CreateIndexRequest prepareRequest(RestRequest request) { CreateIndexRequest createIndexRequest = new CreateIndexRequest(request.param("index")); if (request.hasContent()) { diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java index 251723ae19280..4e957053918bf 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java @@ -67,7 +67,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC } } - 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/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java index d1473bac4560a..a8b90878157ac 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java @@ -94,7 +94,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC return channel -> client.admin().indices().putMapping(putMappingRequest, new RestToXContentListener<>(channel)); } - private Map prepareV7Mappings(boolean includeTypeName, Map mappings) { + private static Map prepareV7Mappings(boolean includeTypeName, Map mappings) { if (includeTypeName && mappings != null && mappings.size() == 1) { String typeName = mappings.keySet().iterator().next(); if (Strings.hasText(typeName) == false) { diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java index f5c42ee694860..e4af061b05c35 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java @@ -54,7 +54,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC .rolloverIndex(rolloverIndexRequest, new RestToXContentListener<>(channel)); } - private boolean includeTypeName(RestRequest request) { + private static boolean includeTypeName(RestRequest request) { boolean includeTypeName = false; if (request.getRestApiVersion() == RestApiVersion.V_7) { if (request.hasParam(INCLUDE_TYPE_NAME_PARAMETER)) { diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java index 885ed45f5667a..12cdb5da2db4e 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java @@ -71,7 +71,7 @@ public RestResponse buildResponse(FlushResponse flushResponse, XContentBuilder b return new BytesRestResponse(restStatus, builder); } - private void buildSyncedFlushResponse(XContentBuilder builder, FlushResponse flushResponse) throws IOException { + private static void buildSyncedFlushResponse(XContentBuilder builder, FlushResponse flushResponse) throws IOException { builder.startObject("_shards"); builder.field("total", flushResponse.getTotalShards()); builder.field("successful", flushResponse.getSuccessfulShards()); diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java index 89282f7af6afb..38f38bc78f719 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java @@ -93,7 +93,8 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC }; } - private void handleException(final ValidateQueryRequest request, final String message, final RestChannel channel) throws IOException { + private static void handleException(final ValidateQueryRequest request, final String message, final RestChannel channel) + throws IOException { channel.sendResponse(buildErrorResponse(channel.newBuilder(), message, request.explain())); } diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatComponentTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatComponentTemplateAction.java index bf8c5cb708a35..0efbfef887642 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatComponentTemplateAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatComponentTemplateAction.java @@ -106,7 +106,7 @@ public Table buildTable(RestRequest request, ClusterStateResponse clusterStateRe return table; } - private Map> buildReverseIndexOnComposedOfToIndexName(Metadata metadata) { + private static Map> buildReverseIndexOnComposedOfToIndexName(Metadata metadata) { Map allTemplates = metadata.templatesV2(); Map> reverseIndex = new HashMap<>(); @@ -118,7 +118,7 @@ private Map> buildReverseIndexOnComposedOfToIndexName(Metada return reverseIndex; } - private int countMappingInTemplate(Template template) throws Exception { + private static int countMappingInTemplate(Template template) throws Exception { if (template.mappings() == null) { return 0; } @@ -146,7 +146,7 @@ private int countMappingInTemplate(Template template) throws Exception { return count; } - private int countSubAttributes(Object mapping) { + private static int countSubAttributes(Object mapping) { int count = 0; if (mapping instanceof List) { for (Object subObject : (List) mapping) { diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java index 4e3ebf3795ce4..2f4d80b9f7b0c 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java @@ -148,7 +148,7 @@ public void onResponse(final GetSettingsResponse getSettingsResponse) { * as it does not provide information for all existing indices (for example recovering * indices or non replicated closed indices are not reported in indices stats response). */ - private void sendGetSettingsRequest( + private static void sendGetSettingsRequest( final String[] indices, final IndicesOptions indicesOptions, final TimeValue masterNodeTimeout, @@ -164,7 +164,7 @@ private void sendGetSettingsRequest( client.admin().indices().getSettings(request, listener); } - private void sendClusterStateRequest( + private static void sendClusterStateRequest( final String[] indices, final IndicesOptions indicesOptions, final TimeValue masterNodeTimeout, @@ -180,7 +180,7 @@ private void sendClusterStateRequest( client.admin().cluster().state(request, listener); } - private void sendClusterHealthRequest( + private static void sendClusterHealthRequest( final String[] indices, final IndicesOptions indicesOptions, final TimeValue masterNodeTimeout, @@ -196,7 +196,7 @@ private void sendClusterHealthRequest( client.admin().cluster().health(request, listener); } - private void sendIndicesStatsRequest( + private static void sendIndicesStatsRequest( final String[] indices, final IndicesOptions indicesOptions, final boolean includeUnloadedSegments, diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java index 9fcc2e340b63a..5a968ae90c7d5 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java @@ -514,7 +514,7 @@ Table buildTable( * @param max The maximum number. * @return 0 if {@code max} is <= 0. Otherwise 100 * {@code used} / {@code max}. */ - private short calculatePercentage(long used, long max) { + private static short calculatePercentage(long used, long max) { return max <= 0 ? 0 : (short) ((100d * used) / max); } } diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java index 28a158dbcaa3f..9373a791d4111 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java +++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java @@ -416,7 +416,7 @@ static class TableIndexComparator implements Comparator { } @SuppressWarnings("unchecked") - private int compareCell(Object o1, Object o2) { + private static int compareCell(Object o1, Object o2) { if (o1 == null && o2 == null) { return 0; } else if (o1 == null) { diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java index 38529aa1f46de..d7def6f53ea19 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java @@ -119,7 +119,7 @@ protected Table getTableWithHeader(final RestRequest request) { private static final DateFormatter FORMATTER = DateFormatter.forPattern("HH:mm:ss").withZone(ZoneOffset.UTC); - private void buildRow(Table table, boolean fullId, boolean detailed, DiscoveryNodes discoveryNodes, TaskInfo taskInfo) { + private static void buildRow(Table table, boolean fullId, boolean detailed, DiscoveryNodes discoveryNodes, TaskInfo taskInfo) { table.startRow(); String nodeId = taskInfo.taskId().getNodeId(); DiscoveryNode node = discoveryNodes.get(nodeId); diff --git a/server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java index 33ffcbdbe0d7e..3cca678747606 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java @@ -109,7 +109,7 @@ public RestResponse buildResponse(final GetResponse response) throws Exception { * @param response a response * @throws ResourceNotFoundException if the document or source is missing */ - private void checkResource(final GetResponse response) { + private static void checkResource(final GetResponse response) { final String index = response.getIndex(); final String id = response.getId(); diff --git a/server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java index f1b8f53c17cd6..fa2315e6b43e3 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java @@ -73,7 +73,7 @@ public RestChannelConsumer prepareRequest(RestRequest request, final NodeClient return super.prepareRequest(request, client); } - void validateOpType(String opType) { + static void validateOpType(String opType) { if (null != opType && false == "create".equals(opType.toLowerCase(Locale.ROOT))) { throw new IllegalArgumentException("opType must be 'create', found: [" + opType + "]"); } diff --git a/server/src/main/java/org/elasticsearch/script/Script.java b/server/src/main/java/org/elasticsearch/script/Script.java index 493a1d8aa1716..86625e8a259dd 100644 --- a/server/src/main/java/org/elasticsearch/script/Script.java +++ b/server/src/main/java/org/elasticsearch/script/Script.java @@ -178,7 +178,7 @@ private void setStored(String idOrCode) { /** * Helper method to throw an exception if more than one type of {@link Script} is specified. */ - private void throwOnlyOneOfType() { + private static void throwOnlyOneOfType() { throw new IllegalArgumentException( "must only use one of [" + ScriptType.INLINE.getParseField().getPreferredName() diff --git a/server/src/main/java/org/elasticsearch/script/ScriptModule.java b/server/src/main/java/org/elasticsearch/script/ScriptModule.java index 73ec5a50f6967..b82ea3aac40e6 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptModule.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptModule.java @@ -108,7 +108,7 @@ public ScriptModule(Settings settings, List scriptPlugins) { /** * Allow the script service to register any settings update handlers on the cluster settings */ - public void registerClusterSettingsListeners(ScriptService scriptService, ClusterSettings clusterSettings) { + public static void registerClusterSettingsListeners(ScriptService scriptService, ClusterSettings clusterSettings) { scriptService.registerClusterSettingsListeners(clusterSettings); } } diff --git a/server/src/main/java/org/elasticsearch/script/ScriptService.java b/server/src/main/java/org/elasticsearch/script/ScriptService.java index fb4126fd51e1d..29c67a30f4a74 100644 --- a/server/src/main/java/org/elasticsearch/script/ScriptService.java +++ b/server/src/main/java/org/elasticsearch/script/ScriptService.java @@ -745,7 +745,7 @@ public ClusterState execute(ClusterState currentState) { }, newExecutor()); } - public void deleteStoredScript( + public static void deleteStoredScript( ClusterService clusterService, DeleteStoredScriptRequest request, ActionListener listener @@ -767,7 +767,7 @@ private static ClusterStateTaskExecutor ne return ClusterStateTaskExecutor.unbatched(); } - public StoredScriptSource getStoredScript(ClusterState state, GetStoredScriptRequest request) { + public static StoredScriptSource getStoredScript(ClusterState state, GetStoredScriptRequest request) { ScriptMetadata scriptMetadata = state.metadata().custom(ScriptMetadata.TYPE); if (scriptMetadata != null) { diff --git a/server/src/main/java/org/elasticsearch/script/field/AbstractKeywordDocValuesField.java b/server/src/main/java/org/elasticsearch/script/field/AbstractKeywordDocValuesField.java index 847bd6bce3982..3451204ec051f 100644 --- a/server/src/main/java/org/elasticsearch/script/field/AbstractKeywordDocValuesField.java +++ b/server/src/main/java/org/elasticsearch/script/field/AbstractKeywordDocValuesField.java @@ -82,7 +82,7 @@ public String getInternal(int index) { return bytesToString(values[index].toBytesRef()); } - protected String bytesToString(BytesRef bytesRef) { + protected static String bytesToString(BytesRef bytesRef) { return bytesRef.utf8ToString(); } diff --git a/server/src/main/java/org/elasticsearch/search/SearchHit.java b/server/src/main/java/org/elasticsearch/search/SearchHit.java index e41abfd21cdc3..def107de4368d 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchHit.java +++ b/server/src/main/java/org/elasticsearch/search/SearchHit.java @@ -210,7 +210,7 @@ public SearchHit(StreamInput in) throws IOException { private static final Text SINGLE_MAPPING_TYPE = new Text(MapperService.SINGLE_MAPPING_NAME); - private Map readFields(StreamInput in) throws IOException { + private static Map readFields(StreamInput in) throws IOException { Map fields; int size = in.readVInt(); if (size == 0) { @@ -229,7 +229,7 @@ private Map readFields(StreamInput in) throws IOException return fields; } - private void writeFields(StreamOutput out, Map fields) throws IOException { + private static void writeFields(StreamOutput out, Map fields) throws IOException { if (fields == null) { out.writeVInt(0); } else { @@ -982,7 +982,7 @@ private static Explanation parseExplanation(XContentParser parser) throws IOExce return Explanation.match(value, description, details); } - private void buildExplanation(XContentBuilder builder, Explanation explanation) throws IOException { + private static void buildExplanation(XContentBuilder builder, Explanation explanation) throws IOException { builder.startObject(); builder.field(Fields.VALUE, explanation.getValue()); builder.field(Fields.DESCRIPTION, explanation.getDescription()); diff --git a/server/src/main/java/org/elasticsearch/search/SearchModule.java b/server/src/main/java/org/elasticsearch/search/SearchModule.java index e98f697dd48c3..eafda206f74e4 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchModule.java +++ b/server/src/main/java/org/elasticsearch/search/SearchModule.java @@ -860,7 +860,7 @@ private void registerSorts() { namedWriteables.add(new NamedWriteableRegistry.Entry(SortBuilder.class, FieldSortBuilder.NAME, FieldSortBuilder::new)); } - private void registerFromPlugin(List plugins, Function> producer, Consumer consumer) { + private static void registerFromPlugin(List plugins, Function> producer, Consumer consumer) { for (SearchPlugin plugin : plugins) { for (T t : producer.apply(plugin)) { consumer.accept(t); @@ -922,7 +922,7 @@ private void registerSuggester(SuggesterSpec suggester) { ); } - private Map setupHighlighters(Settings settings, List plugins) { + private static Map setupHighlighters(Settings settings, List plugins) { NamedRegistry highlighters = new NamedRegistry<>("highlighter"); highlighters.register("fvh", new FastVectorHighlighter(settings)); highlighters.register("plain", new PlainHighlighter()); @@ -1175,7 +1175,7 @@ private void registerIntervalsSourceProviders() { namedWriteables.addAll(getIntervalsSourceProviderNamedWritables()); } - private CheckedBiConsumer registerRequestCacheKeyDifferentiator( + private static CheckedBiConsumer registerRequestCacheKeyDifferentiator( List plugins ) { CheckedBiConsumer differentiator = null; diff --git a/server/src/main/java/org/elasticsearch/search/SearchService.java b/server/src/main/java/org/elasticsearch/search/SearchService.java index f8dfe3e866b76..241d306447323 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchService.java +++ b/server/src/main/java/org/elasticsearch/search/SearchService.java @@ -242,8 +242,6 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv private final DfsPhase dfsPhase = new DfsPhase(); - private final QueryPhase queryPhase; - private final FetchPhase fetchPhase; private volatile long defaultKeepAlive; @@ -289,7 +287,6 @@ public SearchService( this.scriptService = scriptService; this.responseCollectorService = responseCollectorService; this.bigArrays = bigArrays; - this.queryPhase = new QueryPhase(); this.fetchPhase = fetchPhase; this.multiBucketConsumerService = new MultiBucketConsumerService( clusterService, @@ -302,7 +299,12 @@ public SearchService( setKeepAlives(DEFAULT_KEEPALIVE_SETTING.get(settings), MAX_KEEPALIVE_SETTING.get(settings)); clusterService.getClusterSettings() - .addSettingsUpdateConsumer(DEFAULT_KEEPALIVE_SETTING, MAX_KEEPALIVE_SETTING, this::setKeepAlives, this::validateKeepAlives); + .addSettingsUpdateConsumer( + DEFAULT_KEEPALIVE_SETTING, + MAX_KEEPALIVE_SETTING, + this::setKeepAlives, + SearchService::validateKeepAlives + ); this.keepAliveReaper = threadPool.scheduleWithFixedDelay(new Reaper(), keepAliveInterval, Names.SAME); @@ -324,7 +326,7 @@ public SearchService( .addSettingsUpdateConsumer(ENABLE_REWRITE_AGGS_TO_FILTER_BY_FILTER, this::setEnableRewriteAggsToFilterByFilter); } - private void validateKeepAlives(TimeValue defaultKeepAlive, TimeValue maxKeepAlive) { + private static void validateKeepAlives(TimeValue defaultKeepAlive, TimeValue maxKeepAlive) { if (defaultKeepAlive.millis() > maxKeepAlive.millis()) { throw new IllegalArgumentException( "Default keep alive setting for request [" @@ -454,12 +456,12 @@ private DfsSearchResult executeDfsPhase(ShardSearchRequest request, SearchShardT * Try to load the query results from the cache or execute the query phase directly if the cache cannot be used. */ private void loadOrExecuteQueryPhase(final ShardSearchRequest request, final SearchContext context) throws Exception { - final boolean canCache = indicesService.canCache(request, context); + final boolean canCache = IndicesService.canCache(request, context); context.getSearchExecutionContext().freezeContext(); if (canCache) { - indicesService.loadIntoContext(request, context, queryPhase); + indicesService.loadIntoContext(request, context); } else { - queryPhase.execute(context); + QueryPhase.execute(context); } } @@ -610,7 +612,7 @@ private IndexShard getShard(ShardSearchRequest request) { return indicesService.indexServiceSafe(request.shardId().getIndex()).getShard(request.shardId().id()); } - private void runAsync(Executor executor, CheckedSupplier executable, ActionListener listener) { + private static void runAsync(Executor executor, CheckedSupplier executable, ActionListener listener) { executor.execute(ActionRunnable.supply(listener, executable::get)); } @@ -685,7 +687,7 @@ public void executeQueryPhase( ) { searchContext.searcher().setAggregatedDfs(readerContext.getAggregatedDfs(null)); processScroll(request, readerContext, searchContext); - queryPhase.execute(searchContext); + QueryPhase.execute(searchContext); executor.success(); readerContext.setRescoreDocIds(searchContext.rescoreDocIds()); return new ScrollQuerySearchResult(searchContext.queryResult(), searchContext.shardTarget()); @@ -708,7 +710,7 @@ public void executeQueryPhase(QuerySearchRequest request, SearchShardTask task, SearchOperationListenerExecutor executor = new SearchOperationListenerExecutor(searchContext) ) { searchContext.searcher().setAggregatedDfs(request.dfs()); - queryPhase.execute(searchContext); + QueryPhase.execute(searchContext); if (searchContext.queryResult().hasSearchContext() == false && readerContext.singleSession()) { // no hits, we can release the context since there will be no fetch phase freeReaderContext(readerContext.id()); @@ -765,7 +767,7 @@ public void executeFetchPhase( searchContext.assignRescoreDocIds(readerContext.getRescoreDocIds(null)); searchContext.searcher().setAggregatedDfs(readerContext.getAggregatedDfs(null)); processScroll(request, readerContext, searchContext); - queryPhase.execute(searchContext); + QueryPhase.execute(searchContext); final long afterQueryTime = executor.success(); QueryFetchSearchResult fetchSearchResult = executeFetchPhase(readerContext, searchContext, afterQueryTime); return new ScrollQueryFetchSearchResult(fetchSearchResult, searchContext.shardTarget()); @@ -1125,7 +1127,7 @@ public void onFailure(Exception exc) { }; } - private boolean isScrollContext(ReaderContext context) { + private static boolean isScrollContext(ReaderContext context) { return context instanceof LegacyReaderContext && context.singleSession() == false; } @@ -1356,7 +1358,7 @@ private void parseSource(DefaultSearchContext context, SearchSourceBuilder sourc * Shortcut ids to load, we load only "from" and up to "size". The phase controller * handles this as well since the result is always size * shards for Q_T_F */ - private void shortcutDocIdsToLoad(SearchContext context) { + private static void shortcutDocIdsToLoad(SearchContext context) { final int[] docIdsToLoad; int docsOffset = 0; final Suggest suggest = context.queryResult().suggest(); @@ -1397,7 +1399,7 @@ private void shortcutDocIdsToLoad(SearchContext context) { context.docIdsToLoad(docIdsToLoad, docIdsToLoad.length); } - private void processScroll(InternalScrollSearchRequest request, ReaderContext reader, SearchContext context) { + private static void processScroll(InternalScrollSearchRequest request, ReaderContext reader, SearchContext context) { // process scroll context.from(context.from() + context.size()); context.scrollContext().scroll = request.scroll(); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java index ce28ab0499d54..1fd32eb55cccf 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java @@ -29,7 +29,7 @@ public class AggregationPhase { @Inject public AggregationPhase() {} - public void preProcess(SearchContext context) { + public static void preProcess(SearchContext context) { if (context.aggregations() == null) { return; } @@ -58,7 +58,7 @@ public void preProcess(SearchContext context) { } } - private List getCancellationChecks(SearchContext context) { + private static List getCancellationChecks(SearchContext context) { List cancellationChecks = new ArrayList<>(); if (context.lowLevelCancellation()) { // This searching doesn't live beyond this phase, so we don't need to remove query cancellation @@ -88,7 +88,7 @@ private List getCancellationChecks(SearchContext context) { return cancellationChecks; } - public void execute(SearchContext context) { + public static void execute(SearchContext context) { if (context.aggregations() == null) { context.queryResult().aggregations(null); return; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java index 9c78f93dfc02f..2fcc62d986825 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java @@ -74,7 +74,7 @@ protected AggregatorBase( context.addReleasable(this); // Register a safeguard to highlight any invalid construction logic (call to this constructor without subsequent preCollection call) collectableSubAggregators = new BucketCollector() { - void badState() { + static void badState() { throw new IllegalStateException("preCollection not called on new Aggregator before use"); } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java index 0d1e86aedf133..77d8b54cef68b 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java @@ -406,7 +406,7 @@ public AggregatorFactories build(AggregationContext context, AggregatorFactory p return new AggregatorFactories(context, aggFactories); } - private List resolvePipelineAggregatorOrder( + private static List resolvePipelineAggregatorOrder( Collection pipelineAggregatorBuilders, Collection aggregationBuilders ) { @@ -435,7 +435,7 @@ private List resolvePipelineAggregatorOrder( return orderedPipelineAggregatorrs; } - private void resolvePipelineAggregatorOrder( + private static void resolvePipelineAggregatorOrder( Map aggBuildersMap, Map pipelineAggregatorBuildersMap, List orderedPipelineAggregators, diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java index 7fbbe20c69c06..ded829cb76a44 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java @@ -46,8 +46,8 @@ public Aggregator wrap(final Aggregator in) { return new WrappedAggregator(in); } - protected class WrappedAggregator extends Aggregator { - private Aggregator in; + protected static class WrappedAggregator extends Aggregator { + private final Aggregator in; WrappedAggregator(Aggregator in) { this.in = in; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java index 1184d5b18825a..6e69babb75f12 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java @@ -174,7 +174,7 @@ public BucketCardinality bucketCardinality() { * this aggregator or the instance of the parent's factory that is incompatible with * the composite aggregation. */ - private AggregatorFactory validateParentAggregations(AggregatorFactory factory) { + private static AggregatorFactory validateParentAggregations(AggregatorFactory factory) { if (factory == null) { return null; } else if (factory instanceof NestedAggregatorFactory diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java index e94800572bfa3..9b07f6854f8c0 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java @@ -238,7 +238,7 @@ private void finishLeaf() { } /** Return true if the provided field may have multiple values per document in the leaf **/ - private boolean isMaybeMultivalued(LeafReaderContext context, SortField sortField) throws IOException { + private static boolean isMaybeMultivalued(LeafReaderContext context, SortField sortField) throws IOException { SortField.Type type = IndexSortConfig.getSortFieldType(sortField); switch (type) { case STRING: diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SortedDocsProducer.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SortedDocsProducer.java index cc23573aead73..7ce8e28034fb8 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SortedDocsProducer.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SortedDocsProducer.java @@ -40,7 +40,7 @@ abstract class SortedDocsProducer { * Returns true if the queue is full and the current leadSourceBucket did not produce any competitive * composite buckets. */ - protected boolean processBucket( + protected static boolean processBucket( CompositeValuesCollectorQueue queue, LeafReaderContext context, DocIdSetIterator iterator, diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/QueryToFilterAdapter.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/QueryToFilterAdapter.java index 69677e746e0ed..88687e6f7d479 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/QueryToFilterAdapter.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/QueryToFilterAdapter.java @@ -130,7 +130,7 @@ protected final IndexSearcher searcher() { * produce the same answer as collecting the results with a sequence like * {@code searcher.collect(counter); return counter.readAndReset();}? */ - protected final boolean countCanUseMetadata(FiltersAggregator.Counter counter, Bits live) { + protected static boolean countCanUseMetadata(FiltersAggregator.Counter counter, Bits live) { if (live != null) { /* * We can only use metadata if all of the documents in the reader diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogram.java index 9f1a78a29ad5c..ebc2b3e3f4e3e 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogram.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogram.java @@ -323,7 +323,7 @@ public Number nextKey(Number key) { * This method should not be called for this specific subclass of InternalHistogram, since there should not be * empty buckets when clustering. = */ - private double nextKey(double key) { + private static double nextKey(double key) { return key + 1; } @@ -401,7 +401,7 @@ protected boolean lessThan(IteratorAndCurrent a, IteratorAndCurrent buckets, AggregationReduceCont * * After this adjustment, A will contain more values than indicated and B will have less. */ - private void adjustBoundsForOverlappingBuckets(List buckets, AggregationReduceContext reduceContext) { + private static void adjustBoundsForOverlappingBuckets(List buckets, AggregationReduceContext reduceContext) { for (int i = 1; i < buckets.size(); i++) { Bucket curBucket = buckets.get(i); Bucket prevBucket = buckets.get(i - 1); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java index 299c67fec4995..5b38df80ccc0a 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java @@ -51,7 +51,7 @@ public class VariableWidthHistogramAggregator extends DeferableBucketAggregator * Running a clustering algorithm like K-Means is unfeasible because large indices don't fit into memory. * But having multiple collection phases lets us accurately bucket the docs in one pass. */ - private abstract class CollectionPhase implements Releasable { + private abstract static class CollectionPhase implements Releasable { /** * This method will collect the doc and then either return itself or a new CollectionPhase @@ -495,7 +495,7 @@ private String subAggsNeedScore() { return null; } - private String descendsFromNestedAggregator(Aggregator parent) { + private static String descendsFromNestedAggregator(Aggregator parent) { while (parent != null) { if (parent.getClass() == NestedAggregator.class) { return parent.name(); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/prefix/IpPrefixAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/prefix/IpPrefixAggregator.java index a195e48feccef..e0a232025cfc8 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/prefix/IpPrefixAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/prefix/IpPrefixAggregator.java @@ -155,7 +155,7 @@ public void collect(int doc, long owningBucketOrd) throws IOException { } } - private void maskIpAddress(final BytesRef ipAddress, final BytesRef subnetMask, final BytesRef subnet) { + private static void maskIpAddress(final BytesRef ipAddress, final BytesRef subnetMask, final BytesRef subnet) { assert ipAddress.length == 16 : "Invalid length for ip address [" + ipAddress.length + "] expected 16 bytes"; // NOTE: IPv4 addresses are encoded as 16-bytes. As a result, we use an // offset (12) to apply the subnet to the last 4 bytes (byes 12, 13, 14, 15) diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/RandomSamplerAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/RandomSamplerAggregationBuilder.java index 86b7504b6ca15..a9d7a4873af79 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/RandomSamplerAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/random/RandomSamplerAggregationBuilder.java @@ -97,7 +97,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { out.writeInt(seed); } - void recursivelyCheckSubAggs(Collection builders, Consumer aggregationCheck) { + static void recursivelyCheckSubAggs(Collection builders, Consumer aggregationCheck) { if (builders == null || builders.isEmpty()) { return; } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractRareTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractRareTermsAggregator.java index ea4218397a9ea..f4001c5d0aef4 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractRareTermsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractRareTermsAggregator.java @@ -90,7 +90,7 @@ private String subAggsNeedScore() { return null; } - private String descendsFromNestedAggregator(Aggregator parent) { + private static String descendsFromNestedAggregator(Aggregator parent) { while (parent != null) { if (parent.getClass() == NestedAggregator.class) { return parent.name(); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java index 1bc81b03ff543..b66f4ee0410b9 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java @@ -387,7 +387,7 @@ private void mapSegmentCountsToGlobalCounts(LongUnaryOperator mapping) throws IO * that it hits and then calling {@link CollectionStrategy#forEach} * once to iterate on the results. */ - abstract class CollectionStrategy implements Releasable { + abstract static class CollectionStrategy implements Releasable { /** * Short description of the collection mechanism added to the profile * output to help with debugging. @@ -947,7 +947,7 @@ public void close() { * oversizing the destination bytes helps to keep from allocating * a bunch of little arrays over and over and over again. */ - private void oversizedCopy(BytesRef from, BytesRef to) { + private static void oversizedCopy(BytesRef from, BytesRef to) { if (to.bytes.length < from.length) { to.bytes = new byte[ArrayUtil.oversize(from.length, 1)]; } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongRareTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongRareTermsAggregator.java index 8f521608b7e36..7a88d73715bfc 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongRareTermsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongRareTermsAggregator.java @@ -59,7 +59,7 @@ public class LongRareTermsAggregator extends AbstractRareTermsAggregator { this.bucketOrds = LongKeyedBucketOrds.build(bigArrays(), cardinality); } - protected SortedNumericDocValues getValues(ValuesSource.Numeric valuesSource, LeafReaderContext ctx) throws IOException { + protected static SortedNumericDocValues getValues(ValuesSource.Numeric valuesSource, LeafReaderContext ctx) throws IOException { return valuesSource.longValues(ctx); } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/MutualInformation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/MutualInformation.java index bfc188d32bffd..fb974288cce24 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/MutualInformation.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/MutualInformation.java @@ -94,7 +94,7 @@ public double getScore(long subsetFreq, long subsetSize, long supersetFreq, long but we get many NaN if we do not take case of the 0s */ - double getMITerm(double Nxy, double Nx_, double N_y, double N) { + static double getMITerm(double Nxy, double Nx_, double N_y, double N) { double numerator = Math.abs(N * Nxy); double denominator = Math.abs(Nx_ * N_y); double factor = Math.abs(Nxy / N); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ScriptHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ScriptHeuristic.java index 68e822ed6f8f5..976a214600bc0 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ScriptHeuristic.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/ScriptHeuristic.java @@ -146,7 +146,7 @@ public boolean equals(Object obj) { return Objects.equals(script, other.script); } - public final class LongAccessor extends Number { + public static final class LongAccessor extends Number { public long value; @Override diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/SignificanceHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/SignificanceHeuristic.java index b8814732eef0a..61ac25015c352 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/SignificanceHeuristic.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/heuristic/SignificanceHeuristic.java @@ -27,7 +27,7 @@ public abstract class SignificanceHeuristic implements NamedWriteable, ToXConten */ public abstract double getScore(long subsetFreq, long subsetSize, long supersetFreq, long supersetSize); - protected void checkFrequencyValidity( + protected static void checkFrequencyValidity( long subsetFreq, long subsetSize, long supersetFreq, diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregator.java index be2fa1b882271..9b2d938630417 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovFnPipelineAggregator.java @@ -129,7 +129,7 @@ public InternalAggregation reduce(InternalAggregation aggregation, AggregationRe return factory.createAggregation(newBuckets); } - private int clamp(int index, List list) { + private static int clamp(int index, List list) { if (index < 0) { return 0; } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/timeseries/TimeSeriesIndexSearcher.java b/server/src/main/java/org/elasticsearch/search/aggregations/timeseries/TimeSeriesIndexSearcher.java index 71ccf96fd6bc2..311729cd3d63e 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/timeseries/TimeSeriesIndexSearcher.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/timeseries/TimeSeriesIndexSearcher.java @@ -98,7 +98,7 @@ protected boolean lessThan(LeafWalker a, LeafWalker b) { } // Re-populate the queue with walkers on the same TSID. - private boolean populateQueue(List leafWalkers, PriorityQueue queue) throws IOException { + private static boolean populateQueue(List leafWalkers, PriorityQueue queue) throws IOException { BytesRef currentTsid = null; assert queue.size() == 0; Iterator it = leafWalkers.iterator(); @@ -133,7 +133,7 @@ private boolean populateQueue(List leafWalkers, PriorityQueue 0; } - private boolean queueAllHaveTsid(PriorityQueue queue, BytesRef tsid) throws IOException { + private static boolean queueAllHaveTsid(PriorityQueue queue, BytesRef tsid) throws IOException { for (LeafWalker leafWalker : queue) { BytesRef walkerId = leafWalker.tsids.lookupOrd(leafWalker.tsids.ordValue()); assert walkerId.equals(tsid) : tsid.utf8ToString() + " != " + walkerId.utf8ToString(); diff --git a/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java index 32bff7320bd81..542456f401b07 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java @@ -37,6 +37,7 @@ import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.lookup.SourceLookup; import org.elasticsearch.search.profile.ProfileResult; +import org.elasticsearch.search.profile.Profilers; import org.elasticsearch.tasks.TaskCancelledException; import org.elasticsearch.xcontent.XContentType; @@ -84,7 +85,7 @@ public void execute(SearchContext context) { return; } - Profiler profiler = context.getProfilers() == null ? Profiler.NOOP : context.getProfilers().startProfilingFetchPhase(); + Profiler profiler = context.getProfilers() == null ? Profiler.NOOP : Profilers.startProfilingFetchPhase(); SearchHits hits = null; try { hits = buildSearchHits(context, profiler); @@ -210,7 +211,7 @@ public int compareTo(DocIdToIndex o) { } } - private FieldsVisitor createStoredFieldsVisitor(SearchContext context, Map> storedToRequestedFields) { + private static FieldsVisitor createStoredFieldsVisitor(SearchContext context, Map> storedToRequestedFields) { StoredFieldsContext storedFieldsContext = context.storedFieldsContext(); if (storedFieldsContext == null) { @@ -251,11 +252,11 @@ private FieldsVisitor createStoredFieldsVisitor(SearchContext context, Map fieldTypeLookup, Profiler profileListener, CheckedBiConsumer fieldReader, diff --git a/server/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java index 6c56411042df4..5798dd46354be 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java @@ -73,7 +73,7 @@ public void shardResult(SearchHits hits, ProfileResult profileResult) { this.profileResult = profileResult; } - private boolean assertNoSearchTarget(SearchHits hits) { + private static boolean assertNoSearchTarget(SearchHits hits) { for (SearchHit hit : hits.getHits()) { assert hit.getShard() == null : "expected null but got: " + hit.getShard(); } diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java index 0501f35709781..25522b25133ed 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java @@ -109,7 +109,7 @@ public static BytesReference objectToBytes(Object value, XContentType xContentTy } @SuppressWarnings("unchecked") - private Map getNestedSource(Map sourceAsMap, HitContext hitContext) { + private static Map getNestedSource(Map sourceAsMap, HitContext hitContext) { for (SearchHit.NestedIdentity o = hitContext.hit().getNestedIdentity(); o != null; o = o.getChild()) { sourceAsMap = (Map) sourceAsMap.get(o.getField().string()); if (sourceAsMap == null) { diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsPhase.java index 0cfa6bc5f4590..1a84051a285dc 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsPhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsPhase.java @@ -70,7 +70,7 @@ public void process(HitContext hitContext) { }; } - private FieldScript[] createLeafScripts(LeafReaderContext context, List scriptFields) { + private static FieldScript[] createLeafScripts(LeafReaderContext context, List scriptFields) { FieldScript[] scripts = new FieldScript[scriptFields.size()]; for (int i = 0; i < scripts.length; i++) { try { diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java index 3abde4aa67b42..a3323c8c81a65 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java @@ -224,7 +224,7 @@ private static int findGoodEndForNoHighlightExcerpt(int noMatchSize, Analyzer an } } - private Analyzer wrapAnalyzer(Analyzer analyzer, Integer maxAnalyzedOffset) { + private static Analyzer wrapAnalyzer(Analyzer analyzer, Integer maxAnalyzedOffset) { if (maxAnalyzedOffset != null) { return new LimitTokenOffsetAnalyzer(analyzer, maxAnalyzedOffset); } diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java index bc54c22cfa39c..0f97521b4691a 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java @@ -177,7 +177,7 @@ protected List loadFieldValues( .toList(); } - protected BreakIterator getBreakIterator(SearchHighlightContext.Field field) { + protected static BreakIterator getBreakIterator(SearchHighlightContext.Field field) { final SearchHighlightContext.FieldOptions fieldOptions = field.fieldOptions(); final Locale locale = fieldOptions.boundaryScannerLocale() != null ? fieldOptions.boundaryScannerLocale() : Locale.ROOT; final HighlightBuilder.BoundaryScannerType type = fieldOptions.boundaryScannerType() != null @@ -213,7 +213,7 @@ protected static String mergeFieldValues(List fieldValues, char valuesSe return rawValue.substring(0, Math.min(rawValue.length(), Integer.MAX_VALUE - 1)); } - protected OffsetSource getOffsetSource(MappedFieldType fieldType) { + protected static OffsetSource getOffsetSource(MappedFieldType fieldType) { TextSearchInfo tsi = fieldType.getTextSearchInfo(); if (tsi.hasOffsets()) { return tsi.termVectors() != TextSearchInfo.TermVector.NONE ? OffsetSource.POSTINGS_WITH_TERM_VECTORS : OffsetSource.POSTINGS; @@ -224,7 +224,7 @@ protected OffsetSource getOffsetSource(MappedFieldType fieldType) { return OffsetSource.ANALYSIS; } - private Predicate fieldMatcher(FieldHighlightContext fieldContext) { + private static Predicate fieldMatcher(FieldHighlightContext fieldContext) { if (fieldContext.field.fieldOptions().requireFieldMatch()) { String fieldName = fieldContext.fieldName; return fieldName::equals; diff --git a/server/src/main/java/org/elasticsearch/search/profile/Profilers.java b/server/src/main/java/org/elasticsearch/search/profile/Profilers.java index b7ed401809a7d..15c392406a29b 100644 --- a/server/src/main/java/org/elasticsearch/search/profile/Profilers.java +++ b/server/src/main/java/org/elasticsearch/search/profile/Profilers.java @@ -62,7 +62,7 @@ public AggregationProfiler getAggregationProfiler() { /** * Build a profiler for the fetch phase. */ - public FetchProfiler startProfilingFetchPhase() { + public static FetchProfiler startProfilingFetchPhase() { return new FetchProfiler(); } diff --git a/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java b/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java index 937378719ff81..5fbaed04e31bb 100644 --- a/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java +++ b/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java @@ -56,19 +56,11 @@ public class QueryPhase { private static final Logger LOGGER = LogManager.getLogger(QueryPhase.class); - private final AggregationPhase aggregationPhase; - private final SuggestPhase suggestPhase; - private final RescorePhase rescorePhase; + public QueryPhase() {} - public QueryPhase() { - this.aggregationPhase = new AggregationPhase(); - this.suggestPhase = new SuggestPhase(); - this.rescorePhase = new RescorePhase(); - } - - public void execute(SearchContext searchContext) throws QueryPhaseExecutionException { + public static void execute(SearchContext searchContext) throws QueryPhaseExecutionException { if (searchContext.hasOnlySuggest()) { - suggestPhase.execute(searchContext); + SuggestPhase.execute(searchContext); searchContext.queryResult() .topDocs( new TopDocsAndMaxScore(new TopDocs(new TotalHits(0, TotalHits.Relation.EQUAL_TO), Lucene.EMPTY_SCORE_DOCS), Float.NaN), @@ -84,14 +76,14 @@ public void execute(SearchContext searchContext) throws QueryPhaseExecutionExcep // Pre-process aggregations as late as possible. In the case of a DFS_Q_T_F // request, preProcess is called on the DFS phase, this is why we pre-process them // here to make sure it happens during the QUERY phase - aggregationPhase.preProcess(searchContext); + AggregationPhase.preProcess(searchContext); boolean rescore = executeInternal(searchContext); if (rescore) { // only if we do a regular search - rescorePhase.execute(searchContext); + RescorePhase.execute(searchContext); } - suggestPhase.execute(searchContext); - aggregationPhase.execute(searchContext); + SuggestPhase.execute(searchContext); + AggregationPhase.execute(searchContext); if (searchContext.getProfilers() != null) { searchContext.queryResult().profileResults(searchContext.getProfilers().buildQueryPhaseResults()); diff --git a/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java b/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java index d1f2d474a624a..480a08fae7287 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java +++ b/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java @@ -123,7 +123,7 @@ public int compare(ScoreDoc o1, ScoreDoc o2) { /** Returns a new {@link TopDocs} with the topN from the incoming one, or the same TopDocs if the number of hits is already <= * topN. */ - private TopDocs topN(TopDocs in, int topN) { + private static TopDocs topN(TopDocs in, int topN) { if (in.scoreDocs.length < topN) { return in; } @@ -135,7 +135,7 @@ private TopDocs topN(TopDocs in, int topN) { } /** Modifies incoming TopDocs (in) by replacing the top hits with resorted's hits, and then resorting all hits. */ - private TopDocs combine(TopDocs in, TopDocs resorted, QueryRescoreContext ctx) { + private static TopDocs combine(TopDocs in, TopDocs resorted, QueryRescoreContext ctx) { System.arraycopy(resorted.scoreDocs, 0, in.scoreDocs, 0, resorted.scoreDocs.length); if (in.scoreDocs.length > resorted.scoreDocs.length) { diff --git a/server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java b/server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java index 15c81c4e90348..23303da758f2d 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java +++ b/server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java @@ -21,7 +21,7 @@ */ public class RescorePhase { - public void execute(SearchContext context) { + public static void execute(SearchContext context) { TopDocs topDocs = context.queryResult().topDocs().topDocs; if (topDocs.scoreDocs.length == 0) { return; @@ -43,7 +43,7 @@ public void execute(SearchContext context) { /** * Returns true if the provided docs are sorted by score. */ - private boolean topDocsSortedByScore(TopDocs topDocs) { + private static boolean topDocsSortedByScore(TopDocs topDocs) { if (topDocs == null || topDocs.scoreDocs == null || topDocs.scoreDocs.length < 2) { return true; } diff --git a/server/src/main/java/org/elasticsearch/search/runtime/AbstractScriptFieldQuery.java b/server/src/main/java/org/elasticsearch/search/runtime/AbstractScriptFieldQuery.java index 8d81ce4e6dc5c..8b754e986fc4a 100644 --- a/server/src/main/java/org/elasticsearch/search/runtime/AbstractScriptFieldQuery.java +++ b/server/src/main/java/org/elasticsearch/search/runtime/AbstractScriptFieldQuery.java @@ -119,7 +119,7 @@ public void visit(QueryVisitor visitor) { } } - final Explanation explainMatch(float boost, String description) { + static Explanation explainMatch(float boost, String description) { return Explanation.match( boost, description, diff --git a/server/src/main/java/org/elasticsearch/search/slice/DocIdSliceQuery.java b/server/src/main/java/org/elasticsearch/search/slice/DocIdSliceQuery.java index 01c43a9b945d7..4b52a91c0bc24 100644 --- a/server/src/main/java/org/elasticsearch/search/slice/DocIdSliceQuery.java +++ b/server/src/main/java/org/elasticsearch/search/slice/DocIdSliceQuery.java @@ -62,7 +62,7 @@ public Scorer scorer(LeafReaderContext context) { return new ConstantScoreScorer(this, boost, scoreMode, iterator); } - private DocIdSetIterator createIterator(LeafReaderContext context, int sliceStart, int sliceEnd) { + private static DocIdSetIterator createIterator(LeafReaderContext context, int sliceStart, int sliceEnd) { int leafStart = context.docBase; int leafEnd = context.docBase + context.reader().maxDoc(); diff --git a/server/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java index 592d2d3485017..f6a50c35433b7 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java @@ -25,7 +25,7 @@ */ public class SuggestPhase { - public void execute(SearchContext context) { + public static void execute(SearchContext context) { final SuggestionSearchContext suggest = context.suggest(); if (suggest == null) { return; diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java index 698aa5c8d8156..d4f0652f50a54 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java @@ -237,7 +237,7 @@ public void nextToken() throws IOException { } } - private double score(TermStats termStats, double errorScore, long dictionarySize) { + private static double score(TermStats termStats, double errorScore, long dictionarySize) { return errorScore * (((double) termStats.totalTermFreq + 1) / ((double) dictionarySize + 1)); } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java index ab910c82d7de2..80ebd9e45acf8 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java @@ -44,7 +44,7 @@ public CandidateSet drawCandidates(CandidateSet set) throws IOException { return reduce(set, numCandidates); } - private CandidateSet reduce(CandidateSet set, int numCandidates) { + private static CandidateSet reduce(CandidateSet set, int numCandidates) { if (set.candidates.length > numCandidates) { Candidate[] candidates = set.candidates; Arrays.sort(candidates, (left, right) -> Double.compare(right.score, left.score)); diff --git a/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java index 7353100b40639..a92ba3af09f1c 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java +++ b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java @@ -535,7 +535,7 @@ private boolean isSystemIndex(IndexMetadata indexMetadata) { return indexMetadata.isSystem() || systemIndices.isSystemName(indexMetadata.getIndex().getName()); } - private Tuple, Map> getDataStreamsToRestore( + private static Tuple, Map> getDataStreamsToRestore( Repository repository, SnapshotId snapshotId, SnapshotInfo snapshotInfo, @@ -1576,7 +1576,7 @@ public void clusterStateProcessed(ClusterState oldState, ClusterState newState) } } - private IndexMetadata convertLegacyIndex(IndexMetadata snapshotIndexMetadata, ClusterState clusterState) { + private static IndexMetadata convertLegacyIndex(IndexMetadata snapshotIndexMetadata, ClusterState clusterState) { if (snapshotIndexMetadata.getCreationVersion().before(Version.fromString("5.0.0"))) { throw new IllegalArgumentException("can't restore an index created before version 5.0.0"); } @@ -1650,7 +1650,7 @@ private static IndexMetadata.Builder restoreOverClosedIndex(IndexMetadata snapsh private void ensureValidIndexName(ClusterState currentState, IndexMetadata snapshotIndexMetadata, String renamedIndexName) { final boolean isHidden = snapshotIndexMetadata.isHidden(); - createIndexService.validateIndexName(renamedIndexName, currentState); + MetadataCreateIndexService.validateIndexName(renamedIndexName, currentState); createIndexService.validateDotIndex(renamedIndexName, isHidden); createIndexService.validateIndexSettings(renamedIndexName, snapshotIndexMetadata.getSettings(), false); } diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java index fd034b96973c2..6eef30f41f27c 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java +++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java @@ -1618,7 +1618,7 @@ private void finalizeSnapshotEntry(Snapshot snapshot, Metadata metadata, Reposit * @param finalIndices The final list of indices in the snapshot, after any indices that were concurrently deleted are removed. * @return The list of feature states which were completed successfully in the given entry. */ - private List onlySuccessfulFeatureStates(SnapshotsInProgress.Entry entry, List finalIndices) { + private static List onlySuccessfulFeatureStates(SnapshotsInProgress.Entry entry, List finalIndices) { assert entry.partial() : "should not try to filter feature states from a non-partial entry"; // Figure out which indices have unsuccessful shards @@ -2303,7 +2303,11 @@ private void addDeleteListener(String deleteUUID, ActionListener listener) * (used to use newer metadata version after a snapshot delete) * @return minimum node version that must still be able to read the repository metadata */ - public Version minCompatibleVersion(Version minNodeVersion, RepositoryData repositoryData, @Nullable Collection excluded) { + public static Version minCompatibleVersion( + Version minNodeVersion, + RepositoryData repositoryData, + @Nullable Collection excluded + ) { Version minCompatVersion = minNodeVersion; final Collection snapshotIds = repositoryData.getSnapshotIds(); for (SnapshotId snapshotId : snapshotIds.stream() @@ -2746,7 +2750,7 @@ private SnapshotsInProgress updatedSnapshotsInProgress(ClusterState currentState return changed ? snapshotsInProgress.withUpdatedEntriesForRepo(repoName, snapshotEntries) : null; } - private void markShardReassigned(RepositoryShardId shardId, Set reassignments) { + private static void markShardReassigned(RepositoryShardId shardId, Set reassignments) { final boolean added = reassignments.add(shardId); assert added : "should only ever reassign each shard once but assigned [" + shardId + "] multiple times"; } diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java index aac2663d2fa34..6fd3c1cb0e02e 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java @@ -176,8 +176,7 @@ public static TaskInfo fromXContent(XContentParser parser) { PARSER.declareString(constructorArg(), new ParseField("type")); PARSER.declareString(constructorArg(), new ParseField("action")); PARSER.declareString(optionalConstructorArg(), new ParseField("description")); - ObjectParserHelper parserHelper = new ObjectParserHelper<>(); - parserHelper.declareRawObject(PARSER, optionalConstructorArg(), new ParseField("status")); + ObjectParserHelper.declareRawObject(PARSER, optionalConstructorArg(), new ParseField("status")); PARSER.declareLong(constructorArg(), new ParseField("start_time_in_millis")); PARSER.declareLong(constructorArg(), new ParseField("running_time_in_nanos")); PARSER.declareBoolean(constructorArg(), new ParseField("cancellable")); diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskResult.java b/server/src/main/java/org/elasticsearch/tasks/TaskResult.java index cf26b90aaa85f..61b220fe0b0cc 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskResult.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskResult.java @@ -173,9 +173,8 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t ); parser.declareBoolean(constructorArg(), new ParseField("completed")); parser.declareObject(constructorArg(), TaskInfo.PARSER, new ParseField("task")); - ObjectParserHelper parserHelper = new ObjectParserHelper<>(); - parserHelper.declareRawObject(parser, optionalConstructorArg(), new ParseField("error")); - parserHelper.declareRawObject(parser, optionalConstructorArg(), new ParseField("response")); + ObjectParserHelper.declareRawObject(parser, optionalConstructorArg(), new ParseField("error")); + ObjectParserHelper.declareRawObject(parser, optionalConstructorArg(), new ParseField("response")); PARSER = parser.build(); } diff --git a/server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java index 3222ea1fa65cd..fd9b56d73518d 100644 --- a/server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java +++ b/server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java @@ -36,7 +36,7 @@ protected static String settingsKey(final String prefix, final String key) { return String.join(".", prefix, key); } - protected int applyHardSizeLimit(final Settings settings, final String name) { + protected static int applyHardSizeLimit(final Settings settings, final String name) { if (name.equals("bulk") || name.equals(ThreadPool.Names.WRITE) || name.equals(ThreadPool.Names.SYSTEM_WRITE) diff --git a/server/src/main/java/org/elasticsearch/timeseries/support/TimeSeriesMetricsService.java b/server/src/main/java/org/elasticsearch/timeseries/support/TimeSeriesMetricsService.java index 45a72b57a2f93..639afff2f83fe 100644 --- a/server/src/main/java/org/elasticsearch/timeseries/support/TimeSeriesMetricsService.java +++ b/server/src/main/java/org/elasticsearch/timeseries/support/TimeSeriesMetricsService.java @@ -88,7 +88,7 @@ private TimeSeriesMetrics newMetrics(FieldCapabilitiesResponse response) { ); } - private void collectField( + private static void collectField( List dimensions, Map metrics, String fieldName, diff --git a/server/src/main/java/org/elasticsearch/transport/InboundDecoder.java b/server/src/main/java/org/elasticsearch/transport/InboundDecoder.java index bb97777ce9d5f..399614175410d 100644 --- a/server/src/main/java/org/elasticsearch/transport/InboundDecoder.java +++ b/server/src/main/java/org/elasticsearch/transport/InboundDecoder.java @@ -149,7 +149,7 @@ private boolean isDone() { return bytesConsumed == totalNetworkSize; } - private int headerBytesToRead(BytesReference reference) { + private static int headerBytesToRead(BytesReference reference) { if (reference.length() < TcpHeader.BYTES_REQUIRED_FOR_VERSION) { return 0; } diff --git a/server/src/main/java/org/elasticsearch/transport/InboundHandler.java b/server/src/main/java/org/elasticsearch/transport/InboundHandler.java index 392f5abdcfd65..14afcffbe7de2 100644 --- a/server/src/main/java/org/elasticsearch/transport/InboundHandler.java +++ b/server/src/main/java/org/elasticsearch/transport/InboundHandler.java @@ -360,7 +360,7 @@ protected void doRun() { } } - private void doHandleResponse(TransportResponseHandler handler, T response) { + private static void doHandleResponse(TransportResponseHandler handler, T response) { try { handler.handleResponse(response); } catch (Exception e) { @@ -401,7 +401,7 @@ protected void doRun() { } } - private void doHandleException(final TransportResponseHandler handler, TransportException transportException) { + private static void doHandleException(final TransportResponseHandler handler, TransportException transportException) { try { handler.handleException(transportException); } catch (Exception e) { diff --git a/server/src/main/java/org/elasticsearch/transport/InboundPipeline.java b/server/src/main/java/org/elasticsearch/transport/InboundPipeline.java index f5f2a6c999b78..7a8cc9173abb4 100644 --- a/server/src/main/java/org/elasticsearch/transport/InboundPipeline.java +++ b/server/src/main/java/org/elasticsearch/transport/InboundPipeline.java @@ -156,7 +156,7 @@ private void forwardFragments(TcpChannel channel, ArrayList fragments) t } } - private boolean endOfMessage(Object fragment) { + private static boolean endOfMessage(Object fragment) { return fragment == InboundDecoder.PING || fragment == InboundDecoder.END_CONTENT || fragment instanceof Exception; } diff --git a/server/src/main/java/org/elasticsearch/transport/Lz4TransportDecompressor.java b/server/src/main/java/org/elasticsearch/transport/Lz4TransportDecompressor.java index ecd7b1cd4398c..e36a22735ad4c 100644 --- a/server/src/main/java/org/elasticsearch/transport/Lz4TransportDecompressor.java +++ b/server/src/main/java/org/elasticsearch/transport/Lz4TransportDecompressor.java @@ -327,7 +327,7 @@ private int decodeBlock(BytesReference reference) throws IOException { return bytesConsumed; } - private byte[] getThreadLocalBuffer(ThreadLocal threadLocal, int requiredSize) { + private static byte[] getThreadLocalBuffer(ThreadLocal threadLocal, int requiredSize) { byte[] buffer = threadLocal.get(); if (requiredSize > buffer.length) { buffer = new byte[requiredSize]; diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java index 2730e450ea8ac..29517f59ae18f 100644 --- a/server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java +++ b/server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java @@ -73,7 +73,7 @@ protected Map> groupClusterIndices(Set remoteCluste throw new IllegalArgumentException("node [" + nodeName + "] does not have the remote cluster client role enabled"); } String remoteClusterName = index.substring(0, i); - List clusters = clusterNameResolver.resolveClusterNames(remoteClusterNames, remoteClusterName); + List clusters = ClusterNameExpressionResolver.resolveClusterNames(remoteClusterNames, remoteClusterName); String indexName = index.substring(i + 1); for (String clusterName : clusters) { perClusterIndices.computeIfAbsent(clusterName, k -> new ArrayList<>()).add(indexName); diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java index 2b5a247ea682c..d00395307a1a4 100644 --- a/server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java +++ b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionStrategy.java @@ -392,7 +392,7 @@ private List> getAndClearListeners() { return result; } - private boolean connectionProfileChanged(ConnectionProfile oldProfile, ConnectionProfile newProfile) { + private static boolean connectionProfileChanged(ConnectionProfile oldProfile, ConnectionProfile newProfile) { return Objects.equals(oldProfile.getCompressionEnabled(), newProfile.getCompressionEnabled()) == false || Objects.equals(oldProfile.getPingInterval(), newProfile.getPingInterval()) == false || Objects.equals(oldProfile.getCompressionScheme(), newProfile.getCompressionScheme()) == false; diff --git a/server/src/main/java/org/elasticsearch/transport/SniffConnectionStrategy.java b/server/src/main/java/org/elasticsearch/transport/SniffConnectionStrategy.java index 1e7a6b52338fe..e27fb2d054b10 100644 --- a/server/src/main/java/org/elasticsearch/transport/SniffConnectionStrategy.java +++ b/server/src/main/java/org/elasticsearch/transport/SniffConnectionStrategy.java @@ -512,7 +512,7 @@ private static DiscoveryNode maybeAddProxyAddress(String proxyAddress, Discovery } } - private boolean seedsChanged(final List oldSeedNodes, final List newSeedNodes) { + private static boolean seedsChanged(final List oldSeedNodes, final List newSeedNodes) { if (oldSeedNodes.size() != newSeedNodes.size()) { return true; } @@ -521,7 +521,7 @@ private boolean seedsChanged(final List oldSeedNodes, final List return oldSeeds.equals(newSeeds) == false; } - private boolean proxyChanged(String oldProxy, String newProxy) { + private static boolean proxyChanged(String oldProxy, String newProxy) { if (oldProxy == null || oldProxy.isEmpty()) { return (newProxy == null || newProxy.isEmpty()) == false; } diff --git a/server/src/main/java/org/elasticsearch/transport/TcpTransport.java b/server/src/main/java/org/elasticsearch/transport/TcpTransport.java index 884bef3a8111a..85786bf079fe6 100644 --- a/server/src/main/java/org/elasticsearch/transport/TcpTransport.java +++ b/server/src/main/java/org/elasticsearch/transport/TcpTransport.java @@ -335,7 +335,7 @@ public String toString() { // This allows transport implementations to potentially override specific connection profiles. This // primarily exists for the test implementations. - protected ConnectionProfile maybeOverrideConnectionProfile(ConnectionProfile connectionProfile) { + protected static ConnectionProfile maybeOverrideConnectionProfile(ConnectionProfile connectionProfile) { return connectionProfile; } @@ -745,7 +745,7 @@ static void handleException(TcpChannel channel, Exception e, Lifecycle lifecycle } } - protected void onServerException(TcpServerChannel channel, Exception e) { + protected static void onServerException(TcpServerChannel channel, Exception e) { if (e instanceof BindException) { logger.debug(() -> new ParameterizedMessage("bind exception from server channel caught on transport layer [{}]", channel), e); } else { diff --git a/server/src/main/java/org/elasticsearch/transport/TransportActionProxy.java b/server/src/main/java/org/elasticsearch/transport/TransportActionProxy.java index 6cc91d4004076..d8cf947d993af 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportActionProxy.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportActionProxy.java @@ -61,7 +61,7 @@ public void messageReceived(T request, TransportChannel channel, Task task) thro ); } - private boolean assertConsistentTaskType(Task proxyTask, TransportRequest wrapped) { + private static boolean assertConsistentTaskType(Task proxyTask, TransportRequest wrapped) { final Task targetTask = wrapped.createTask(0, proxyTask.getType(), proxyTask.getAction(), TaskId.EMPTY_TASK_ID, Map.of()); assert targetTask instanceof CancellableTask == proxyTask instanceof CancellableTask : "Cancellable property of proxy action [" diff --git a/server/src/main/java/org/elasticsearch/transport/TransportService.java b/server/src/main/java/org/elasticsearch/transport/TransportService.java index 9f1fed8e213c6..833ade9c69915 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportService.java @@ -999,7 +999,7 @@ public TransportAddress[] addressesFromString(String address) throws UnknownHost "internal:" ); - private void validateActionName(String actionName) { + private static void validateActionName(String actionName) { // TODO we should makes this a hard validation and throw an exception but we need a good way to add backwards layer // for it. Maybe start with a deprecation layer if (isValidActionName(actionName) == false) { diff --git a/server/src/main/java/org/elasticsearch/transport/TransportStats.java b/server/src/main/java/org/elasticsearch/transport/TransportStats.java index d578c8437da97..6671478f998ff 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportStats.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportStats.java @@ -174,7 +174,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - private void histogramToXContent(XContentBuilder builder, long[] bucketFrequencies, String fieldName) throws IOException { + private static void histogramToXContent(XContentBuilder builder, long[] bucketFrequencies, String fieldName) throws IOException { final int[] bucketBounds = HandlingTimeTracker.getBucketUpperBounds(); assert bucketFrequencies.length == bucketBounds.length + 1; builder.startArray(fieldName); diff --git a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java index ca1c39fe6abd5..e3626e10b64ad 100644 --- a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java +++ b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java @@ -360,7 +360,7 @@ private void updateTaskState(SystemIndexMigrationInfo migrationInfo, Consumer listener.onFailure(ex), e1 -> listener.onFailure(ex))); } - private ElasticsearchException logAndThrowExceptionForFailures(BulkByScrollResponse bulkByScrollResponse) { + private static ElasticsearchException logAndThrowExceptionForFailures(BulkByScrollResponse bulkByScrollResponse) { String bulkFailures = (bulkByScrollResponse.getBulkFailures() != null) ? Strings.collectionToCommaDelimitedString(bulkByScrollResponse.getBulkFailures()) : ""; diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/create/AutoCreateActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/AutoCreateActionTests.java index 739278fb3c262..622c42923e717 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/create/AutoCreateActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/create/AutoCreateActionTests.java @@ -48,13 +48,13 @@ public void testResolveTemplates() { ComposableIndexTemplate result = AutoCreateAction.resolveTemplate(request, metadata); assertThat(result, notNullValue()); assertThat(result.getDataStreamTemplate(), notNullValue()); - assertThat(result.getDataStreamTemplate().getTimestampField(), equalTo("@timestamp")); + assertThat(DataStreamTemplate.getTimestampField(), equalTo("@timestamp")); request = new CreateIndexRequest("logs-barbaz"); result = AutoCreateAction.resolveTemplate(request, metadata); assertThat(result, notNullValue()); assertThat(result.getDataStreamTemplate(), notNullValue()); - assertThat(result.getDataStreamTemplate().getTimestampField(), equalTo("@timestamp")); + assertThat(DataStreamTemplate.getTimestampField(), equalTo("@timestamp")); // An index that matches with a template without a data steam definition request = new CreateIndexRequest("legacy-logs-foobaz"); diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java index 036a983320551..6ac00b3086682 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java @@ -23,7 +23,6 @@ import org.elasticsearch.cluster.metadata.DataStreamTestHelper; import org.elasticsearch.cluster.metadata.IndexAbstraction; import org.elasticsearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.metadata.IndexTemplateMetadata; import org.elasticsearch.cluster.metadata.Metadata; import org.elasticsearch.cluster.metadata.MetadataCreateIndexService; @@ -35,8 +34,6 @@ import org.elasticsearch.core.TimeValue; import org.elasticsearch.index.Index; import org.elasticsearch.indices.EmptySystemIndices; -import org.elasticsearch.indices.InvalidIndexNameException; -import org.elasticsearch.indices.TestIndexNameExpressionResolver; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.TestThreadPool; import org.elasticsearch.threadpool.ThreadPool; @@ -60,13 +57,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.nullValue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.same; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; public class MetadataRolloverServiceTests extends ESTestCase { @@ -279,7 +270,6 @@ public void testDataStreamValidation() throws IOException { public void testGenerateRolloverIndexName() { String invalidIndexName = randomAlphaOfLength(10) + "A"; - IndexNameExpressionResolver indexNameExpressionResolver = TestIndexNameExpressionResolver.newInstance(); expectThrows(IllegalArgumentException.class, () -> MetadataRolloverService.generateRolloverIndexName(invalidIndexName)); int num = randomIntBetween(0, 100); final String indexPrefix = randomAlphaOfLength(10); @@ -713,31 +703,6 @@ public void testValidation() throws Exception { assertEquals(sourceIndexName, rolloverResult.sourceIndexName()); assertEquals(newIndexName, rolloverResult.rolloverIndexName()); assertSame(rolloverResult.clusterState(), clusterState); - - verify(createIndexService).validateIndexName(any(), same(clusterState)); - verifyNoMoreInteractions(createIndexService); - verifyNoMoreInteractions(metadataIndexAliasesService); - - reset(createIndexService); - doThrow(new InvalidIndexNameException("test", "invalid")).when(createIndexService).validateIndexName(any(), any()); - - expectThrows( - InvalidIndexNameException.class, - () -> rolloverService.rolloverClusterState( - clusterState, - rolloverTarget, - null, - new CreateIndexRequest("_na_"), - null, - Instant.now(), - randomBoolean(), - randomBoolean() - ) - ); - - verify(createIndexService).validateIndexName(any(), same(clusterState)); - verifyNoMoreInteractions(createIndexService); - verifyNoMoreInteractions(metadataIndexAliasesService); } public void testRolloverClusterStateForDataStreamNoTemplate() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java index 5ea39d92d4704..2a0fe79781739 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java @@ -294,16 +294,16 @@ public void testOnlySystem() { Map.of("plugin", new SystemIndices.Feature("plugin", "test feature", List.of(new SystemIndexDescriptor(".test*", "")))) ); List onlySystem = List.of(".foo", ".bar"); - assertTrue(bulkAction.isOnlySystem(buildBulkRequest(onlySystem), indicesLookup, systemIndices)); + assertTrue(TransportBulkAction.isOnlySystem(buildBulkRequest(onlySystem), indicesLookup, systemIndices)); onlySystem = List.of(".foo", ".bar", ".test"); - assertTrue(bulkAction.isOnlySystem(buildBulkRequest(onlySystem), indicesLookup, systemIndices)); + assertTrue(TransportBulkAction.isOnlySystem(buildBulkRequest(onlySystem), indicesLookup, systemIndices)); List nonSystem = List.of("foo", "bar"); - assertFalse(bulkAction.isOnlySystem(buildBulkRequest(nonSystem), indicesLookup, systemIndices)); + assertFalse(TransportBulkAction.isOnlySystem(buildBulkRequest(nonSystem), indicesLookup, systemIndices)); List mixed = List.of(".foo", ".test", "other"); - assertFalse(bulkAction.isOnlySystem(buildBulkRequest(mixed), indicesLookup, systemIndices)); + assertFalse(TransportBulkAction.isOnlySystem(buildBulkRequest(mixed), indicesLookup, systemIndices)); } public void testRejectCoordination() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java index 3a3343ee814e0..9eebbaed55bed 100644 --- a/server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java +++ b/server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java @@ -70,7 +70,7 @@ public void testExecuteVerboseItem() throws Exception { CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -99,7 +99,7 @@ public void testExecuteItem() throws Exception { Pipeline pipeline = new Pipeline("_id", "_description", version, null, new CompoundProcessor(processor, processor)); CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, false, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, false, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -119,7 +119,7 @@ public void testExecuteVerboseItemExceptionWithoutOnFailure() throws Exception { Pipeline pipeline = new Pipeline("_id", "_description", version, null, new CompoundProcessor(processor1, processor2, processor3)); CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -157,7 +157,7 @@ public void testExecuteVerboseItemWithOnFailure() throws Exception { ); CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -200,7 +200,7 @@ public void testExecuteVerboseItemExceptionWithIgnoreFailure() throws Exception Pipeline pipeline = new Pipeline("_id", "_description", version, null, new CompoundProcessor(processor)); CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -221,7 +221,7 @@ public void testExecuteVerboseItemWithoutExceptionAndWithIgnoreFailure() throws Pipeline pipeline = new Pipeline("_id", "_description", version, null, new CompoundProcessor(processor)); CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -241,7 +241,7 @@ public void testExecuteItemWithFailure() throws Exception { Pipeline pipeline = new Pipeline("_id", "_description", version, null, new CompoundProcessor(processor, processor)); CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, false, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, false, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -264,7 +264,7 @@ public void testDropDocument() throws Exception { CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, false, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, false, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -284,7 +284,7 @@ public void testDropDocumentVerbose() throws Exception { CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { holder.set(r); latch.countDown(); }); @@ -308,7 +308,7 @@ public void testDropDocumentVerboseExtraProcessor() throws Exception { CountDownLatch latch = new CountDownLatch(1); AtomicReference holder = new AtomicReference<>(); - executionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { + SimulateExecutionService.executeDocument(pipeline, ingestDocument, true, (r, e) -> { holder.set(r); latch.countDown(); }); diff --git a/server/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java index dfd1dc5aae9ee..82e579ce7eb36 100644 --- a/server/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java @@ -85,7 +85,6 @@ public void testShortcutQueryAndFetchOptimization() { FetchSearchPhase phase = new FetchSearchPhase( results, - controller, null, mockSearchPhaseContext, (searchResponse, scrollId) -> new SearchPhase("test") { @@ -188,7 +187,6 @@ public void sendExecuteFetch( }; FetchSearchPhase phase = new FetchSearchPhase( results, - controller, null, mockSearchPhaseContext, (searchResponse, scrollId) -> new SearchPhase("test") { @@ -281,7 +279,6 @@ public void sendExecuteFetch( }; FetchSearchPhase phase = new FetchSearchPhase( results, - controller, null, mockSearchPhaseContext, (searchResponse, scrollId) -> new SearchPhase("test") { @@ -377,7 +374,6 @@ public void sendExecuteFetch( CountDownLatch latch = new CountDownLatch(1); FetchSearchPhase phase = new FetchSearchPhase( results, - controller, null, mockSearchPhaseContext, (searchResponse, scrollId) -> new SearchPhase("test") { @@ -496,7 +492,6 @@ public void sendExecuteFetch( }; FetchSearchPhase phase = new FetchSearchPhase( results, - controller, null, mockSearchPhaseContext, (searchResponse, scrollId) -> new SearchPhase("test") { @@ -584,7 +579,6 @@ public void sendExecuteFetch( }; FetchSearchPhase phase = new FetchSearchPhase( results, - controller, null, mockSearchPhaseContext, (searchResponse, scrollId) -> new SearchPhase("test") { diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java index 9b170e72c45b1..5bfe68fe9637b 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java @@ -239,7 +239,7 @@ public void testMerge() { boolean profile = randomBoolean(); for (int trackTotalHits : new int[] { SearchContext.TRACK_TOTAL_HITS_DISABLED, SearchContext.TRACK_TOTAL_HITS_ACCURATE }) { AtomicArray queryResults = generateQueryResults(nShards, suggestions, queryResultSize, false, profile); - SearchPhaseController.ReducedQueryPhase reducedQueryPhase = searchPhaseController.reducedQueryPhase( + SearchPhaseController.ReducedQueryPhase reducedQueryPhase = SearchPhaseController.reducedQueryPhase( queryResults.asList(), new ArrayList<>(), new ArrayList<>(), @@ -256,7 +256,7 @@ public void testMerge() { reducedQueryPhase.suggest(), profile ); - InternalSearchResponse mergedResponse = searchPhaseController.merge( + InternalSearchResponse mergedResponse = SearchPhaseController.merge( false, reducedQueryPhase, fetchResults.asList(), diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java index a7c82b74fc1c5..8f35c43459dba 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java @@ -185,7 +185,6 @@ public void sendExecuteQuery( (clusterAlias, node) -> lookup.get(node), Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), Collections.emptyMap(), - controller, EsExecutors.DIRECT_EXECUTOR_SERVICE, resultConsumer, searchRequest, @@ -315,7 +314,6 @@ private void testMixedVersionsShardsSearch(Version oldVersion, Version newVersio (clusterAlias, node) -> lookup.get(node), Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), Collections.emptyMap(), - controller, EsExecutors.DIRECT_EXECUTOR_SERVICE, resultConsumer, searchRequest, @@ -457,7 +455,6 @@ public void sendExecuteQuery( (clusterAlias, node) -> lookup.get(node), Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), Collections.emptyMap(), - controller, EsExecutors.DIRECT_EXECUTOR_SERVICE, resultConsumer, searchRequest, @@ -600,7 +597,6 @@ public void sendExecuteQuery( (clusterAlias, node) -> lookup.get(node), Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), Collections.emptyMap(), - controller, EsExecutors.DIRECT_EXECUTOR_SERVICE, resultConsumer, searchRequest, diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java index 3a2849cf54efc..829041bc221fa 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java @@ -56,7 +56,7 @@ public void testSendRequestsToNodes() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AtomicInteger movedCounter = new AtomicInteger(0); SearchScrollAsyncAction action = new SearchScrollAsyncAction< - SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, dummyListener(), null, request, null) { + SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, dummyListener(), request, null) { @Override protected void executeInitialPhase( Transport.Connection connection, @@ -153,7 +153,7 @@ public void onFailure(Exception e) { } }; SearchScrollAsyncAction action = new SearchScrollAsyncAction< - SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, listener, null, request, null) { + SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, listener, request, null) { @Override protected void executeInitialPhase( Transport.Connection connection, @@ -226,7 +226,7 @@ public void testNodeNotAvailable() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AtomicInteger movedCounter = new AtomicInteger(0); SearchScrollAsyncAction action = new SearchScrollAsyncAction< - SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, dummyListener(), null, request, null) { + SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, dummyListener(), request, null) { @Override protected void executeInitialPhase( Transport.Connection connection, @@ -311,7 +311,7 @@ public void testShardFailures() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AtomicInteger movedCounter = new AtomicInteger(0); SearchScrollAsyncAction action = new SearchScrollAsyncAction< - SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, dummyListener(), null, request, null) { + SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, dummyListener(), request, null) { @Override protected void executeInitialPhase( Transport.Connection connection, @@ -414,7 +414,7 @@ public void onFailure(Exception e) { } }; SearchScrollAsyncAction action = new SearchScrollAsyncAction< - SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, listener, null, request, null) { + SearchAsyncActionTests.TestSearchPhaseResult>(scrollId, logger, discoveryNodes, listener, request, null) { @Override protected void executeInitialPhase( Transport.Connection connection, diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java index e2ca878c02878..8a889956781b1 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java @@ -1127,7 +1127,7 @@ public void testPrimaryActionRejectsWrongAidOrWrongTerm() throws Exception { } catch (ExecutionException execException) { Throwable throwable = execException.getCause(); logger.debug("got exception:", throwable); - assertTrue(throwable.getClass() + " is not a retry exception", action.retryPrimaryException(throwable)); + assertTrue(throwable.getClass() + " is not a retry exception", TransportReplicationAction.retryPrimaryException(throwable)); if (wrongAllocationId) { assertThat( throwable.getMessage(), @@ -1178,7 +1178,7 @@ public void testReplicaActionRejectsWrongAid() throws Exception { fail("using a wrong aid didn't fail the operation"); } catch (ExecutionException execException) { Throwable throwable = execException.getCause(); - if (action.retryPrimaryException(throwable) == false) { + if (TransportReplicationAction.retryPrimaryException(throwable) == false) { throw new AssertionError("thrown exception is not retriable", throwable); } assertThat(throwable.getMessage(), containsString("_not_a_valid_aid_")); @@ -1359,7 +1359,9 @@ public void testIsRetryableClusterBlockException() { shardStateAction, threadPool ); - assertFalse(action.isRetryableClusterBlockException(randomRetryPrimaryException(new ShardId("index", "_na_", 0)))); + assertFalse( + TransportReplicationAction.isRetryableClusterBlockException(randomRetryPrimaryException(new ShardId("index", "_na_", 0))) + ); final boolean retryable = randomBoolean(); ClusterBlock randomBlock = new ClusterBlock( @@ -1371,7 +1373,10 @@ public void testIsRetryableClusterBlockException() { randomFrom(RestStatus.values()), EnumSet.of(randomFrom(ClusterBlockLevel.values())) ); - assertEquals(retryable, action.isRetryableClusterBlockException(new ClusterBlockException(singleton(randomBlock)))); + assertEquals( + retryable, + TransportReplicationAction.isRetryableClusterBlockException(new ClusterBlockException(singleton(randomBlock))) + ); } private void assertConcreteShardRequest(TransportRequest capturedRequest, Request expectedRequest, AllocationId expectedAllocationId) { diff --git a/server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java b/server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java index 95c02ecc25dbc..5ee90a2f38684 100644 --- a/server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java @@ -557,13 +557,13 @@ public void testNoopDetection() throws Exception { createParser(JsonXContent.jsonXContent, new BytesArray("{\"doc\": {\"body\": \"foo\"}}")) ); - UpdateHelper.Result result = updateHelper.prepareUpdateIndexRequest(shardId, request, getResult, true); + UpdateHelper.Result result = UpdateHelper.prepareUpdateIndexRequest(shardId, request, getResult, true); assertThat(result.action(), instanceOf(UpdateResponse.class)); assertThat(result.getResponseResult(), equalTo(DocWriteResponse.Result.NOOP)); // Try again, with detectNoop turned off - result = updateHelper.prepareUpdateIndexRequest(shardId, request, getResult, false); + result = UpdateHelper.prepareUpdateIndexRequest(shardId, request, getResult, false); assertThat(result.action(), instanceOf(IndexRequest.class)); assertThat(result.getResponseResult(), equalTo(DocWriteResponse.Result.UPDATED)); assertThat(result.updatedSourceAsMap().get("body").toString(), equalTo("foo")); @@ -572,7 +572,7 @@ public void testNoopDetection() throws Exception { request = new UpdateRequest("test", "1").fromXContent( createParser(JsonXContent.jsonXContent, new BytesArray("{\"doc\": {\"body\": \"bar\"}}")) ); - result = updateHelper.prepareUpdateIndexRequest(shardId, request, getResult, true); + result = UpdateHelper.prepareUpdateIndexRequest(shardId, request, getResult, true); assertThat(result.action(), instanceOf(IndexRequest.class)); assertThat(result.getResponseResult(), equalTo(DocWriteResponse.Result.UPDATED)); diff --git a/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java b/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java index 351d58cb743ba..4b89caf443a29 100644 --- a/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java +++ b/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java @@ -229,13 +229,16 @@ public void testMaxMapCountCheckRead() throws IOException { final BufferedReader reader = mock(BufferedReader.class); when(reader.readLine()).thenReturn(rawProcSysVmMaxMapCount); final BootstrapChecks.MaxMapCountCheck check = new BootstrapChecks.MaxMapCountCheck(); - assertThat(check.readProcSysVmMaxMapCount(reader), equalTo(rawProcSysVmMaxMapCount)); + assertThat(BootstrapChecks.MaxMapCountCheck.readProcSysVmMaxMapCount(reader), equalTo(rawProcSysVmMaxMapCount)); } public void testMaxMapCountCheckParse() { final long procSysVmMaxMapCount = randomIntBetween(1, Integer.MAX_VALUE); final BootstrapChecks.MaxMapCountCheck check = new BootstrapChecks.MaxMapCountCheck(); - assertThat(check.parseProcSysVmMaxMapCount(Long.toString(procSysVmMaxMapCount)), equalTo(procSysVmMaxMapCount)); + assertThat( + BootstrapChecks.MaxMapCountCheck.parseProcSysVmMaxMapCount(Long.toString(procSysVmMaxMapCount)), + equalTo(procSysVmMaxMapCount) + ); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java index efa8146bdaf51..aa23d6eecd0ef 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java @@ -18,7 +18,6 @@ public class ClusterNameExpressionResolverTests extends ESTestCase { - private ClusterNameExpressionResolver clusterNameResolver = new ClusterNameExpressionResolver(); private static final Set remoteClusters = new HashSet<>(); static { @@ -28,39 +27,39 @@ public class ClusterNameExpressionResolverTests extends ESTestCase { } public void testExactMatch() { - List clusters = clusterNameResolver.resolveClusterNames(remoteClusters, "totallyDifferent"); + List clusters = ClusterNameExpressionResolver.resolveClusterNames(remoteClusters, "totallyDifferent"); assertEquals(new HashSet<>(Arrays.asList("totallyDifferent")), new HashSet<>(clusters)); } public void testNoWildCardNoMatch() { expectThrows( NoSuchRemoteClusterException.class, - () -> clusterNameResolver.resolveClusterNames(remoteClusters, "totallyDifferent2") + () -> ClusterNameExpressionResolver.resolveClusterNames(remoteClusters, "totallyDifferent2") ); } public void testWildCardNoMatch() { - List clusters = clusterNameResolver.resolveClusterNames(remoteClusters, "totally*2"); + List clusters = ClusterNameExpressionResolver.resolveClusterNames(remoteClusters, "totally*2"); assertTrue(clusters.isEmpty()); } public void testSimpleWildCard() { - List clusters = clusterNameResolver.resolveClusterNames(remoteClusters, "*"); + List clusters = ClusterNameExpressionResolver.resolveClusterNames(remoteClusters, "*"); assertEquals(new HashSet<>(Arrays.asList("cluster1", "cluster2", "totallyDifferent")), new HashSet<>(clusters)); } public void testSuffixWildCard() { - List clusters = clusterNameResolver.resolveClusterNames(remoteClusters, "cluster*"); + List clusters = ClusterNameExpressionResolver.resolveClusterNames(remoteClusters, "cluster*"); assertEquals(new HashSet<>(Arrays.asList("cluster1", "cluster2")), new HashSet<>(clusters)); } public void testPrefixWildCard() { - List clusters = clusterNameResolver.resolveClusterNames(remoteClusters, "*Different"); + List clusters = ClusterNameExpressionResolver.resolveClusterNames(remoteClusters, "*Different"); assertEquals(new HashSet<>(Arrays.asList("totallyDifferent")), new HashSet<>(clusters)); } public void testMiddleWildCard() { - List clusters = clusterNameResolver.resolveClusterNames(remoteClusters, "clu*1"); + List clusters = ClusterNameExpressionResolver.resolveClusterNames(remoteClusters, "clu*1"); assertEquals(new HashSet<>(Arrays.asList("cluster1")), new HashSet<>(clusters)); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java index 7ec506bc297be..45954541dd7b1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java @@ -107,7 +107,9 @@ private static Map randomAliases() { private static CompressedXContent randomMappings(ComposableIndexTemplate.DataStreamTemplate dataStreamTemplate) { try { if (dataStreamTemplate != null) { - return new CompressedXContent("{\"properties\":{\"" + dataStreamTemplate.getTimestampField() + "\":{\"type\":\"date\"}}}"); + return new CompressedXContent( + "{\"properties\":{\"" + ComposableIndexTemplate.DataStreamTemplate.getTimestampField() + "\":{\"type\":\"date\"}}}" + ); } else { return new CompressedXContent("{\"properties\":{\"" + randomAlphaOfLength(5) + "\":{\"type\":\"keyword\"}}}"); } diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java index 6c9756b4d8f11..45a33c59fa313 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java @@ -40,7 +40,7 @@ public void testDiffableStringMapDiff() { DiffableStringMap.DiffableStringMapDiff dsmd = (DiffableStringMap.DiffableStringMapDiff) diff; assertThat(dsmd.getDeletes(), containsInAnyOrder("potato")); - assertThat(dsmd.getDiffs().size(), equalTo(0)); + assertThat(DiffableStringMap.DiffableStringMapDiff.getDiffs().size(), equalTo(0)); Map upserts = new HashMap<>(); upserts.put("foo", "not-bar"); upserts.put("newkey", "yay"); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java index c0a90d776b2b0..8a9f155127fc8 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java @@ -592,10 +592,10 @@ public void testValidateIndexName() throws Exception { })); } - private void validateIndexName(MetadataCreateIndexService metadataCreateIndexService, String indexName, String errorMessage) { + private static void validateIndexName(MetadataCreateIndexService metadataCreateIndexService, String indexName, String errorMessage) { InvalidIndexNameException e = expectThrows( InvalidIndexNameException.class, - () -> metadataCreateIndexService.validateIndexName( + () -> MetadataCreateIndexService.validateIndexName( indexName, ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY)).build() ) diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java index ed746ee6bf1ba..898237b81197c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java @@ -669,7 +669,7 @@ public void testAverageUsage() { usages.put("node2", new DiskUsage("node2", "n2", "/dev/null", 100, 50)); // 50% used usages.put("node3", new DiskUsage("node3", "n3", "/dev/null", 100, 0)); // 100% used - DiskUsage node1Usage = decider.averageUsage(rn, usages.build()); + DiskUsage node1Usage = DiskThresholdDecider.averageUsage(rn, usages.build()); assertThat(node1Usage.getTotalBytes(), equalTo(100L)); assertThat(node1Usage.getFreeBytes(), equalTo(25L)); } @@ -681,7 +681,7 @@ public void testFreeDiskPercentageAfterShardAssigned() { usages.put("node2", new DiskUsage("node2", "n2", "/dev/null", 100, 50)); // 50% used usages.put("node3", new DiskUsage("node3", "n3", "/dev/null", 100, 0)); // 100% used - Double after = decider.freeDiskPercentageAfterShardAssigned( + Double after = DiskThresholdDecider.freeDiskPercentageAfterShardAssigned( new DiskThresholdDecider.DiskUsageWithRelocations(new DiskUsage("node2", "n2", "/dev/null", 100, 30), 0L), 11L ); diff --git a/server/src/test/java/org/elasticsearch/common/util/BigArraysTests.java b/server/src/test/java/org/elasticsearch/common/util/BigArraysTests.java index 6031d8144e7af..0ada1f67d1045 100644 --- a/server/src/test/java/org/elasticsearch/common/util/BigArraysTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/BigArraysTests.java @@ -279,42 +279,42 @@ public void testByteArrayEquals() { final ByteArray empty2 = byteArrayWithBytes(BytesRef.EMPTY_BYTES); // identity = equality - assertTrue(bigArrays.equals(empty1, empty1)); + assertTrue(BigArrays.equals(empty1, empty1)); // equality: both empty - assertTrue(bigArrays.equals(empty1, empty2)); + assertTrue(BigArrays.equals(empty1, empty2)); empty1.close(); empty2.close(); // not equal: contents differ final ByteArray a1 = byteArrayWithBytes(new byte[] { 0 }); final ByteArray a2 = byteArrayWithBytes(new byte[] { 1 }); - assertFalse(bigArrays.equals(a1, a2)); + assertFalse(BigArrays.equals(a1, a2)); a1.close(); a2.close(); // not equal: contents differ final ByteArray a3 = byteArrayWithBytes(new byte[] { 1, 2, 3 }); final ByteArray a4 = byteArrayWithBytes(new byte[] { 1, 1, 3 }); - assertFalse(bigArrays.equals(a3, a4)); + assertFalse(BigArrays.equals(a3, a4)); a3.close(); a4.close(); // not equal: contents differ final ByteArray a5 = byteArrayWithBytes(new byte[] { 1, 2, 3 }); final ByteArray a6 = byteArrayWithBytes(new byte[] { 1, 2, 4 }); - assertFalse(bigArrays.equals(a5, a6)); + assertFalse(BigArrays.equals(a5, a6)); a5.close(); a6.close(); } public void testByteArrayHashCode() { // null arg has hashCode 0 - assertEquals(0, bigArrays.hashCode(null)); + assertEquals(0, BigArrays.hashCode(null)); // empty array should have equal hash final int emptyHash = Arrays.hashCode(BytesRef.EMPTY_BYTES); final ByteArray emptyByteArray = byteArrayWithBytes(BytesRef.EMPTY_BYTES); - final int emptyByteArrayHash = bigArrays.hashCode(emptyByteArray); + final int emptyByteArrayHash = BigArrays.hashCode(emptyByteArray); assertEquals(emptyHash, emptyByteArrayHash); emptyByteArray.close(); @@ -327,7 +327,7 @@ public void testByteArrayHashCode() { random().nextBytes(array1); final int array1Hash = Arrays.hashCode(array1); final ByteArray array2 = byteArrayWithBytes(array1); - final int array2Hash = bigArrays.hashCode(array2); + final int array2Hash = BigArrays.hashCode(array2); assertEquals(array1Hash, array2Hash); array2.close(); } diff --git a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java index 1e9a0b3358212..52062d6d1f438 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java @@ -112,7 +112,7 @@ public void testDefaultAnalyzers() throws IOException { public void testOverrideDefaultAnalyzer() throws IOException { Version version = VersionUtils.randomVersion(random()); Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, version).build(); - IndexAnalyzers indexAnalyzers = emptyRegistry.build( + IndexAnalyzers indexAnalyzers = AnalysisRegistry.build( IndexSettingsModule.newIndexSettings("index", settings), singletonMap("default", analyzerProvider("default")), emptyMap(), @@ -149,7 +149,7 @@ public Tokenizer create() { Analyzer analyzer = new CustomAnalyzer(tokenizer, new CharFilterFactory[0], new TokenFilterFactory[] { tokenFilter }); MapperException ex = expectThrows( MapperException.class, - () -> emptyRegistry.build( + () -> AnalysisRegistry.build( IndexSettingsModule.newIndexSettings("index", settings), singletonMap("default", new PreBuiltAnalyzerProvider("default", AnalyzerScope.INDEX, analyzer)), emptyMap(), @@ -187,7 +187,7 @@ public void testOverrideDefaultIndexAnalyzerIsUnsupported() { AnalyzerProvider defaultIndex = new PreBuiltAnalyzerProvider("default_index", AnalyzerScope.INDEX, new EnglishAnalyzer()); IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> emptyRegistry.build( + () -> AnalysisRegistry.build( IndexSettingsModule.newIndexSettings("index", settings), singletonMap("default_index", defaultIndex), emptyMap(), @@ -202,7 +202,7 @@ public void testOverrideDefaultIndexAnalyzerIsUnsupported() { public void testOverrideDefaultSearchAnalyzer() { Version version = VersionUtils.randomVersion(random()); Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, version).build(); - IndexAnalyzers indexAnalyzers = emptyRegistry.build( + IndexAnalyzers indexAnalyzers = AnalysisRegistry.build( IndexSettingsModule.newIndexSettings("index", settings), singletonMap("default_search", analyzerProvider("default_search")), emptyMap(), diff --git a/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java index e166ce48982fa..9511b571bdc6b 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java @@ -88,7 +88,7 @@ public void testAddIndices() throws IOException { Directory target = newFSDirectory(createTempDir()); final long maxSeqNo = randomNonNegativeLong(); final long maxUnsafeAutoIdTimestamp = randomNonNegativeLong(); - storeRecovery.addIndices(indexStats, target, indexSort, dirs, maxSeqNo, maxUnsafeAutoIdTimestamp, null, 0, false, false); + StoreRecovery.addIndices(indexStats, target, indexSort, dirs, maxSeqNo, maxUnsafeAutoIdTimestamp, null, 0, false, false); int numFiles = 0; Predicate filesFilter = (f) -> f.startsWith("segments") == false && f.equals("write.lock") == false @@ -163,7 +163,7 @@ public void testSplitShard() throws IOException { .setRoutingNumShards(numShards * 1000000) .numberOfReplicas(0) .build(); - storeRecovery.addIndices( + StoreRecovery.addIndices( indexStats, target, indexSort, diff --git a/server/src/test/java/org/elasticsearch/index/store/FsDirectoryFactoryTests.java b/server/src/test/java/org/elasticsearch/index/store/FsDirectoryFactoryTests.java index 907c769d86e27..2a383d8e101f9 100644 --- a/server/src/test/java/org/elasticsearch/index/store/FsDirectoryFactoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/store/FsDirectoryFactoryTests.java @@ -46,16 +46,16 @@ public void testPreload() throws IOException { try (Directory directory = newDirectory(build)) { assertTrue(FsDirectoryFactory.isHybridFs(directory)); FsDirectoryFactory.HybridDirectory hybridDirectory = (FsDirectoryFactory.HybridDirectory) directory; - assertTrue(hybridDirectory.useDelegate("foo.dvd", newIOContext(random()))); - assertTrue(hybridDirectory.useDelegate("foo.nvd", newIOContext(random()))); - assertTrue(hybridDirectory.useDelegate("foo.tim", newIOContext(random()))); - assertTrue(hybridDirectory.useDelegate("foo.tip", newIOContext(random()))); - assertTrue(hybridDirectory.useDelegate("foo.cfs", newIOContext(random()))); - assertTrue(hybridDirectory.useDelegate("foo.dim", newIOContext(random()))); - assertTrue(hybridDirectory.useDelegate("foo.kdd", newIOContext(random()))); - assertTrue(hybridDirectory.useDelegate("foo.kdi", newIOContext(random()))); - assertFalse(hybridDirectory.useDelegate("foo.kdi", Store.READONCE_CHECKSUM)); - assertFalse(hybridDirectory.useDelegate("foo.tmp", newIOContext(random()))); + assertTrue(FsDirectoryFactory.HybridDirectory.useDelegate("foo.dvd", newIOContext(random()))); + assertTrue(FsDirectoryFactory.HybridDirectory.useDelegate("foo.nvd", newIOContext(random()))); + assertTrue(FsDirectoryFactory.HybridDirectory.useDelegate("foo.tim", newIOContext(random()))); + assertTrue(FsDirectoryFactory.HybridDirectory.useDelegate("foo.tip", newIOContext(random()))); + assertTrue(FsDirectoryFactory.HybridDirectory.useDelegate("foo.cfs", newIOContext(random()))); + assertTrue(FsDirectoryFactory.HybridDirectory.useDelegate("foo.dim", newIOContext(random()))); + assertTrue(FsDirectoryFactory.HybridDirectory.useDelegate("foo.kdd", newIOContext(random()))); + assertTrue(FsDirectoryFactory.HybridDirectory.useDelegate("foo.kdi", newIOContext(random()))); + assertFalse(FsDirectoryFactory.HybridDirectory.useDelegate("foo.kdi", Store.READONCE_CHECKSUM)); + assertFalse(FsDirectoryFactory.HybridDirectory.useDelegate("foo.tmp", newIOContext(random()))); MMapDirectory delegate = hybridDirectory.getDelegate(); assertThat(delegate, Matchers.instanceOf(FsDirectoryFactory.PreLoadMMapDirectory.class)); FsDirectoryFactory.PreLoadMMapDirectory preLoadMMapDirectory = (FsDirectoryFactory.PreLoadMMapDirectory) delegate; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java index 1916acc99e65b..688d4c36d32cb 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java @@ -543,7 +543,7 @@ public void testStatsByShardDoesNotDieFromExpectedExceptions() { // real one, which has a logger defined final IndicesService indicesService = getIndicesService(); - final Map> indexStats = indicesService.statsByShard(mockIndicesService, CommonStatsFlags.ALL); + final Map> indexStats = IndicesService.statsByShard(mockIndicesService, CommonStatsFlags.ALL); assertThat(indexStats.isEmpty(), equalTo(false)); assertThat("index not defined", indexStats.containsKey(index), equalTo(true)); diff --git a/server/src/test/java/org/elasticsearch/indices/SystemIndexManagerTests.java b/server/src/test/java/org/elasticsearch/indices/SystemIndexManagerTests.java index 7212fc9266d61..1578a1753d2a0 100644 --- a/server/src/test/java/org/elasticsearch/indices/SystemIndexManagerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/SystemIndexManagerTests.java @@ -173,22 +173,18 @@ public void testManagerSkipsDescriptorsForIndicesThatDoNotExist() { * Check that the manager won't try to upgrade closed indices. */ public void testManagerSkipsClosedIndices() { - SystemIndices systemIndices = new SystemIndices(Map.of("MyIndex", FEATURE)); - SystemIndexManager manager = new SystemIndexManager(systemIndices, client); - final ClusterState.Builder clusterStateBuilder = createClusterState(IndexMetadata.State.CLOSE); - - assertThat(manager.getUpgradeStatus(clusterStateBuilder.build(), DESCRIPTOR), equalTo(UpgradeStatus.CLOSED)); + assertThat(SystemIndexManager.getUpgradeStatus(clusterStateBuilder.build(), DESCRIPTOR), equalTo(UpgradeStatus.CLOSED)); } /** * Check that the manager won't try to upgrade unhealthy indices. */ public void testManagerSkipsIndicesWithRedStatus() { - SystemIndices systemIndices = new SystemIndices(Map.of("MyIndex", FEATURE)); - SystemIndexManager manager = new SystemIndexManager(systemIndices, client); - - assertThat(manager.getUpgradeStatus(markShardsUnavailable(createClusterState()), DESCRIPTOR), equalTo(UpgradeStatus.UNHEALTHY)); + assertThat( + SystemIndexManager.getUpgradeStatus(markShardsUnavailable(createClusterState()), DESCRIPTOR), + equalTo(UpgradeStatus.UNHEALTHY) + ); } /** @@ -196,31 +192,31 @@ public void testManagerSkipsIndicesWithRedStatus() { * is earlier than an expected value. */ public void testManagerSkipsIndicesWithOutdatedFormat() { - SystemIndices systemIndices = new SystemIndices(Map.of("MyIndex", FEATURE)); - SystemIndexManager manager = new SystemIndexManager(systemIndices, client); - - assertThat(manager.getUpgradeStatus(markShardsAvailable(createClusterState(5)), DESCRIPTOR), equalTo(UpgradeStatus.NEEDS_UPGRADE)); + assertThat( + SystemIndexManager.getUpgradeStatus(markShardsAvailable(createClusterState(5)), DESCRIPTOR), + equalTo(UpgradeStatus.NEEDS_UPGRADE) + ); } /** * Check that the manager won't try to upgrade indices where their mappings are already up-to-date. */ public void testManagerSkipsIndicesWithUpToDateMappings() { - SystemIndices systemIndices = new SystemIndices(Map.of("MyIndex", FEATURE)); - SystemIndexManager manager = new SystemIndexManager(systemIndices, client); - - assertThat(manager.getUpgradeStatus(markShardsAvailable(createClusterState()), DESCRIPTOR), equalTo(UpgradeStatus.UP_TO_DATE)); + assertThat( + SystemIndexManager.getUpgradeStatus(markShardsAvailable(createClusterState()), DESCRIPTOR), + equalTo(UpgradeStatus.UP_TO_DATE) + ); } /** * Check that the manager will try to upgrade indices where their mappings are out-of-date. */ public void testManagerProcessesIndicesWithOutdatedMappings() { - SystemIndices systemIndices = new SystemIndices(Map.of("MyIndex", FEATURE)); - SystemIndexManager manager = new SystemIndexManager(systemIndices, client); - assertThat( - manager.getUpgradeStatus(markShardsAvailable(createClusterState(Strings.toString(getMappings("1.0.0")))), DESCRIPTOR), + SystemIndexManager.getUpgradeStatus( + markShardsAvailable(createClusterState(Strings.toString(getMappings("1.0.0")))), + DESCRIPTOR + ), equalTo(UpgradeStatus.NEEDS_MAPPINGS_UPDATE) ); } @@ -229,11 +225,11 @@ public void testManagerProcessesIndicesWithOutdatedMappings() { * Check that the manager will try to upgrade indices where the mappings metadata is null or absent. */ public void testManagerProcessesIndicesWithNullMetadata() { - SystemIndices systemIndices = new SystemIndices(Map.of("MyIndex", FEATURE)); - SystemIndexManager manager = new SystemIndexManager(systemIndices, client); - assertThat( - manager.getUpgradeStatus(markShardsAvailable(createClusterState(Strings.toString(getMappings(builder -> {})))), DESCRIPTOR), + SystemIndexManager.getUpgradeStatus( + markShardsAvailable(createClusterState(Strings.toString(getMappings(builder -> {})))), + DESCRIPTOR + ), equalTo(UpgradeStatus.NEEDS_MAPPINGS_UPDATE) ); } @@ -242,11 +238,11 @@ public void testManagerProcessesIndicesWithNullMetadata() { * Check that the manager will try to upgrade indices where the version in the metadata is null or absent. */ public void testManagerProcessesIndicesWithNullVersionMetadata() { - SystemIndices systemIndices = new SystemIndices(Map.of("MyIndex", FEATURE)); - SystemIndexManager manager = new SystemIndexManager(systemIndices, client); - assertThat( - manager.getUpgradeStatus(markShardsAvailable(createClusterState(Strings.toString(getMappings((String) null)))), DESCRIPTOR), + SystemIndexManager.getUpgradeStatus( + markShardsAvailable(createClusterState(Strings.toString(getMappings((String) null)))), + DESCRIPTOR + ), equalTo(UpgradeStatus.NEEDS_MAPPINGS_UPDATE) ); } @@ -267,11 +263,8 @@ public void testManagerSubmitsPutRequest() { * Check that this */ public void testCanHandleIntegerMetaVersion() { - SystemIndices systemIndices = new SystemIndices(Map.of("MyIndex", FEATURE)); - SystemIndexManager manager = new SystemIndexManager(systemIndices, client); - assertThat( - manager.getUpgradeStatus(markShardsAvailable(createClusterState(Strings.toString(getMappings(3)))), DESCRIPTOR), + SystemIndexManager.getUpgradeStatus(markShardsAvailable(createClusterState(Strings.toString(getMappings(3)))), DESCRIPTOR), equalTo(UpgradeStatus.NEEDS_MAPPINGS_UPDATE) ); } diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/HotThreadsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/HotThreadsTests.java index a00f4df9bd25e..733c08a87bcf9 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/HotThreadsTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/HotThreadsTests.java @@ -200,14 +200,14 @@ class SimilarityTestCase { when(threadTwo.getThreadName()).thenReturn("Thread Two"); when(threadTwo.getStackTrace()).thenReturn(testCase.two); - assertEquals(testCase.similarityScore, hotThreads.similarity(threadOne, threadTwo)); + assertEquals(testCase.similarityScore, HotThreads.similarity(threadOne, threadTwo)); } ThreadInfo threadOne = mock(ThreadInfo.class); when(threadOne.getThreadName()).thenReturn("Thread One"); when(threadOne.getStackTrace()).thenReturn(testCases[0].one); - assertEquals(0, hotThreads.similarity(threadOne, null)); + assertEquals(0, HotThreads.similarity(threadOne, null)); } private ThreadInfo makeThreadInfoMocksHelper(ThreadMXBean mockedMXBean, long threadId) { @@ -269,7 +269,7 @@ private ThreadMXBean makeMockMXBeanHelper() { return mockedMXBean; } - private SunThreadInfo makeMockSunThreadInfoHelper() { + private static SunThreadInfo makeMockSunThreadInfoHelper() { SunThreadInfo mockedSunThreadInfo = mock(SunThreadInfo.class); when(mockedSunThreadInfo.isThreadAllocatedMemorySupported()).thenReturn(true); when(mockedSunThreadInfo.isThreadAllocatedMemoryEnabled()).thenReturn(true); diff --git a/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java index 369cf12147663..0a00a0db8189f 100644 --- a/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java @@ -22,11 +22,10 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; public class ProcessProbeTests extends ESTestCase { - private final ProcessProbe probe = ProcessProbe.getInstance(); public void testProcessInfo() { long refreshInterval = randomNonNegativeLong(); - ProcessInfo info = probe.processInfo(refreshInterval); + ProcessInfo info = ProcessProbe.processInfo(refreshInterval); assertNotNull(info); assertEquals(refreshInterval, info.getRefreshInterval()); assertEquals(jvmInfo().pid(), info.getId()); @@ -34,7 +33,7 @@ public void testProcessInfo() { } public void testProcessStats() { - ProcessStats stats = probe.processStats(); + ProcessStats stats = ProcessProbe.processStats(); assertNotNull(stats); assertThat(stats.getTimestamp(), greaterThan(0L)); diff --git a/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexActionTests.java index 8ae4895a8f361..5661008c31407 100644 --- a/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexActionTests.java +++ b/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexActionTests.java @@ -147,7 +147,7 @@ public void testTypeInMapping() throws IOException { .withContent(new BytesArray(content), null) .build(); - CreateIndexRequest createIndexRequest = action.prepareRequestV7(request); + CreateIndexRequest createIndexRequest = RestCreateIndexAction.prepareRequestV7(request); // some_type is replaced with _doc assertThat(createIndexRequest.mappings(), equalTo(""" {"_doc":{"properties":{"field1":{"type":"text"}}}}""")); diff --git a/server/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java index 718faf5993a7f..32616445371f8 100644 --- a/server/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java +++ b/server/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java @@ -54,10 +54,10 @@ public void testCreateOpTypeValidation() { RestIndexAction.CreateHandler create = new CreateHandler(); String opType = randomFrom("CREATE", null); - create.validateOpType(opType); + CreateHandler.validateOpType(opType); String illegalOpType = randomFrom("index", "unknown", ""); - IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> create.validateOpType(illegalOpType)); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> CreateHandler.validateOpType(illegalOpType)); assertThat(e.getMessage(), equalTo("opType must be 'create', found: [" + illegalOpType + "]")); } diff --git a/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java index 45dc96062383b..867bb04c8ad88 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java +++ b/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java @@ -456,10 +456,10 @@ public void testGetStoredScript() throws Exception { ) .build(); - assertEquals("abc", scriptService.getStoredScript(cs, new GetStoredScriptRequest("_id")).getSource()); + assertEquals("abc", ScriptService.getStoredScript(cs, new GetStoredScriptRequest("_id")).getSource()); cs = ClusterState.builder(new ClusterName("_name")).build(); - assertNull(scriptService.getStoredScript(cs, new GetStoredScriptRequest("_id"))); + assertNull(ScriptService.getStoredScript(cs, new GetStoredScriptRequest("_id"))); } public void testMaxSizeLimit() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/search/runtime/AbstractScriptFieldQueryTests.java b/server/src/test/java/org/elasticsearch/search/runtime/AbstractScriptFieldQueryTests.java index 5f7838915b5af..d385bc02d183c 100644 --- a/server/src/test/java/org/elasticsearch/search/runtime/AbstractScriptFieldQueryTests.java +++ b/server/src/test/java/org/elasticsearch/search/runtime/AbstractScriptFieldQueryTests.java @@ -37,7 +37,7 @@ public String toString(String field) { float boost = randomBoolean() ? 1.0f : randomFloat(); String dummyDescription = randomAlphaOfLength(10); assertThat( - query.explainMatch(boost, dummyDescription), + AbstractScriptFieldQuery.explainMatch(boost, dummyDescription), equalTo( Explanation.match( boost, diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java index eb5dc58d9a94b..d607492ac0d6e 100644 --- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java @@ -2019,7 +2019,6 @@ protected void assertSnapshotOrGenericThread() { transportService, clusterService, repositoriesService, - snapshotsService, threadPool, actionFilters, indexNameExpressionResolver diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java index ed19fb7e86470..1476d7e12516d 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java @@ -390,7 +390,6 @@ public Map getInternalRepositories( Repository.Factory repositoryFactory = (metadata) -> new CcrRepository( metadata, client, - ccrLicenseChecker, settings, ccrSettings.get(), clusterService.getClusterApplierService().threadPool() diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrLicenseChecker.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrLicenseChecker.java index c9af16f1d4542..b27b60b64113b 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrLicenseChecker.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CcrLicenseChecker.java @@ -189,7 +189,7 @@ public void checkRemoteClusterLicenseAndFetchLeaderIndexMetadataAndHistoryUUIDs( * @param onFailure the failure consumer * @param leaderClusterStateConsumer the leader cluster state consumer */ - public void checkRemoteClusterLicenseAndFetchClusterState( + public static void checkRemoteClusterLicenseAndFetchClusterState( final Client client, final String clusterAlias, final ClusterStateRequest request, @@ -230,7 +230,7 @@ public void checkRemoteClusterLicenseAndFetchClusterState( * @param nonCompliantLicense the supplier for when the license state of the remote cluster is non-compliant * @param unknownLicense the supplier for when the license state of the remote cluster is unknown due to failure */ - private void checkRemoteClusterLicenseAndFetchClusterState( + private static void checkRemoteClusterLicenseAndFetchClusterState( final Client client, final String clusterAlias, final Client remoteClient, @@ -278,7 +278,7 @@ public void onFailure(final Exception e) { */ // NOTE: Placed this method here; in order to avoid duplication of logic for fetching history UUIDs // in case of following a local or a remote cluster. - public void fetchLeaderHistoryUUIDs( + public static void fetchLeaderHistoryUUIDs( final Client remoteClient, final IndexMetadata leaderIndexMetadata, final Consumer onFailure, @@ -432,12 +432,6 @@ protected void }; } - private static ThreadContext.StoredContext stashWithHeaders(ThreadContext threadContext, Map headers) { - final ThreadContext.StoredContext storedContext = threadContext.stashContext(); - threadContext.copyHeaders(headers.entrySet()); - return storedContext; - } - private static ElasticsearchStatusException indexMetadataNonCompliantRemoteLicense( final String leaderIndex, final RemoteClusterLicenseChecker.LicenseCheck licenseCheck diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java index ec42b1f0a3d7f..5bbef16c5c2ff 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java @@ -289,7 +289,7 @@ void getRemoteClusterState( request.waitForMetadataVersion(metadataVersion); request.waitForTimeout(waitForMetadataTimeOut); // TODO: set non-compliant status on auto-follow coordination that can be viewed via a stats API - ccrLicenseChecker.checkRemoteClusterLicenseAndFetchClusterState( + CcrLicenseChecker.checkRemoteClusterLicenseAndFetchClusterState( client, remoteCluster, request, diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java index 8e51e273286e5..3de59da4452e2 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java @@ -126,7 +126,7 @@ public ClusterState execute(ClusterState currentState) { clusterStateRequest.clear(); clusterStateRequest.metadata(true); - ccrLicenseChecker.checkRemoteClusterLicenseAndFetchClusterState( + CcrLicenseChecker.checkRemoteClusterLicenseAndFetchClusterState( client, request.getRemoteCluster(), clusterStateRequest, diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportUnfollowAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportUnfollowAction.java index 78ac63ce7f2e1..2d39aedd4b119 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportUnfollowAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportUnfollowAction.java @@ -193,7 +193,7 @@ private void removeRetentionLeaseForShard( } } - private void handleException( + private static void handleException( final ShardId followerShardId, final String retentionLeaseId, final ShardId leaderShardId, diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java index f503d2d0e6094..64a40a66fe552 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngine.java @@ -56,7 +56,7 @@ private static EngineConfig validateEngineConfig(final EngineConfig engineConfig return engineConfig; } - private void preFlight(final Operation operation) { + private static void preFlight(final Operation operation) { assert FollowingEngineAssertions.preFlight(operation); if (operation.seqNo() == SequenceNumbers.UNASSIGNED_SEQ_NO) { throw new ElasticsearchStatusException( diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java index 8e1d388cea090..d188d36f6030f 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java @@ -133,25 +133,16 @@ public class CcrRepository extends AbstractLifecycleComponent implements Reposit private final String localClusterName; private final String remoteClusterAlias; private final Client client; - private final CcrLicenseChecker ccrLicenseChecker; private final ThreadPool threadPool; private final CounterMetric throttledTime = new CounterMetric(); - public CcrRepository( - RepositoryMetadata metadata, - Client client, - CcrLicenseChecker ccrLicenseChecker, - Settings settings, - CcrSettings ccrSettings, - ThreadPool threadPool - ) { + public CcrRepository(RepositoryMetadata metadata, Client client, Settings settings, CcrSettings ccrSettings, ThreadPool threadPool) { this.metadata = metadata; this.ccrSettings = ccrSettings; this.localClusterName = ClusterName.CLUSTER_NAME_SETTING.get(settings).value(); assert metadata.name().startsWith(NAME_PREFIX) : "CcrRepository metadata.name() must start with: " + NAME_PREFIX; this.remoteClusterAlias = Strings.split(metadata.name(), NAME_PREFIX)[1]; - this.ccrLicenseChecker = ccrLicenseChecker; this.client = client; this.threadPool = threadPool; } @@ -241,7 +232,7 @@ public IndexMetadata getSnapshotIndexMetaData(RepositoryData repositoryData, Sna // Validates whether the leader cluster has been configured properly: PlainActionFuture future = PlainActionFuture.newFuture(); IndexMetadata leaderIndexMetadata = clusterState.getState().metadata().index(leaderIndex); - ccrLicenseChecker.fetchLeaderHistoryUUIDs(remoteClient, leaderIndexMetadata, future::onFailure, future::onResponse); + CcrLicenseChecker.fetchLeaderHistoryUUIDs(remoteClient, leaderIndexMetadata, future::onFailure, future::onResponse); String[] leaderHistoryUUIDs = future.actionGet(ccrSettings.getRecoveryActionTimeout()); IndexMetadata.Builder imdBuilder = IndexMetadata.builder(leaderIndex); @@ -439,7 +430,7 @@ public void restoreShard( } } - private void createEmptyStore(Store store) { + private static void createEmptyStore(Store store) { store.incRef(); try { store.createEmpty(); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRepositoryRetentionLeaseTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRepositoryRetentionLeaseTests.java index 994eff4f361ef..841a8c45a8ffe 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRepositoryRetentionLeaseTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRepositoryRetentionLeaseTests.java @@ -22,7 +22,6 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.xpack.ccr.CcrLicenseChecker; import org.elasticsearch.xpack.ccr.CcrSettings; import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; @@ -58,7 +57,6 @@ public void testWhenRetentionLeaseAlreadyExistsWeTryToRenewIt() { final CcrRepository repository = new CcrRepository( repositoryMetadata, mock(Client.class), - new CcrLicenseChecker(() -> true, () -> true), Settings.EMPTY, new CcrSettings(Settings.EMPTY, new ClusterSettings(Settings.EMPTY, settings)), mock(ThreadPool.class) @@ -123,7 +121,6 @@ public void testWhenRetentionLeaseExpiresBeforeWeCanRenewIt() { final CcrRepository repository = new CcrRepository( repositoryMetadata, mock(Client.class), - new CcrLicenseChecker(() -> true, () -> true), Settings.EMPTY, new CcrSettings(Settings.EMPTY, new ClusterSettings(Settings.EMPTY, settings)), mock(ThreadPool.class) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/RemoteClusterLicenseChecker.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/RemoteClusterLicenseChecker.java index 55db9f3b8feb0..6f07cb5f1f83e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/RemoteClusterLicenseChecker.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/RemoteClusterLicenseChecker.java @@ -269,7 +269,7 @@ public static List remoteClusterAliases(final Set remoteClusters .filter(RemoteClusterLicenseChecker::isRemoteIndex) .map(index -> index.substring(0, index.indexOf(RemoteClusterAware.REMOTE_CLUSTER_INDEX_SEPARATOR))) .distinct() - .flatMap(clusterExpression -> clusterNameExpressionResolver.resolveClusterNames(remoteClusters, clusterExpression).stream()) + .flatMap(clusterExpression -> ClusterNameExpressionResolver.resolveClusterNames(remoteClusters, clusterExpression).stream()) .distinct() .collect(Collectors.toList()); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncTaskIndexService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncTaskIndexService.java index dc1ccd74be384..8e875458c1501 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncTaskIndexService.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncTaskIndexService.java @@ -365,7 +365,8 @@ public void deleteResponse(AsyncExecutionId asyncExecutionId, ActionListenerasyncTaskId * is registered in the task manager, null otherwise. */ - public T getTask(TaskManager taskManager, AsyncExecutionId asyncExecutionId, Class tClass) throws IOException { + public static T getTask(TaskManager taskManager, AsyncExecutionId asyncExecutionId, Class tClass) + throws IOException { Task task = taskManager.getTask(asyncExecutionId.getTaskId().getId()); if (tClass.isInstance(task) == false) { return null; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultsService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultsService.java index 7aee2dde4f4bf..9c037b67ba008 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultsService.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultsService.java @@ -83,7 +83,7 @@ private void deleteResponseAsync( try { AsyncExecutionId searchId = AsyncExecutionId.decode(request.getId()); AsyncTask task = hasCancelTaskPrivilege - ? store.getTask(taskManager, searchId, AsyncTask.class) + ? AsyncTaskIndexService.getTask(taskManager, searchId, AsyncTask.class) : store.getTaskAndCheckAuthentication(taskManager, searchId, AsyncTask.class); if (task != null) { // the task was found and gets cancelled. The response may or may not be found, but we will return 200 anyways. diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/notifications/AbstractAuditor.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/notifications/AbstractAuditor.java index 6c23437945e0b..0c9ae7c4eb73f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/notifications/AbstractAuditor.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/notifications/AbstractAuditor.java @@ -111,11 +111,11 @@ public void error(String resourceId, String message) { indexDoc(messageFactory.newMessage(resourceId, message, Level.ERROR, new Date(), nodeName)); } - private void onIndexResponse(IndexResponse response) { + private static void onIndexResponse(IndexResponse response) { logger.trace("Successfully wrote audit message"); } - private void onIndexFailure(Exception exception) { + private static void onIndexFailure(Exception exception) { logger.debug("Failed to write audit message", exception); } @@ -178,7 +178,7 @@ protected void indexDoc(ToXContent toXContent) { } private void writeDoc(ToXContent toXContent) { - client.index(indexRequest(toXContent), ActionListener.wrap(this::onIndexResponse, this::onIndexFailure)); + client.index(indexRequest(toXContent), ActionListener.wrap(AbstractAuditor::onIndexResponse, AbstractAuditor::onIndexFailure)); } private IndexRequest indexRequest(ToXContent toXContent) { @@ -188,7 +188,7 @@ private IndexRequest indexRequest(ToXContent toXContent) { return indexRequest; } - private XContentBuilder toXContentBuilder(ToXContent toXContent) { + private static XContentBuilder toXContentBuilder(ToXContent toXContent) { try (XContentBuilder jsonBuilder = jsonBuilder()) { return toXContent.toXContent(jsonBuilder, ToXContent.EMPTY_PARAMS); } catch (IOException e) { @@ -221,7 +221,7 @@ protected void writeBacklog() { logger.trace("Successfully wrote audit message backlog after upgrading template"); } backlog = null; - }, this::onIndexFailure)); + }, AbstractAuditor::onIndexFailure)); } // for testing diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotAction.java index 4ec758154f343..c3af8d8b440f4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotAction.java @@ -344,7 +344,7 @@ public List toSteps(Client client, String phase, StepKey nextStepKey, XPac /** * Resolves the prefix to be used for the mounted index depending on the provided key */ - String getRestoredIndexPrefix(StepKey currentKey) { + static String getRestoredIndexPrefix(StepKey currentKey) { if (currentKey.getPhase().equals(TimeseriesLifecycleType.FROZEN_PHASE)) { return PARTIAL_RESTORED_INDEX_PREFIX; } else { @@ -353,7 +353,7 @@ String getRestoredIndexPrefix(StepKey currentKey) { } // Resolves the storage type depending on which phase the index is in - MountSearchableSnapshotRequest.Storage getConcreteStorageType(StepKey currentKey) { + static MountSearchableSnapshotRequest.Storage getConcreteStorageType(StepKey currentKey) { if (currentKey.getPhase().equals(TimeseriesLifecycleType.FROZEN_PHASE)) { return MountSearchableSnapshotRequest.Storage.SHARED_CACHE; } else { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForFollowShardTasksStep.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForFollowShardTasksStep.java index c4ce7dff4ef66..604872e11c584 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForFollowShardTasksStep.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForFollowShardTasksStep.java @@ -58,7 +58,7 @@ public void evaluateCondition(Metadata metadata, Index index, Listener listener, ); } - void handleResponse(FollowStatsAction.StatsResponses responses, Listener listener) { + static void handleResponse(FollowStatsAction.StatsResponses responses, Listener listener) { List unSyncedShardFollowStatuses = responses.getStatsResponses() .stream() .map(FollowStatsAction.StatsResponse::status) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForIndexColorStep.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForIndexColorStep.java index c1677ffd7b8b6..8c3ce8c7d3967 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForIndexColorStep.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForIndexColorStep.java @@ -103,14 +103,14 @@ public boolean isRetryable() { return true; } - private Result waitForRed(IndexRoutingTable indexRoutingTable) { + private static Result waitForRed(IndexRoutingTable indexRoutingTable) { if (indexRoutingTable == null) { return new Result(true, new Info("index is red")); } return new Result(false, new Info("index is not red")); } - private Result waitForYellow(IndexRoutingTable indexRoutingTable) { + private static Result waitForYellow(IndexRoutingTable indexRoutingTable) { if (indexRoutingTable == null) { return new Result(false, new Info("index is red; no indexRoutingTable")); } @@ -123,7 +123,7 @@ private Result waitForYellow(IndexRoutingTable indexRoutingTable) { } } - private Result waitForGreen(IndexRoutingTable indexRoutingTable) { + private static Result waitForGreen(IndexRoutingTable indexRoutingTable) { if (indexRoutingTable == null) { return new Result(false, new Info("index is red; no indexRoutingTable")); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForNoFollowersStep.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForNoFollowersStep.java index 585f3abcbea6f..dc0eab829add2 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForNoFollowersStep.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForNoFollowersStep.java @@ -89,7 +89,7 @@ static final class Info implements ToXContentObject { Info() {} - String getMessage() { + static String getMessage() { return message; } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForSnapshotStep.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForSnapshotStep.java index 02d871ca3d7c4..82604e0e5a9b4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForSnapshotStep.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/WaitForSnapshotStep.java @@ -108,7 +108,7 @@ private ToXContentObject notExecutedMessage(long time) { }; } - private IllegalStateException error(String message, Object... args) { + private static IllegalStateException error(String message, Object... args) { return new IllegalStateException(String.format(Locale.ROOT, message, args)); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/AsyncTwoPhaseIndexer.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/AsyncTwoPhaseIndexer.java index 00c05e2076dd2..6faabfe2845af 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/AsyncTwoPhaseIndexer.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/AsyncTwoPhaseIndexer.java @@ -66,7 +66,7 @@ public abstract class AsyncTwoPhaseIndexer privileges) throws IOException { + private static void appendResources(XContentBuilder builder, String field, Set privileges) throws IOException { builder.startObject(field); for (ResourcePrivileges privilege : privileges) { builder.field(privilege.getResource()); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequestBuilder.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequestBuilder.java index 3088fbad66a72..552d70bde95c7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequestBuilder.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequestBuilder.java @@ -220,7 +220,7 @@ public PutUserRequestBuilder source(String username, BytesReference source, XCon } } - private ValidationException validationException(String abc) { + private static ValidationException validationException(String abc) { ValidationException validationException = new ValidationException(); validationException.addValidationError(abc); return validationException; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Subject.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Subject.java index 0148b0b8c9010..509f33c93a0cb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Subject.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Subject.java @@ -198,7 +198,7 @@ private RoleReferenceIntersection buildRoleReferencesForApiKey() { ); } - private boolean isEmptyRoleDescriptorsBytes(BytesReference roleDescriptorsBytes) { + private static boolean isEmptyRoleDescriptorsBytes(BytesReference roleDescriptorsBytes) { return roleDescriptorsBytes == null || (roleDescriptorsBytes.length() == 2 && "{}".equals(roleDescriptorsBytes.utf8ToString())); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/ExpressionRoleMapping.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/ExpressionRoleMapping.java index df6f07730d745..679d3ef496328 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/ExpressionRoleMapping.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/ExpressionRoleMapping.java @@ -311,7 +311,7 @@ private ExpressionRoleMapping build(String name) { return new ExpressionRoleMapping(name, rules, roles, roleTemplates, metadata, enabled); } - private IllegalStateException missingField(String id, ParseField field) { + private static IllegalStateException missingField(String id, ParseField field) { return new IllegalStateException("failed to parse role-mapping [" + id + "]. missing field [" + field + "]"); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/TemplateRoleName.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/TemplateRoleName.java index 6ceb807f412ec..944b1faae115e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/TemplateRoleName.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/TemplateRoleName.java @@ -115,7 +115,7 @@ public void validate(ScriptService scriptService) { } } - private List convertJsonToList(String evaluation) throws IOException { + private static List convertJsonToList(String evaluation) throws IOException { final XContentParser parser = XContentFactory.xContent(XContentType.JSON) .createParser(XContentParserConfiguration.EMPTY, evaluation); XContentParser.Token token = parser.currentToken(); 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 070f67a626c46..585bb0c14be1d 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 @@ -323,7 +323,7 @@ public Map usageStats() { return Map.of("count", entryCount(), "memory", ram.toString(), "memory_in_bytes", ram.getBytes()); } - private class BitsetCacheKey { + private static class BitsetCacheKey { final IndexReader.CacheKey index; final Query query; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ManageOwnApiKeyClusterPrivilege.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ManageOwnApiKeyClusterPrivilege.java index 0bb063cc8249b..11c383857a018 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ManageOwnApiKeyClusterPrivilege.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ManageOwnApiKeyClusterPrivilege.java @@ -103,7 +103,7 @@ protected boolean doImplies(ClusterPermission.ActionBasedPermissionCheck permiss return permissionCheck instanceof ManageOwnClusterPermissionCheck; } - private boolean checkIfUserIsOwnerOfApiKeys( + private static boolean checkIfUserIsOwnerOfApiKeys( Authentication authentication, String apiKeyId, String username, @@ -137,7 +137,7 @@ private boolean checkIfUserIsOwnerOfApiKeys( return false; } - private boolean isCurrentAuthenticationUsingSameApiKeyIdFromRequest(Authentication authentication, String apiKeyId) { + private static boolean isCurrentAuthenticationUsingSameApiKeyIdFromRequest(Authentication authentication, String apiKeyId) { if (authentication.isApiKey()) { // API key id from authentication must match the id from request final String authenticatedApiKeyId = (String) authentication.getMetadata().get(AuthenticationField.API_KEY_ID_KEY); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustConfig.java index 364b28e56ff80..db8de5d364555 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustConfig.java @@ -78,7 +78,7 @@ public int hashCode() { return result; } - private CertificateTrustRestrictions readTrustGroup(Path path) throws IOException { + private static CertificateTrustRestrictions readTrustGroup(Path path) throws IOException { Settings settings = Settings.builder().loadFromPath(path).build(); final List trustNodeNames = settings.getAsList(RESTRICTIONS_KEY_SUBJECT_NAME); return new CertificateTrustRestrictions(trustNodeNames); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustManager.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustManager.java index 3d4f767960478..994c80fbb81c5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustManager.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/RestrictedTrustManager.java @@ -134,7 +134,7 @@ private boolean verifyCertificateNames(Set names) { return false; } - private Set readCommonNames(X509Certificate certificate) throws CertificateParsingException { + private static Set readCommonNames(X509Certificate certificate) throws CertificateParsingException { return getSubjectAlternativeNames(certificate).stream() .filter(pair -> ((Integer) pair.get(0)).intValue() == SAN_CODE_OTHERNAME) .map(pair -> pair.get(1)) @@ -150,7 +150,7 @@ private Set readCommonNames(X509Certificate certificate) throws Certific * @param certificate The certificate * @return the CN or null if it could not be parsed */ - private String decodeDerValue(byte[] value, X509Certificate certificate) { + private static String decodeDerValue(byte[] value, X509Certificate certificate) { try { DerParser parser = new DerParser(value); DerParser.Asn1Object seq = parser.readAsn1Object(); @@ -190,7 +190,7 @@ private String decodeDerValue(byte[] value, X509Certificate certificate) { } } - private Collection> getSubjectAlternativeNames(X509Certificate certificate) throws CertificateParsingException { + private static Collection> getSubjectAlternativeNames(X509Certificate certificate) throws CertificateParsingException { final Collection> sans = certificate.getSubjectAlternativeNames(); logger.trace("Certificate [{}] has subject alternative names [{}]", certificate.getSubjectX500Principal(), sans); return sans == null ? Collections.emptyList() : sans; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SSLService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SSLService.java index a66cd19d72b99..c8bf0d00c572c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SSLService.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SSLService.java @@ -354,7 +354,7 @@ public SSLEngine createSSLEngine(SslConfiguration configuration, String host, in * * @param sslConfiguration the configuration to check */ - public boolean isConfigurationValidForServerUsage(SslConfiguration sslConfiguration) { + public static boolean isConfigurationValidForServerUsage(SslConfiguration sslConfiguration) { Objects.requireNonNull(sslConfiguration, "SslConfiguration cannot be null"); return sslConfiguration.keyConfig().hasKeyMaterial(); } @@ -362,7 +362,7 @@ public boolean isConfigurationValidForServerUsage(SslConfiguration sslConfigurat /** * Indicates whether client authentication is enabled for a particular configuration */ - public boolean isSSLClientAuthEnabled(SslConfiguration sslConfiguration) { + public static boolean isSSLClientAuthEnabled(SslConfiguration sslConfiguration) { Objects.requireNonNull(sslConfiguration, "SslConfiguration cannot be null"); return sslConfiguration.clientAuth().enabled(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SslSettingsLoader.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SslSettingsLoader.java index 216b39c81415f..3c851dbb9da97 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SslSettingsLoader.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SslSettingsLoader.java @@ -50,7 +50,7 @@ public SslSettingsLoader(Settings settings, String settingPrefix, boolean accept setDefaultClientAuth(SslClientAuthenticationMode.REQUIRED); } - private Map> mapOf(List> settingList) { + private static Map> mapOf(List> settingList) { return settingList.stream().collect(Collectors.toMap(Setting::getKey, Function.identity())); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataConversionTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataConversionTests.java index 116793c1e83f9..9c69f6eff8da0 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataConversionTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataConversionTests.java @@ -27,7 +27,7 @@ public class IndexMetadataConversionTests extends ESTestCase { public void testConvertSearchableSnapshotSettings() { IndexMetadataVerifier service = getIndexMetadataVerifier(); IndexMetadata src = newIndexMeta("foo", Settings.EMPTY); - IndexMetadata indexMetadata = service.convertSharedCacheTierPreference(src); + IndexMetadata indexMetadata = IndexMetadataVerifier.convertSharedCacheTierPreference(src); assertSame(indexMetadata, src); // A full_copy searchable snapshot (settings should be untouched) @@ -42,7 +42,7 @@ public void testConvertSearchableSnapshotSettings() { .put("index.routing.allocation.include._tier_preference", "data_cold") .build() ); - indexMetadata = service.convertSharedCacheTierPreference(src); + indexMetadata = IndexMetadataVerifier.convertSharedCacheTierPreference(src); assertSame(indexMetadata, src); // A shared_cache searchable snapshot with valid settings (metadata should be untouched) @@ -54,7 +54,7 @@ public void testConvertSearchableSnapshotSettings() { .put("index.routing.allocation.include._tier_preference", "data_frozen") .build() ); - indexMetadata = service.convertSharedCacheTierPreference(src); + indexMetadata = IndexMetadataVerifier.convertSharedCacheTierPreference(src); assertSame(indexMetadata, src); // A shared_cache searchable snapshot (should have its settings converted) @@ -69,7 +69,7 @@ public void testConvertSearchableSnapshotSettings() { .put("index.routing.allocation.include._tier_preference", "data_frozen,data_cold") .build() ); - indexMetadata = service.convertSharedCacheTierPreference(src); + indexMetadata = IndexMetadataVerifier.convertSharedCacheTierPreference(src); assertNotSame(indexMetadata, src); Settings newSettings = indexMetadata.getSettings(); assertNull(newSettings.get("index.routing.allocation.include._tier")); @@ -89,7 +89,7 @@ public void testRemoveSingleTierAllocationFilters() { .put("index.routing.allocation.include._tier_preference", "data_cold") .build() ); - IndexMetadata indexMetadata = service.removeTierFiltering(src); + IndexMetadata indexMetadata = IndexMetadataVerifier.removeTierFiltering(src); assertNotSame(indexMetadata, src); Settings newSettings = indexMetadata.getSettings(); @@ -105,7 +105,7 @@ public void testRemoveSingleTierAllocationFilters() { .put("index.number_of_shards", randomIntBetween(1, 10)) .build() ); - indexMetadata = service.removeTierFiltering(src); + indexMetadata = IndexMetadataVerifier.removeTierFiltering(src); assertSame(indexMetadata, src); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotActionTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotActionTests.java index 31646ffc929bd..da628bedfe749 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotActionTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/SearchableSnapshotActionTests.java @@ -79,11 +79,23 @@ public void testPrefixAndStorageTypeDefaults() { StepKey nonFrozenKey = new StepKey(randomFrom("hot", "warm", "cold", "delete"), randomAlphaOfLength(5), randomAlphaOfLength(5)); StepKey frozenKey = new StepKey("frozen", randomAlphaOfLength(5), randomAlphaOfLength(5)); - assertThat(action.getConcreteStorageType(nonFrozenKey), equalTo(MountSearchableSnapshotRequest.Storage.FULL_COPY)); - assertThat(action.getRestoredIndexPrefix(nonFrozenKey), equalTo(SearchableSnapshotAction.FULL_RESTORED_INDEX_PREFIX)); + assertThat( + SearchableSnapshotAction.getConcreteStorageType(nonFrozenKey), + equalTo(MountSearchableSnapshotRequest.Storage.FULL_COPY) + ); + assertThat( + SearchableSnapshotAction.getRestoredIndexPrefix(nonFrozenKey), + equalTo(SearchableSnapshotAction.FULL_RESTORED_INDEX_PREFIX) + ); - assertThat(action.getConcreteStorageType(frozenKey), equalTo(MountSearchableSnapshotRequest.Storage.SHARED_CACHE)); - assertThat(action.getRestoredIndexPrefix(frozenKey), equalTo(SearchableSnapshotAction.PARTIAL_RESTORED_INDEX_PREFIX)); + assertThat( + SearchableSnapshotAction.getConcreteStorageType(frozenKey), + equalTo(MountSearchableSnapshotRequest.Storage.SHARED_CACHE) + ); + assertThat( + SearchableSnapshotAction.getRestoredIndexPrefix(frozenKey), + equalTo(SearchableSnapshotAction.PARTIAL_RESTORED_INDEX_PREFIX) + ); } private List expectedStepKeysWithForceMerge(String phase) { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLServiceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLServiceTests.java index 9c04b7078c3d5..9663e41a647a8 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLServiceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLServiceTests.java @@ -283,7 +283,7 @@ public void testCreateWithKeystoreIsValidForServer() throws Exception { .build(); SSLService sslService = new SSLService(TestEnvironment.newEnvironment(buildEnvSettings(settings))); - assertTrue(sslService.isConfigurationValidForServerUsage(sslService.getSSLConfiguration("xpack.security.transport.ssl"))); + assertTrue(SSLService.isConfigurationValidForServerUsage(sslService.getSSLConfiguration("xpack.security.transport.ssl"))); } public void testTransportWithKeystoreAndNoTruststore() throws Exception { @@ -333,7 +333,7 @@ public void testValidForServer() throws Exception { SSLService sslService = new SSLService(TestEnvironment.newEnvironment(buildEnvSettings(settings))); // Technically, we don't care whether xpack.http.ssl is valid for server - it's a client context, but we validate both of the // server contexts (http & transport) during construction, so this is the only way to make a non-server-valid context. - assertFalse(sslService.isConfigurationValidForServerUsage(sslService.getSSLConfiguration("xpack.http.ssl"))); + assertFalse(SSLService.isConfigurationValidForServerUsage(sslService.getSSLConfiguration("xpack.http.ssl"))); secureSettings.setString("xpack.http.ssl.keystore.secure_password", "testnode"); settings = Settings.builder() @@ -344,7 +344,7 @@ public void testValidForServer() throws Exception { .put("xpack.http.ssl.keystore.type", testnodeStoreType) .build(); sslService = new SSLService(TestEnvironment.newEnvironment(buildEnvSettings(settings))); - assertTrue(sslService.isConfigurationValidForServerUsage(sslService.getSSLConfiguration("xpack.http.ssl"))); + assertTrue(SSLService.isConfigurationValidForServerUsage(sslService.getSSLConfiguration("xpack.http.ssl"))); } public void testGetVerificationMode() throws Exception { @@ -378,8 +378,8 @@ public void testIsSSLClientAuthEnabled() throws Exception { .put("transport.profiles.foo.port", "9400-9410") .build(); sslService = new SSLService(TestEnvironment.newEnvironment(buildEnvSettings(settings))); - assertTrue(sslService.isSSLClientAuthEnabled(sslService.getSSLConfiguration("xpack.security.transport.ssl"))); - assertTrue(sslService.isSSLClientAuthEnabled(sslService.getSSLConfiguration("transport.profiles.foo.xpack.security.ssl"))); + assertTrue(SSLService.isSSLClientAuthEnabled(sslService.getSSLConfiguration("xpack.security.transport.ssl"))); + assertTrue(SSLService.isSSLClientAuthEnabled(sslService.getSSLConfiguration("transport.profiles.foo.xpack.security.ssl"))); } public void testThatHttpClientAuthDefaultsToNone() throws Exception { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/ProcessWorkerExecutorService.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/ProcessWorkerExecutorService.java index 43646f5f33616..ae873358023de 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/ProcessWorkerExecutorService.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/ProcessWorkerExecutorService.java @@ -117,7 +117,7 @@ public void start() { } catch (Exception e) { logger.error(() -> new ParameterizedMessage("error handling process [{}] operation", processName), e); } - EsExecutors.rethrowErrors(contextHolder.unwrap(runnable)); + EsExecutors.rethrowErrors(ThreadContext.unwrap(runnable)); } } diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java index e618c5016c5f8..c82cfffcbb4a6 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java @@ -582,7 +582,7 @@ public static ScalingExecutorBuilder[] executorBuilders(Settings settings) { ) }; } - 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") @@ -592,7 +592,7 @@ private Settings getIndexSettings() { .build(); } - private XContentBuilder getIndexMappings() { + private static XContentBuilder getIndexMappings() { try { final XContentBuilder builder = jsonBuilder(); { 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 2d99fef2845a3..f87374e987488 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 @@ -460,7 +460,7 @@ private static List augmentExplanationsWithStoreInfo( return augmented; } - private MatchingNodes findMatchingNodes( + private static MatchingNodes findMatchingNodes( ShardRouting shard, RoutingAllocation allocation, AsyncShardFetch.FetchResult data, diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/allocation/decider/DedicatedFrozenNodeAllocationDecider.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/allocation/decider/DedicatedFrozenNodeAllocationDecider.java index 2cc1309423721..58f2af3a0c944 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/allocation/decider/DedicatedFrozenNodeAllocationDecider.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/allocation/decider/DedicatedFrozenNodeAllocationDecider.java @@ -62,7 +62,7 @@ public Decision shouldAutoExpandToNode(IndexMetadata indexMetadata, DiscoveryNod return canAllocateToNode(indexMetadata, node); } - private Decision canAllocateToNode(IndexMetadata indexMetadata, DiscoveryNode discoveryNode) { + private static Decision canAllocateToNode(IndexMetadata indexMetadata, DiscoveryNode discoveryNode) { boolean hasDataFrozenRole = false; boolean hasOtherDataRole = false; diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/ProgressListenableActionFuture.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/ProgressListenableActionFuture.java index a0ae32404d867..9c2d489cd198a 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/ProgressListenableActionFuture.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/ProgressListenableActionFuture.java @@ -172,7 +172,7 @@ public void addListener(ActionListener listener, long value) { assert invariant(); } - private void executeListener(final ActionListener listener, final Supplier result) { + private static void executeListener(final ActionListener listener, final Supplier result) { try { listener.onResponse(result.get()); } catch (Exception e) { diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/CacheService.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/CacheService.java index 2b70152cf6e26..942e654ecc7e1 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/CacheService.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/CacheService.java @@ -481,7 +481,7 @@ private void setMaxCacheFilesToSyncAtOnce(int maxCacheFilesToSyncAtOnce) { * * @param cacheFile the evicted instance */ - private void onCacheFileEviction(CacheFile cacheFile) { + private static void onCacheFileEviction(CacheFile cacheFile) { IOUtils.closeWhileHandlingException(cacheFile::startEviction); } diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/FrozenCacheService.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/FrozenCacheService.java index 25aeb03dbda45..dd425366473d4 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/FrozenCacheService.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/FrozenCacheService.java @@ -733,7 +733,7 @@ private void ensureOpen() { } } - private void throwAlreadyEvicted() { + private static void throwAlreadyEvicted() { throw new AlreadyClosedException("File chunk is evicted"); } @@ -831,7 +831,7 @@ private ActionListener rangeListener( }, listener::onFailure); } - private void releaseAndFail(ActionListener listener, Releasable decrementRef, Exception e) { + private static void releaseAndFail(ActionListener listener, Releasable decrementRef, Exception e) { try { Releasables.close(decrementRef); } catch (Exception ex) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/PkiRealmBootstrapCheck.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/PkiRealmBootstrapCheck.java index 443b15caa8a06..eac48d3fe7950 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/PkiRealmBootstrapCheck.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/PkiRealmBootstrapCheck.java @@ -47,7 +47,7 @@ public BootstrapCheckResult check(BootstrapContext context) { if (pkiRealmEnabledWithoutDelegation) { for (String contextName : getSslContextNames(settings)) { final SslConfiguration configuration = sslService.getSSLConfiguration(contextName); - if (sslService.isSSLClientAuthEnabled(configuration)) { + if (SSLService.isSSLClientAuthEnabled(configuration)) { return BootstrapCheckResult.success(); } } 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 3068b0efd7b5f..551f539f6b00b 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 @@ -1564,7 +1564,7 @@ public UnaryOperator getRestHandlerWrapper(ThreadContext threadCont final boolean extractClientCertificate; if (enabled && HTTP_SSL_ENABLED.get(settings)) { final SslConfiguration httpSSLConfig = getSslService().getHttpTransportSSLConfiguration(); - extractClientCertificate = getSslService().isSSLClientAuthEnabled(httpSSLConfig); + extractClientCertificate = SSLService.isSSLClientAuthEnabled(httpSSLConfig); } else { extractClientCertificate = false; } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionMapper.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionMapper.java index 5b58c5df205de..1f6c1875a755d 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionMapper.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/SecurityActionMapper.java @@ -25,7 +25,7 @@ public class SecurityActionMapper { /** * Returns the security specific action name given the incoming action name and request */ - public String action(String action, TransportRequest request) { + public static String action(String action, TransportRequest request) { switch (action) { case ClearScrollAction.NAME -> { assert request instanceof ClearScrollRequest; diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportCreateApiKeyAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportCreateApiKeyAction.java index 99d454fdde561..6cf55d2c27c33 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportCreateApiKeyAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/apikey/TransportCreateApiKeyAction.java @@ -64,7 +64,7 @@ protected void doExecute(Task task, CreateApiKeyRequest request, ActionListener< } } - private boolean grantsAnyPrivileges(CreateApiKeyRequest request) { + private static boolean grantsAnyPrivileges(CreateApiKeyRequest request) { return request.getRoleDescriptors() == null || request.getRoleDescriptors().isEmpty() || false == request.getRoleDescriptors().stream().allMatch(RoleDescriptor::isEmpty); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java index 40169067fe9a5..1680120766623 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java @@ -46,7 +46,6 @@ public class SecurityActionFilter implements ActionFilter { private final AuthenticationService authcService; private final AuthorizationService authzService; private final AuditTrailService auditTrailService; - private final SecurityActionMapper actionMapper = new SecurityActionMapper(); private final XPackLicenseState licenseState; private final ThreadContext threadContext; private final SecurityContext securityContext; @@ -150,7 +149,7 @@ it to the action without an associated user (not via REST or transport - this is the {@link Rest} filter and the {@link ServerTransport} filter respectively), it's safe to assume a system user here if a request is not associated with any other user. */ - final String securityAction = actionMapper.action(action, request); + final String securityAction = SecurityActionMapper.action(action, request); authcService.authenticate(securityAction, request, SystemUser.INSTANCE, ActionListener.wrap((authc) -> { if (authc != null) { final String requestId = AuditUtil.extractRequestId(threadContext); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutAction.java index bc10a6b1e4efd..48523bc6c3b4c 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectLogoutAction.java @@ -121,7 +121,7 @@ private void validateAuthenticationAndMetadata(Authentication authentication, Ma } } - private Object getFromMetadata(Map metadata, String key) { + private static Object getFromMetadata(Map metadata, String key) { if (metadata.containsKey(key) == false) { throw new ElasticsearchSecurityException("Authentication token does not have OpenID Connect metadata [{}]", key); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectPrepareAuthenticationAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectPrepareAuthenticationAction.java index dd9800879c2d9..57c80cf28809e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectPrepareAuthenticationAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/oidc/TransportOpenIdConnectPrepareAuthenticationAction.java @@ -89,7 +89,7 @@ protected void doExecute( } } - private void prepareAuthenticationResponse( + private static void prepareAuthenticationResponse( OpenIdConnectRealm realm, String state, String nonce, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java index 14964c83ab52b..261ac8b896c6d 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/realm/TransportClearRealmCacheAction.java @@ -113,7 +113,7 @@ private void clearAuthenticationServiceCache(String[] usernames) { } } - private void clearCache(Realm realm, String[] usernames) { + private static void clearCache(Realm realm, String[] usernames) { if ((realm instanceof CachingRealm) == false) { return; } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/token/TransportCreateTokenAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/token/TransportCreateTokenAction.java index 491add9f05b6b..00ffea12a105b 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/token/TransportCreateTokenAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/token/TransportCreateTokenAction.java @@ -116,7 +116,10 @@ private void authenticateAndCreateToken(GrantType grantType, CreateTokenRequest } } - private Tuple> extractAuthenticationToken(GrantType grantType, CreateTokenRequest request) { + private static Tuple> extractAuthenticationToken( + GrantType grantType, + CreateTokenRequest request + ) { AuthenticationToken authToken = null; if (grantType == GrantType.PASSWORD) { authToken = new UsernamePasswordToken(request.getUsername(), request.getPassword()); @@ -137,7 +140,7 @@ private Tuple> extractAuthenticationTok return new Tuple<>(authToken, Optional.empty()); } - private void clearCredentialsFromRequest(GrantType grantType, CreateTokenRequest request) { + private static void clearCredentialsFromRequest(GrantType grantType, CreateTokenRequest request) { if (grantType == GrantType.PASSWORD) { request.getPassword().close(); } else if (grantType == GrantType.KERBEROS) { 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 a5d39fd3041d5..7efa32ec05f6c 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 @@ -1262,7 +1262,8 @@ private void withRoleDescriptor(XContentBuilder builder, RoleDescriptor roleDesc builder.endObject(); } - private void withIndicesPrivileges(XContentBuilder builder, RoleDescriptor.IndicesPrivileges indicesPrivileges) throws IOException { + private static void withIndicesPrivileges(XContentBuilder builder, RoleDescriptor.IndicesPrivileges indicesPrivileges) + throws IOException { builder.startObject(); builder.array("names", indicesPrivileges.getIndices()); builder.array("privileges", indicesPrivileges.getPrivileges()); @@ -1430,7 +1431,7 @@ LogEntryBuilder withRequestBody(SetProfileEnabledRequest setProfileEnabledReques return this; } - void withGrant(XContentBuilder builder, Grant grant) throws IOException { + static void withGrant(XContentBuilder builder, Grant grant) throws IOException { builder.startObject("grant").field("type", grant.getType()); if (grant.getUsername() != null) { builder.startObject("user") @@ -1598,7 +1599,7 @@ void build() { logger.info(AUDIT_MARKER, logEntry); } - String toQuotedJsonArray(Object[] values) { + static String toQuotedJsonArray(Object[] values) { assert values != null; final StringBuilder stringBuilder = new StringBuilder(); final JsonStringEncoder jsonStringEncoder = JsonStringEncoder.getInstance(); 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 31610485b3bf4..8d0c369e420d0 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 @@ -359,7 +359,7 @@ private void createApiKeyAndIndexIt( /** * package-private for testing */ - XContentBuilder newDocument( + static XContentBuilder newDocument( char[] apiKeyHashChars, String name, Authentication authentication, @@ -588,7 +588,7 @@ public List parseRoleDescriptorsBytes( // We do not replace assigned roles because they are created explicitly by users. // Before #82049, it is possible to specify a role descriptor for API keys that is identical to the builtin superuser role // (including the _reserved metadata field). - private List maybeReplaceSuperuserRoleDescriptor(String apiKeyId, List roleDescriptors) { + private static List maybeReplaceSuperuserRoleDescriptor(String apiKeyId, List roleDescriptors) { // Scan through all the roles because superuser can be one of the roles that a user has. Unlike building the Role object, // capturing role descriptors does not preempt for superuser. return roleDescriptors.stream().map(rd -> { @@ -707,7 +707,7 @@ Cache getRoleDescriptorsBytesCache() { } // package-private for testing - void validateApiKeyExpiration( + static void validateApiKeyExpiration( ApiKeyDoc apiKeyDoc, ApiKeyCredentials credentials, Clock clock, @@ -791,7 +791,7 @@ protected void verifyKeyAgainstHash(String apiKeyHash, ApiKeyCredentials credent })); } - private Instant getApiKeyExpiration(Instant now, CreateApiKeyRequest request) { + private static Instant getApiKeyExpiration(Instant now, CreateApiKeyRequest request) { if (request.getExpiration() != null) { return now.plusSeconds(request.getExpiration().getSeconds()); } else { @@ -1140,7 +1140,7 @@ public void onFailure(Exception e) { /** * Logs an exception concerning a specific api key at TRACE level (if enabled) */ - private E traceLog(String action, String identifier, E exception) { + private static E traceLog(String action, String identifier, E exception) { if (logger.isTraceEnabled()) { if (exception instanceof final ElasticsearchException esEx) { final Object detail = esEx.getHeader("error_description"); @@ -1159,7 +1159,7 @@ private E traceLog(String action, String identifier, E exc /** * Logs an exception at TRACE level (if enabled) */ - private E traceLog(String action, E exception) { + private static E traceLog(String action, E exception) { if (logger.isTraceEnabled()) { if (exception instanceof final ElasticsearchException esEx) { final Object detail = esEx.getHeader("error_description"); @@ -1439,11 +1439,10 @@ public static final class ApiKeyDoc { builder.declareString(constructorArg(), new ParseField("api_key_hash")); builder.declareStringOrNull(optionalConstructorArg(), new ParseField("name")); builder.declareInt(constructorArg(), new ParseField("version")); - ObjectParserHelper parserHelper = new ObjectParserHelper<>(); - parserHelper.declareRawObject(builder, constructorArg(), new ParseField("role_descriptors")); - parserHelper.declareRawObject(builder, constructorArg(), new ParseField("limited_by_role_descriptors")); + ObjectParserHelper.declareRawObject(builder, constructorArg(), new ParseField("role_descriptors")); + ObjectParserHelper.declareRawObject(builder, constructorArg(), new ParseField("limited_by_role_descriptors")); builder.declareObject(constructorArg(), (p, c) -> p.map(), new ParseField("creator")); - parserHelper.declareRawObjectOrNull(builder, optionalConstructorArg(), new ParseField("metadata_flattened")); + ObjectParserHelper.declareRawObjectOrNull(builder, optionalConstructorArg(), new ParseField("metadata_flattened")); PARSER = builder.build(); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticatorChain.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticatorChain.java index 44cef4c8fe5ef..bc298cfb14ef1 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticatorChain.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticatorChain.java @@ -136,7 +136,7 @@ private void doAuthenticate(Authenticator.Context context, boolean shouldExtract iterListener.run(); } - private BiConsumer>> getAuthenticatorConsumer( + private static BiConsumer>> getAuthenticatorConsumer( Authenticator.Context context, boolean shouldExtractCredentials ) { @@ -361,7 +361,7 @@ void writeAuthToContext(Authenticator.Context context, Authentication authentica listener.onResponse(authentication); } - private void addMetadata(Authenticator.Context context, ElasticsearchSecurityException ese) { + private static void addMetadata(Authenticator.Context context, ElasticsearchSecurityException ese) { if (false == context.getUnsuccessfulMessages().isEmpty()) { ese.addMetadata("es.additional_unsuccessful_credentials", context.getUnsuccessfulMessages()); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ExpiredApiKeysRemover.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ExpiredApiKeysRemover.java index 86f8aa1b71cb8..630d432a7597b 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ExpiredApiKeysRemover.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ExpiredApiKeysRemover.java @@ -78,7 +78,7 @@ void submit(ThreadPool threadPool) { } } - private void debugDbqResponse(BulkByScrollResponse response) { + private static void debugDbqResponse(BulkByScrollResponse response) { if (logger.isDebugEnabled()) { logger.debug( "delete by query of api keys finished with [{}] deletions, [{}] bulk failures, [{}] search failures", diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ExpiredTokenRemover.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ExpiredTokenRemover.java index ed26092b1a205..a196ecbd18fe1 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ExpiredTokenRemover.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ExpiredTokenRemover.java @@ -113,7 +113,7 @@ void submit(ThreadPool threadPool) { } } - private void debugDbqResponse(BulkByScrollResponse response) { + private static void debugDbqResponse(BulkByScrollResponse response) { if (logger.isDebugEnabled()) { logger.debug( "delete by query of tokens finished with [{}] deletions, [{}] bulk failures, [{}] search failures", diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/OAuth2TokenAuthenticator.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/OAuth2TokenAuthenticator.java index b164776ca2ee5..990a678f6a185 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/OAuth2TokenAuthenticator.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/OAuth2TokenAuthenticator.java @@ -55,7 +55,7 @@ public void authenticate(Context context, ActionListener { logger.debug(new ParameterizedMessage("Failed to validate token authentication for request [{}]", context.getRequest()), e); if (e instanceof ElasticsearchSecurityException - && false == tokenService.isExpiredTokenException((ElasticsearchSecurityException) e)) { + && false == TokenService.isExpiredTokenException((ElasticsearchSecurityException) e)) { // intentionally ignore the returned exception; we call this primarily // for the auditing as we already have a purpose built exception context.getRequest().tamperedRequest(); 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 1081cee20d6ee..dc9e520e10918 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 @@ -367,12 +367,12 @@ private void maybeAddBasicRealms(List realms, List realmConf } } - private Settings ensureOrderSetting(Settings settings, RealmConfig.RealmIdentifier realmIdentifier, int order) { + private static Settings ensureOrderSetting(Settings settings, RealmConfig.RealmIdentifier realmIdentifier, int order) { String orderSettingKey = RealmSettings.realmSettingPrefix(realmIdentifier) + "order"; return Settings.builder().put(settings).put(orderSettingKey, order).build(); } - private void checkUniqueOrders(Map> orderToRealmName) { + private static void checkUniqueOrders(Map> orderToRealmName) { String duplicateOrders = orderToRealmName.entrySet() .stream() .filter(entry -> entry.getValue().size() > 1) @@ -428,7 +428,7 @@ private List buildRealmConfigs() { return realmConfigs; } - private Set findDisabledBasicRealmTypes(List realmConfigs) { + private static Set findDisabledBasicRealmTypes(List realmConfigs) { return realmConfigs.stream() .filter(rc -> InternalRealms.isBuiltinRealm(rc.type())) .filter(rc -> false == rc.enabled()) @@ -436,7 +436,7 @@ private Set findDisabledBasicRealmTypes(List realmConfigs) .collect(Collectors.toUnmodifiableSet()); } - private void logDeprecationForReservedPrefixedRealmNames(List realmIdentifiers) { + private static void logDeprecationForReservedPrefixedRealmNames(List realmIdentifiers) { if (false == realmIdentifiers.isEmpty()) { deprecationLogger.warn( DeprecationCategory.SECURITY, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/RealmsAuthenticator.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/RealmsAuthenticator.java index 0c13bfa5e4b76..5713ba386983e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/RealmsAuthenticator.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/RealmsAuthenticator.java @@ -88,7 +88,7 @@ public void authenticate(Context context, ActionListener> messages, ActionListener> listener diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java index 731a14197a01e..117b310156459 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java @@ -1870,7 +1870,7 @@ private static Predicate> isOfUser(String username) { }; } - private Tuple filterAndParseHit(SearchHit hit, @Nullable Predicate> filter) + private static Tuple filterAndParseHit(SearchHit hit, @Nullable Predicate> filter) throws IllegalStateException, DateTimeException { final Map source = hit.getSourceAsMap(); if (source == null) { @@ -1887,8 +1887,10 @@ private Tuple filterAndParseHit(SearchHit hit, @Nullable Pred * @return A {@link Tuple} of access-token and refresh-token-id or null if a Predicate is defined and the userToken source doesn't * satisfy it */ - private Tuple parseTokensFromDocument(Map source, @Nullable Predicate> filter) - throws IllegalStateException, DateTimeException { + private static Tuple parseTokensFromDocument( + Map source, + @Nullable Predicate> filter + ) throws IllegalStateException, DateTimeException { @SuppressWarnings("unchecked") final Map refreshTokenMap = (Map) source.get("refresh_token"); final String hashedRefreshToken = refreshTokenMap != null ? (String) refreshTokenMap.get("token") : null; @@ -2106,7 +2108,7 @@ public static Tuple unpackVersionAndPayload(String encodedPack) } } - private void ensureEncryptionCiphersSupported() throws NoSuchPaddingException, NoSuchAlgorithmException { + private static void ensureEncryptionCiphersSupported() throws NoSuchPaddingException, NoSuchAlgorithmException { Cipher.getInstance(ENCRYPTION_CIPHER); SecretKeyFactory.getInstance(KDF_ALGORITHM); } @@ -2225,7 +2227,7 @@ private static ElasticsearchSecurityException unableToPerformAction(@Nullable Th /** * Logs an exception concerning a specific Token at TRACE level (if enabled) */ - private E traceLog(String action, String identifier, E exception) { + private static E traceLog(String action, String identifier, E exception) { if (logger.isTraceEnabled()) { if (exception instanceof final ElasticsearchException esEx) { final Object detail = esEx.getHeader("error_description"); @@ -2244,7 +2246,7 @@ private E traceLog(String action, String identifier, E exc /** * Logs an exception at TRACE level (if enabled) */ - private E traceLog(String action, E exception) { + private static E traceLog(String action, E exception) { if (logger.isTraceEnabled()) { if (exception instanceof final ElasticsearchException esEx) { final Object detail = esEx.getHeader("error_description"); @@ -2260,7 +2262,7 @@ private E traceLog(String action, E exception) { return exception; } - boolean isExpiredTokenException(ElasticsearchSecurityException e) { + static boolean isExpiredTokenException(ElasticsearchSecurityException e) { final List headers = e.getHeader("WWW-Authenticate"); return headers != null && headers.stream().anyMatch(EXPIRED_TOKEN_WWW_AUTH_VALUE::equals); } @@ -2293,7 +2295,7 @@ public Authentication getAuthentication() { } } - private class KeyComputingRunnable extends AbstractRunnable { + private static class KeyComputingRunnable extends AbstractRunnable { private final BytesKey decodedSalt; private final KeyAndCache keyAndCache; @@ -2402,7 +2404,7 @@ public synchronized TokenMetadata getTokenMetadata() { return newTokenMetadata(keyCache.currentTokenKeyHash, keyCache.cache.values()); } - private TokenMetadata newTokenMetadata(BytesKey activeTokenKey, Iterable iterable) { + private static TokenMetadata newTokenMetadata(BytesKey activeTokenKey, Iterable iterable) { List list = new ArrayList<>(); for (KeyAndCache v : iterable) { list.add(v.keyAndTimestamp); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java index 10da1f020bf41..232fa25799ff7 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java @@ -756,7 +756,7 @@ public void onFailure(Exception e) { } @Nullable - private UserAndPassword transformUser(final String id, final Map sourceMap) { + private static UserAndPassword transformUser(final String id, final Map sourceMap) { if (sourceMap == null) { return null; } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java index 7dd08807f1230..565f6a528edf2 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java @@ -98,12 +98,12 @@ public NativeRoleMappingStore(Settings settings, Client client, SecurityIndexMan this.scriptService = scriptService; } - private String getNameFromId(String id) { + private static String getNameFromId(String id) { assert id.startsWith(ID_PREFIX); return id.substring(ID_PREFIX.length()); } - private String getIdForName(String name) { + private static String getIdForName(String name) { return ID_PREFIX + name; } @@ -157,7 +157,7 @@ protected void loadMappings(ActionListener> listener } } - protected ExpressionRoleMapping buildMapping(String id, BytesReference source) { + protected static ExpressionRoleMapping buildMapping(String id, BytesReference source) { try ( InputStream stream = source.streamInput(); XContentParser parser = XContentType.JSON.xContent() @@ -332,7 +332,7 @@ public void usageStats(ActionListener> listener) { } } - private void reportStats(ActionListener> listener, List mappings) { + private static void reportStats(ActionListener> listener, List mappings) { Map usageStats = new HashMap<>(); usageStats.put("size", mappings.size()); usageStats.put("enabled", mappings.stream().filter(ExpressionRoleMapping::isEnabled).count()); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java index 7f05fbe7818a8..0c90d788def2a 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java @@ -412,7 +412,7 @@ private void authorizeAction( } else if (isIndexAction(action)) { final Metadata metadata = clusterService.state().metadata(); final AsyncSupplier resolvedIndicesAsyncSupplier = new CachingAsyncSupplier<>(resolvedIndicesListener -> { - final ResolvedIndices resolvedIndices = indicesAndAliasesResolver.tryResolveWithoutWildcards(action, request); + final ResolvedIndices resolvedIndices = IndicesAndAliasesResolver.tryResolveWithoutWildcards(action, request); if (resolvedIndices != null) { resolvedIndicesListener.onResponse(resolvedIndices); } else { @@ -704,7 +704,7 @@ private void authorizeBulkItems( for (BulkItemRequest item : request.items()) { final String itemAction = getAction(item); String resolvedIndex = resolvedIndexNames.computeIfAbsent(item.index(), key -> { - final ResolvedIndices resolvedIndices = indicesAndAliasesResolver.resolveIndicesAndAliasesWithoutWildcards( + final ResolvedIndices resolvedIndices = IndicesAndAliasesResolver.resolveIndicesAndAliasesWithoutWildcards( itemAction, item.request() ); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java index d2c23bd45756b..58d9f12208190 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java @@ -114,7 +114,7 @@ ResolvedIndices resolve(String action, TransportRequest request, Metadata metada * @return The {@link ResolvedIndices} or null if wildcard expansion must be performed. */ @Nullable - ResolvedIndices tryResolveWithoutWildcards(String action, TransportRequest transportRequest) { + static ResolvedIndices tryResolveWithoutWildcards(String action, TransportRequest transportRequest) { // We only take care of IndicesRequest if (false == transportRequest instanceof IndicesRequest) { return null; @@ -127,7 +127,7 @@ ResolvedIndices tryResolveWithoutWildcards(String action, TransportRequest trans return resolveIndicesAndAliasesWithoutWildcards(action, indicesRequest); } - private boolean requiresWildcardExpansion(IndicesRequest indicesRequest) { + private static boolean requiresWildcardExpansion(IndicesRequest indicesRequest) { // IndicesAliasesRequest requires special handling because it can have wildcards in request body if (indicesRequest instanceof IndicesAliasesRequest) { return true; @@ -139,7 +139,7 @@ private boolean requiresWildcardExpansion(IndicesRequest indicesRequest) { return false; } - ResolvedIndices resolveIndicesAndAliasesWithoutWildcards(String action, IndicesRequest indicesRequest) { + static ResolvedIndices resolveIndicesAndAliasesWithoutWildcards(String action, IndicesRequest indicesRequest) { assert false == requiresWildcardExpansion(indicesRequest) : "request must not require wildcard expansion"; final String[] indices = indicesRequest.indices(); if (indices == null || indices.length == 0) { @@ -359,7 +359,7 @@ static String getPutMappingIndexOrAlias(PutMappingRequest request, Set a return resolvedAliasOrIndex; } - private List loadAuthorizedAliases(Set authorizedIndices, Metadata metadata) { + private static List loadAuthorizedAliases(Set authorizedIndices, Metadata metadata) { List authorizedAliases = new ArrayList<>(); SortedMap existingAliases = metadata.getIndicesLookup(); for (String authorizedIndex : authorizedIndices) { @@ -371,7 +371,7 @@ private List loadAuthorizedAliases(Set authorizedIndices, Metada return authorizedAliases; } - private List replaceWildcardsWithAuthorizedAliases(String[] aliases, List authorizedAliases) { + private static List replaceWildcardsWithAuthorizedAliases(String[] aliases, List authorizedAliases) { final List finalAliases = new ArrayList<>(); // IndicesAliasesRequest doesn't support empty aliases (validation fails) but diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/RBACEngine.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/RBACEngine.java index df4e40524abb9..90af59e5ca491 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/RBACEngine.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/RBACEngine.java @@ -176,7 +176,7 @@ public void authorizeClusterAction( } // pkg private for testing - boolean checkSameUserPermissions(String action, TransportRequest request, Authentication authentication) { + static boolean checkSameUserPermissions(String action, TransportRequest request, Authentication authentication) { final boolean actionAllowed = SAME_USER_PRIVILEGE.test(action); if (actionAllowed) { if (request instanceof UserRequest userRequest) { @@ -388,7 +388,7 @@ public void authorizeIndexAction( } } - private boolean isChildActionAuthorizedByParent(RequestInfo requestInfo, AuthorizationInfo authorizationInfo) { + private static boolean isChildActionAuthorizedByParent(RequestInfo requestInfo, AuthorizationInfo authorizationInfo) { final AuthorizationContext parent = requestInfo.getOriginatingAuthorizationContext(); if (parent == null) { return false; @@ -596,7 +596,7 @@ public void getUserPrivileges( } } - GetUserPrivilegesResponse buildUserPrivilegesResponseObject(Role userRole) { + static GetUserPrivilegesResponse buildUserPrivilegesResponseObject(Role userRole) { logger.trace(() -> new ParameterizedMessage("List privileges for role [{}]", arrayToCommaDelimitedString(userRole.names()))); // We use sorted sets for Strings because they will typically be small, and having a predictable order allows for simpler testing diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/interceptor/SearchRequestInterceptor.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/interceptor/SearchRequestInterceptor.java index b7de342ef5caf..8e8f2bd6c7740 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/interceptor/SearchRequestInterceptor.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/interceptor/SearchRequestInterceptor.java @@ -78,7 +78,7 @@ public boolean supports(IndicesRequest request) { } // package private for test - boolean hasRemoteIndices(SearchRequest request) { + static boolean hasRemoteIndices(SearchRequest request) { return Arrays.stream(request.indices()).anyMatch(name -> name.indexOf(REMOTE_CLUSTER_INDEX_SEPARATOR) >= 0); } } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/interceptor/ShardSearchRequestInterceptor.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/interceptor/ShardSearchRequestInterceptor.java index 3eabc01eba5b3..8902f872d9212 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/interceptor/ShardSearchRequestInterceptor.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/interceptor/ShardSearchRequestInterceptor.java @@ -64,7 +64,7 @@ public boolean supports(IndicesRequest request) { return request instanceof ShardSearchRequest; } - boolean dlsUsesStoredScripts( + static boolean dlsUsesStoredScripts( ShardSearchRequest request, Map indexAccessControlByIndex ) { 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 246a7a6d2bbec..c7c842a613bda 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 @@ -280,7 +280,7 @@ public void buildRoleFromRoleReference(RoleReference roleReference, ActionListen } } - private boolean includesSuperuserRole(RoleReference roleReference) { + private static boolean includesSuperuserRole(RoleReference roleReference) { if (roleReference instanceof RoleReference.NamedRoleReference namedRoles) { return Arrays.asList(namedRoles.getRoleNames()).contains(ReservedRolesStore.SUPERUSER_ROLE_DESCRIPTOR.getName()); } else { @@ -363,7 +363,7 @@ public void getRoleDescriptorsList(Subject subject, ActionListener tryGetRoleDescriptorForInternalUser(Subject subject) { + private static Optional tryGetRoleDescriptorForInternalUser(Subject subject) { final User user = subject.getUser(); if (SystemUser.is(user)) { throw new IllegalArgumentException( diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStore.java index bf33b2a3476e8..11dd15eead3dd 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStore.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStore.java @@ -216,7 +216,7 @@ private void innerGetPrivileges(Collection applications, ActionListener< } } - private QueryBuilder getApplicationNameQuery(Collection applications) { + private static QueryBuilder getApplicationNameQuery(Collection applications) { if (applications.contains("*")) { return QueryBuilders.existsQuery(APPLICATION.getPreferredName()); } @@ -248,7 +248,7 @@ private QueryBuilder getApplicationNameQuery(Collection applications) { return boolQuery; } - private ApplicationPrivilegeDescriptor buildPrivilege(String docId, BytesReference source) { + private static ApplicationPrivilegeDescriptor buildPrivilege(String docId, BytesReference source) { logger.trace("Building privilege from [{}] [{}]", docId, source == null ? "<>" : source.utf8ToString()); if (source == null) { return null; @@ -307,7 +307,7 @@ private Set cachedDescriptorsForApplicationNames /** * Filter to get all privilege descriptors that have any of the given privilege names. */ - private Collection filterDescriptorsForPrivilegeNames( + private static Collection filterDescriptorsForPrivilegeNames( Collection descriptors, Collection privilegeNames ) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/profile/ProfileDocument.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/profile/ProfileDocument.java index c4b4800cba76a..889ce131eb716 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/profile/ProfileDocument.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/profile/ProfileDocument.java @@ -200,8 +200,7 @@ public static ProfileDocument fromXContent(XContentParser parser) { PROFILE_DOC_PARSER.declareLong(constructorArg(), new ParseField("last_synchronized")); PROFILE_DOC_PARSER.declareObject(constructorArg(), (p, c) -> PROFILE_DOC_USER_PARSER.parse(p, null), new ParseField("user")); PROFILE_DOC_PARSER.declareObject(constructorArg(), (p, c) -> p.map(), new ParseField("access")); - ObjectParserHelper parserHelper = new ObjectParserHelper<>(); - parserHelper.declareRawObject(PROFILE_DOC_PARSER, constructorArg(), new ParseField("application_data")); + ObjectParserHelper.declareRawObject(PROFILE_DOC_PARSER, constructorArg(), new ParseField("application_data")); PARSER.declareObject(constructorArg(), (p, c) -> PROFILE_DOC_PARSER.parse(p, null), new ParseField("user_profile")); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/profile/ProfileService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/profile/ProfileService.java index 723cb7f64a3c7..ba69f09233f18 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/profile/ProfileService.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/profile/ProfileService.java @@ -342,7 +342,11 @@ void searchVersionedDocumentForSubject(Subject subject, ActionListener Optional tryFreezeAndCheckIndex(ActionListener return Optional.of(frozenProfileIndex); } - private ProfileDocument updateWithSubject(ProfileDocument doc, Subject subject) { + private static ProfileDocument updateWithSubject(ProfileDocument doc, Subject subject) { final User subjectUser = subject.getUser(); return new ProfileDocument( doc.uid(), 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 95b9f9b78560a..f993e6f581833 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 @@ -120,7 +120,7 @@ public void handleRequest(RestRequest request, RestChannel channel, NodeClient c } } - protected void handleException(ActionType actionType, RestRequest request, RestChannel channel, Exception e) { + protected static void handleException(ActionType actionType, RestRequest request, RestChannel channel, Exception e) { logger.debug(new ParameterizedMessage("{} failed for REST request [{}]", actionType, request.uri()), e); final RestStatus restStatus = ExceptionsHelper.status(e); try { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/RestInvalidateApiKeyAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/RestInvalidateApiKeyAction.java index c045e083cb087..fa14c7f67dbfb 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/RestInvalidateApiKeyAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/apikey/RestInvalidateApiKeyAction.java @@ -85,7 +85,7 @@ public String getName() { return "xpack_security_invalidate_api_key"; } - private ConstructingObjectParser getObjectParser(RestRequest request) { + private static ConstructingObjectParser getObjectParser(RestRequest request) { if (request.getRestApiVersion() == RestApiVersion.V_7) { final ConstructingObjectParser objectParser = new ConstructingObjectParser<>( "invalidate_api_key_v7", diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecuritySystemIndices.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecuritySystemIndices.java index 3bad4c8f71adf..e77dfd2b2a587 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecuritySystemIndices.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecuritySystemIndices.java @@ -121,7 +121,7 @@ private SystemIndexDescriptor getSecurityMainIndexDescriptor() { .build(); } - private Settings getMainIndexSettings() { + private static Settings getMainIndexSettings() { return Settings.builder() .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) @@ -546,7 +546,7 @@ private XContentBuilder getMainIndexMappings() { } } - private SystemIndexDescriptor getSecurityTokenIndexDescriptor() { + private static SystemIndexDescriptor getSecurityTokenIndexDescriptor() { return SystemIndexDescriptor.builder() .setIndexPattern(".security-tokens-[0-9]+*") .setPrimaryIndex(TOKENS_INDEX_CONCRETE_NAME) @@ -572,7 +572,7 @@ private static Settings getTokenIndexSettings() { .build(); } - private XContentBuilder getTokenIndexMappings() { + private static XContentBuilder getTokenIndexMappings() { try { final XContentBuilder builder = jsonBuilder(); @@ -741,7 +741,7 @@ private SystemIndexDescriptor getSecurityProfileIndexDescriptor() { .build(); } - private Settings getProfileIndexSettings() { + private static Settings getProfileIndexSettings() { return Settings.builder() .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) @@ -874,7 +874,7 @@ private XContentBuilder getProfileIndexMappings() { } } - private void defineRealmDomain(XContentBuilder builder, String fieldName) throws IOException { + private static void defineRealmDomain(XContentBuilder builder, String fieldName) throws IOException { builder.startObject(fieldName); { builder.field("type", "object"); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/tool/BaseRunAsSuperuserCommand.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/tool/BaseRunAsSuperuserCommand.java index c0ed18d0dc6b9..67ff8e2bd3ff9 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/tool/BaseRunAsSuperuserCommand.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/tool/BaseRunAsSuperuserCommand.java @@ -141,7 +141,7 @@ protected final void execute(Terminal terminal, OptionSet options, Environment e /** * Removes temporary file realm user from users and roles file */ - private void cleanup(Terminal terminal, Environment env, String username) throws Exception { + private static void cleanup(Terminal terminal, Environment env, String username) throws Exception { final Path passwordFile = FileUserPasswdStore.resolveFile(env); final Path rolesFile = FileUserRolesStore.resolveFile(env); final List errorMessages = new ArrayList<>(); @@ -176,7 +176,7 @@ private void cleanup(Terminal terminal, Environment env, String username) throws attributesChecker.check(terminal); } - private void ensureFileRealmEnabled(Settings settings) throws Exception { + private static void ensureFileRealmEnabled(Settings settings) throws Exception { final Map realms = RealmSettings.getRealmSettings(settings); Map fileRealmSettings = realms.entrySet() .stream() diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java index 828442256c43e..0d26989f64a7f 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java @@ -182,7 +182,7 @@ private Map initializeProfileFilters(DestructiveO final boolean transportSSLEnabled = XPackSettings.TRANSPORT_SSL_ENABLED.get(settings); for (Map.Entry entry : profileConfigurations.entrySet()) { final SslConfiguration profileConfiguration = entry.getValue(); - final boolean extractClientCert = transportSSLEnabled && sslService.isSSLClientAuthEnabled(profileConfiguration); + final boolean extractClientCert = transportSSLEnabled && SSLService.isSSLClientAuthEnabled(profileConfiguration); profileFilters.put( entry.getKey(), new ServerTransportFilter( 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 ac8928f2d179e..8183aeafce683 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 @@ -85,7 +85,7 @@ expected to have a user attached (either in headers or in context) requests from all the nodes are attached with a user (either a serialize user an authentication token */ - String securityAction = actionMapper.action(action, request); + String securityAction = SecurityActionMapper.action(action, request); TransportChannel unwrappedChannel = transportChannel; if (unwrappedChannel instanceof TaskTransportChannel) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/PatternRule.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/PatternRule.java index 771d8e8db1a17..6ecdc9d38f880 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/PatternRule.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/filter/PatternRule.java @@ -112,7 +112,7 @@ private static String addRule(String pattern, String rule) { return pattern; } - private boolean isLocalhost(InetAddress address) { + private static boolean isLocalhost(InetAddress address) { try { return address.isAnyLocalAddress() || address.isLoopbackAddress() || NetworkInterface.getByInetAddress(address) != null; } catch (SocketException e) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransport.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransport.java index 5875f43a5d741..76b1412c4a609 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransport.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransport.java @@ -57,7 +57,7 @@ public SecurityNetty4HttpServerTransport( this.sslService = sslService; if (ssl) { this.sslConfiguration = sslService.getHttpTransportSSLConfiguration(); - if (sslService.isConfigurationValidForServerUsage(sslConfiguration) == false) { + if (SSLService.isConfigurationValidForServerUsage(sslConfiguration) == false) { throw new IllegalArgumentException( "a key must be provided to run as a server. the key should be configured using the " + "[xpack.security.http.ssl.key] or [xpack.security.http.ssl.keystore.path] setting" diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java index a1578f103e624..296341ba53a53 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java @@ -83,7 +83,7 @@ public SecurityNioHttpServerTransport( this.sslService = sslService; if (sslEnabled) { this.sslConfiguration = sslService.getHttpTransportSSLConfiguration(); - if (sslService.isConfigurationValidForServerUsage(sslConfiguration) == false) { + if (SSLService.isConfigurationValidForServerUsage(sslConfiguration) == false) { throw new IllegalArgumentException( "a key must be provided to run as a server. the key should be configured using the " + "[xpack.security.http.ssl.key] or [xpack.security.http.ssl.keystore.path] setting" diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/SecurityActionMapperTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/SecurityActionMapperTests.java index 9f8ee7249b426..e683004d0d56d 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/SecurityActionMapperTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/SecurityActionMapperTests.java @@ -46,7 +46,7 @@ public void testThatAllOrdinaryActionsRemainTheSame() { || randomAction.equals(AnalyzeAction.NAME + "[s]") ); - assertThat(securityActionMapper.action(randomAction, null), equalTo(randomAction)); + assertThat(SecurityActionMapper.action(randomAction, null), equalTo(randomAction)); } public void testClearScroll() { @@ -56,7 +56,7 @@ public void testClearScroll() { for (int i = 0; i < scrollIds; i++) { clearScrollRequest.addScrollId(randomAlphaOfLength(randomIntBetween(1, 30))); } - assertThat(securityActionMapper.action(ClearScrollAction.NAME, clearScrollRequest), equalTo(ClearScrollAction.NAME)); + assertThat(SecurityActionMapper.action(ClearScrollAction.NAME, clearScrollRequest), equalTo(ClearScrollAction.NAME)); } public void testClearScrollAll() { @@ -71,7 +71,7 @@ public void testClearScrollAll() { Collections.shuffle(clearScrollRequest.getScrollIds(), random()); assertThat( - securityActionMapper.action(ClearScrollAction.NAME, clearScrollRequest), + SecurityActionMapper.action(ClearScrollAction.NAME, clearScrollRequest), equalTo(SecurityActionMapper.CLUSTER_PERMISSION_SCROLL_CLEAR_ALL_NAME) ); } @@ -85,14 +85,14 @@ public void testIndicesAnalyze() { analyzeRequest = new AnalyzeAction.Request(null).text("text"); analyzeRequest.index(randomAlphaOfLength(randomIntBetween(1, 30))); } - assertThat(securityActionMapper.action(AnalyzeAction.NAME, analyzeRequest), equalTo(AnalyzeAction.NAME)); + assertThat(SecurityActionMapper.action(AnalyzeAction.NAME, analyzeRequest), equalTo(AnalyzeAction.NAME)); } public void testClusterAnalyze() { SecurityActionMapper securityActionMapper = new SecurityActionMapper(); AnalyzeAction.Request analyzeRequest = new AnalyzeAction.Request(null).text("text"); assertThat( - securityActionMapper.action(AnalyzeAction.NAME, analyzeRequest), + SecurityActionMapper.action(AnalyzeAction.NAME, analyzeRequest), equalTo(SecurityActionMapper.CLUSTER_PERMISSION_ANALYZE) ); } 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 78ef0ecfe7f95..ce29b0be807a5 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 @@ -579,7 +579,7 @@ private Map mockKeyDocument( } @SuppressWarnings("unchecked") final Map metadata = ApiKeyTests.randomMetadata(); - XContentBuilder docSource = service.newDocument( + XContentBuilder docSource = ApiKeyService.newDocument( getFastStoredHashAlgoForTests().hash(new SecureString(key.toCharArray())), "test", authentication, @@ -1727,7 +1727,7 @@ public static Authentication createApiKeyAuthentication( List keyRoles, Version version ) throws Exception { - XContentBuilder keyDocSource = apiKeyService.newDocument( + XContentBuilder keyDocSource = ApiKeyService.newDocument( getFastStoredHashAlgoForTests().hash(new SecureString(randomAlphaOfLength(16).toCharArray())), "test", authentication, @@ -1747,7 +1747,7 @@ public static Authentication createApiKeyAuthentication( ) ); PlainActionFuture> authenticationResultFuture = PlainActionFuture.newFuture(); - apiKeyService.validateApiKeyExpiration( + ApiKeyService.validateApiKeyExpiration( apiKeyDoc, new ApiKeyService.ApiKeyCredentials("id", new SecureString(randomAlphaOfLength(16).toCharArray())), Clock.systemUTC(), diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java index 9e9f518b290b0..afc6d5c17e135 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java @@ -438,7 +438,7 @@ public void testRealmWithTemplatedRoleMapping() throws Exception { NativeRoleMappingStore roleMapper = new NativeRoleMappingStore(settings, mockClient, mockSecurityIndex, scriptService) { @Override protected void loadMappings(ActionListener> listener) { - listener.onResponse(Arrays.asList(this.buildMapping("m1", new BytesArray(""" + listener.onResponse(Arrays.asList(NativeRoleMappingStore.buildMapping("m1", new BytesArray(""" { "role_templates": [ { "template": { "source": "_role_{{metadata.departmentNumber}}" } } ], "enabled": true, diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java index 38f527e694beb..c39e2be2841ac 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java @@ -484,21 +484,21 @@ public void testLdapRealmWithTemplatedRoleMapping() throws Exception { ) { @Override protected void loadMappings(ActionListener> listener) { - listener.onResponse(Arrays.asList(this.buildMapping("m1", new BytesArray(""" + listener.onResponse(Arrays.asList(NativeRoleMappingStore.buildMapping("m1", new BytesArray(""" { "role_templates": [ { "template": { "source": "_user_{{metadata.uid}}" } } ], "enabled": true, "rules": { "any": [ { "field": { "realm.name": "ldap1" } }, { "field": { "realm.name": "ldap2" } } ] } - }""")), this.buildMapping("m2", new BytesArray(""" + }""")), NativeRoleMappingStore.buildMapping("m2", new BytesArray(""" { "roles": [ "should_not_happen" ], "enabled": true, "rules": { "all": [ { "field": { "realm.name": "ldap1" } }, { "field": { "realm.name": "ldap2" } } ] } - }""")), this.buildMapping("m3", new BytesArray(""" + }""")), NativeRoleMappingStore.buildMapping("m3", new BytesArray(""" { "roles": [ "sales_admin" ], "enabled": true, diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java index f9eafd2ab1497..7fa709a71f44a 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java @@ -382,7 +382,7 @@ public void testDashIndicesAreAllowedInShardLevelRequests() { // aliases with names starting with '-' or '+' can be created up to version 5.x and can be around in 6.x ShardSearchRequest request = mock(ShardSearchRequest.class); when(request.indices()).thenReturn(new String[] { "-index10", "-index20", "+index30" }); - List indices = defaultIndicesResolver.resolveIndicesAndAliasesWithoutWildcards(SearchAction.NAME + "[s]", request) + List indices = IndicesAndAliasesResolver.resolveIndicesAndAliasesWithoutWildcards(SearchAction.NAME + "[s]", request) .getLocal(); String[] expectedIndices = new String[] { "-index10", "-index20", "+index30" }; assertThat(indices, hasSize(expectedIndices.length)); @@ -394,7 +394,7 @@ public void testWildcardsAreNotAllowedInShardLevelRequests() { when(request.indices()).thenReturn(new String[] { "index*" }); IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> defaultIndicesResolver.resolveIndicesAndAliasesWithoutWildcards(SearchAction.NAME + "[s]", request) + () -> IndicesAndAliasesResolver.resolveIndicesAndAliasesWithoutWildcards(SearchAction.NAME + "[s]", request) ); assertThat( exception, @@ -419,7 +419,7 @@ public void testAllIsNotAllowedInShardLevelRequests() { } IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> defaultIndicesResolver.resolveIndicesAndAliasesWithoutWildcards(SearchAction.NAME + "[s]", request) + () -> IndicesAndAliasesResolver.resolveIndicesAndAliasesWithoutWildcards(SearchAction.NAME + "[s]", request) ); assertThat( 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 c2bea06056bc4..4dde1ba6a4a1f 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 @@ -140,7 +140,7 @@ public void testSameUserPermission() { ); assertThat(request, instanceOf(UserRequest.class)); - assertTrue(engine.checkSameUserPermissions(action, request, authentication)); + assertTrue(RBACEngine.checkSameUserPermissions(action, request, authentication)); } public void testSameUserPermissionDoesNotAllowNonMatchingUsername() { @@ -163,7 +163,7 @@ public void testSameUserPermissionDoesNotAllowNonMatchingUsername() { when(authentication.getAuthenticationType()).thenReturn(Authentication.AuthenticationType.REALM); assertThat(request, instanceOf(UserRequest.class)); - assertFalse(engine.checkSameUserPermissions(action, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(action, request, authentication)); when(authentication.getUser()).thenReturn(user); final Authentication.RealmRef lookedUpBy = mock(Authentication.RealmRef.class); @@ -172,14 +172,14 @@ public void testSameUserPermissionDoesNotAllowNonMatchingUsername() { changePasswordRequest ? randomFrom(ReservedRealm.TYPE, NativeRealmSettings.TYPE) : randomAlphaOfLengthBetween(4, 12) ); // this should still fail since the username is still different - assertFalse(engine.checkSameUserPermissions(action, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(action, request, authentication)); if (request instanceof ChangePasswordRequest) { ((ChangePasswordRequest) request).username("joe"); } else { ((AuthenticateRequest) request).username("joe"); } - assertTrue(engine.checkSameUserPermissions(action, request, authentication)); + assertTrue(RBACEngine.checkSameUserPermissions(action, request, authentication)); } public void testSameUserPermissionDoesNotAllowOtherActions() { @@ -202,7 +202,7 @@ public void testSameUserPermissionDoesNotAllowOtherActions() { when(authentication.getAuthenticatedBy()).thenReturn(authenticatedBy); when(authenticatedBy.getType()).thenReturn(randomAlphaOfLengthBetween(4, 12)); - assertFalse(engine.checkSameUserPermissions(action, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(action, request, authentication)); verifyNoMoreInteractions(user, request, authentication); } @@ -225,10 +225,10 @@ public void testSameUserPermissionRunAsChecksAuthenticatedBy() { when(lookedUpBy.getType()).thenReturn( changePasswordRequest ? randomFrom(ReservedRealm.TYPE, NativeRealmSettings.TYPE) : randomAlphaOfLengthBetween(4, 12) ); - assertTrue(engine.checkSameUserPermissions(action, request, authentication)); + assertTrue(RBACEngine.checkSameUserPermissions(action, request, authentication)); when(authentication.getUser()).thenReturn(authUser); - assertFalse(engine.checkSameUserPermissions(action, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(action, request, authentication)); } public void testSameUserPermissionDoesNotAllowChangePasswordForOtherRealms() { @@ -251,7 +251,7 @@ public void testSameUserPermissionDoesNotAllowChangePasswordForOtherRealms() { ); assertThat(request, instanceOf(UserRequest.class)); - assertFalse(engine.checkSameUserPermissions(action, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(action, request, authentication)); verify(authenticatedBy).getType(); verify(authentication).getAuthenticatedBy(); verify(authentication, times(2)).getUser(); @@ -271,7 +271,7 @@ public void testSameUserPermissionDoesNotAllowChangePasswordForApiKey() { when(authenticatedBy.getType()).thenReturn(AuthenticationField.API_KEY_REALM_TYPE); assertThat(request, instanceOf(UserRequest.class)); - assertFalse(engine.checkSameUserPermissions(action, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(action, request, authentication)); verify(authenticatedBy).getType(); verify(authentication).getAuthenticatedBy(); verify(authentication, times(2)).getUser(); @@ -291,7 +291,7 @@ public void testSameUserPermissionDoesNotAllowChangePasswordForAccessToken() { when(authenticatedBy.getType()).thenReturn(NativeRealmSettings.TYPE); assertThat(request, instanceOf(UserRequest.class)); - assertFalse(engine.checkSameUserPermissions(action, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(action, request, authentication)); verify(authenticatedBy).getType(); verify(authentication).getAuthenticatedBy(); verify(authentication, times(2)).getUser(); @@ -322,7 +322,7 @@ public void testSameUserPermissionDoesNotAllowChangePasswordForLookedUpByOtherRe ); assertThat(request, instanceOf(UserRequest.class)); - assertFalse(engine.checkSameUserPermissions(action, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(action, request, authentication)); verify(authentication).getLookedUpBy(); verify(authentication, times(2)).getUser(); verify(lookedUpBy).getType(); @@ -346,7 +346,7 @@ public void testSameUserPermissionAllowsSelfApiKeyInfoRetrievalWhenAuthenticated when(authentication.isAuthenticatedAsApiKey()).thenCallRealMethod(); when(authentication.isApiKey()).thenCallRealMethod(); - assertTrue(engine.checkSameUserPermissions(GetApiKeyAction.NAME, request, authentication)); + assertTrue(RBACEngine.checkSameUserPermissions(GetApiKeyAction.NAME, request, authentication)); } public void testSameUserPermissionDeniesApiKeyInfoRetrievalWhenAuthenticatedByADifferentApiKey() { @@ -364,7 +364,7 @@ public void testSameUserPermissionDeniesApiKeyInfoRetrievalWhenAuthenticatedByAD when(authentication.isAuthenticatedAsApiKey()).thenCallRealMethod(); when(authentication.isApiKey()).thenCallRealMethod(); - assertFalse(engine.checkSameUserPermissions(GetApiKeyAction.NAME, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(GetApiKeyAction.NAME, request, authentication)); } public void testSameUserPermissionDeniesApiKeyInfoRetrievalWhenLookedupByIsPresent() { @@ -387,7 +387,7 @@ public void testSameUserPermissionDeniesApiKeyInfoRetrievalWhenLookedupByIsPrese when(authentication.isAuthenticatedAsApiKey()).thenCallRealMethod(); when(authentication.isApiKey()).thenCallRealMethod(); - assertFalse(engine.checkSameUserPermissions(GetApiKeyAction.NAME, request, authentication)); + assertFalse(RBACEngine.checkSameUserPermissions(GetApiKeyAction.NAME, request, authentication)); } /** @@ -1360,7 +1360,7 @@ public void testBuildUserPrivilegeResponse() { .runAs(new Privilege(Sets.newHashSet("user01", "user02"), "user01", "user02")) .build(); - final GetUserPrivilegesResponse response = engine.buildUserPrivilegesResponseObject(role); + final GetUserPrivilegesResponse response = RBACEngine.buildUserPrivilegesResponseObject(role); assertThat(response.getClusterPrivileges(), containsInAnyOrder("monitor", "manage_watcher")); assertThat(response.getConditionalClusterPrivileges(), containsInAnyOrder(manageApplicationPrivileges)); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/interceptor/SearchRequestInterceptorTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/interceptor/SearchRequestInterceptorTests.java index 07a40b9d02eb3..0e0d7de0895b3 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/interceptor/SearchRequestInterceptorTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/interceptor/SearchRequestInterceptorTests.java @@ -119,9 +119,9 @@ public void testHasRemoteIndices() { when(searchRequest.indices()).thenReturn(allIndices.toArray(String[]::new)); if (remoteIndices.length > 0) { - assertThat(interceptor.hasRemoteIndices(searchRequest), is(true)); + assertThat(SearchRequestInterceptor.hasRemoteIndices(searchRequest), is(true)); } else { - assertThat(interceptor.hasRemoteIndices(searchRequest), is(false)); + assertThat(SearchRequestInterceptor.hasRemoteIndices(searchRequest), is(false)); } } } 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 87077dd7d1189..e6e6c615be1f6 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 @@ -398,7 +398,7 @@ public void close() throws IOException { /** * Helper class to have all HTTP methods except HEAD allow for an body, including GET */ - final class HttpMethodWithEntity extends HttpEntityEnclosingRequestBase { + static final class HttpMethodWithEntity extends HttpEntityEnclosingRequestBase { private final String methodName;