Browse Source

Delete all unused private methods (#98111)

Pretty straight forward dead-code cleanup I think. Just delete all
private methods or methods in private classes that aren't used.
Armin Braun 1 year ago
parent
commit
1b84ea7421
51 changed files with 0 additions and 813 deletions
  1. 0 17
      build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java
  2. 0 4
      build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditTask.java
  3. 0 10
      distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java
  4. 0 4
      distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/RemovePluginActionTests.java
  5. 0 76
      libs/lz4/src/test/java/org/elasticsearch/lz4/ESLZ4Tests.java
  6. 0 4
      modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java
  7. 0 11
      modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java
  8. 0 34
      modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStore.java
  9. 0 4
      server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java
  10. 0 8
      server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java
  11. 0 4
      server/src/main/java/org/elasticsearch/env/NodeMetadata.java
  12. 0 2
      server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java
  13. 0 4
      server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java
  14. 0 4
      server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSyntheticWriterHelper.java
  15. 0 6
      server/src/main/java/org/elasticsearch/index/query/Operator.java
  16. 0 4
      server/src/main/java/org/elasticsearch/tasks/TaskManager.java
  17. 0 3
      server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java
  18. 0 10
      server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java
  19. 0 8
      server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java
  20. 0 11
      server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
  21. 0 5
      server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java
  22. 0 17
      server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java
  23. 0 4
      server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
  24. 0 8
      server/src/test/java/org/elasticsearch/plugins/scanners/NamedComponentReaderTests.java
  25. 0 26
      server/src/test/java/org/elasticsearch/repositories/SnapshotIndexCommitTests.java
  26. 0 48
      server/src/test/java/org/elasticsearch/search/SearchModuleTests.java
  27. 0 12
      server/src/test/java/org/elasticsearch/search/aggregations/bucket/prefix/IpPrefixAggregatorTests.java
  28. 0 6
      server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java
  29. 0 26
      server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java
  30. 0 8
      test/external-modules/die-with-dignity/src/javaRestTest/java/org/elasticsearch/qa/die_with_dignity/DieWithDignityIT.java
  31. 0 7
      test/framework/src/main/java/org/elasticsearch/cluster/DiskUsageIntegTestCase.java
  32. 0 4
      x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java
  33. 0 5
      x-pack/plugin/core/src/test/java/org/elasticsearch/license/ClusterStateLicenseServiceTests.java
  34. 0 4
      x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequestTests.java
  35. 0 29
      x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/analysis/VerifierTests.java
  36. 0 25
      x-pack/plugin/frozen-indices/src/test/java/org/elasticsearch/index/engine/frozen/FrozenEngineTests.java
  37. 0 2
      x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetTrainedModelsStatsAction.java
  38. 0 5
      x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/aggs/changepoint/ChangePointAggregatorTests.java
  39. 0 17
      x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobManagerTests.java
  40. 0 51
      x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterIT.java
  41. 0 7
      x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterResourceTests.java
  42. 0 4
      x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/util/Graphviz.java
  43. 0 12
      x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupIndexerStateTests.java
  44. 0 4
      x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DlsFlsRequestCacheTests.java
  45. 0 8
      x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/ssl/SSLTrustRestrictionsTests.java
  46. 0 10
      x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrailTests.java
  47. 0 150
      x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/service/ElasticServiceAccountsTests.java
  48. 0 3
      x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregatorTests.java
  49. 0 24
      x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcDatabaseMetaData.java
  50. 0 5
      x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcPreparedStatement.java
  51. 0 49
      x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java

+ 0 - 17
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java

@@ -207,29 +207,12 @@ public class InternalDistributionArchiveCheckPlugin implements Plugin<Project> {
         }
     }
 
-    private static boolean toolExists(Project project) {
-        if (project.getName().contains("tar")) {
-            return tarExists();
-        } else {
-            assert project.getName().contains("zip");
-            return zipExists();
-        }
-    }
-
     private static void assertNoClassFile(File file) {
         if (file.getName().endsWith(".class")) {
             throw new GradleException("Detected class file in distribution ('" + file.getName() + "')");
         }
     }
 
-    private static boolean zipExists() {
-        return new File("/bin/unzip").exists() || new File("/usr/bin/unzip").exists() || new File("/usr/local/bin/unzip").exists();
-    }
-
-    private static boolean tarExists() {
-        return new File("/bin/tar").exists() || new File("/usr/bin/tar").exists() || new File("/usr/local/bin/tar").exists();
-    }
-
     private Object distTaskOutput(TaskProvider<Task> buildDistTask) {
         return new Callable<File>() {
             @Override

+ 0 - 4
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditTask.java

@@ -262,10 +262,6 @@ public abstract class ThirdPartyAuditTask extends DefaultTask {
         getLogger().error("Forbidden APIs output:\n{}==end of forbidden APIs==", forbiddenApisOutput);
     }
 
-    private void throwNotConfiguredCorrectlyException() {
-        throw new IllegalArgumentException("Audit of third party dependencies is not configured correctly");
-    }
-
     /**
      * Ideally we would do unpacking already via artifact transform and keep unpacked jars across builds.
      * At the moment transform target folder is not configurable and forbidden CLI only takes one common

+ 0 - 10
distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java

@@ -88,7 +88,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -1591,15 +1590,6 @@ public class InstallPluginActionTests extends ESTestCase {
         assertThat(InstallPluginAction.getSemanticVersion("foo-1.2.3"), nullValue());
     }
 
-    private Map<String, Map<String, String>> namedComponentsMap() {
-        Map<String, Map<String, String>> result = new LinkedHashMap<>();
-        Map<String, String> extensibles = new LinkedHashMap<>();
-        extensibles.put("a_component", "p.A");
-        extensibles.put("b_component", "p.B");
-        result.put("org.elasticsearch.plugins.cli.test_model.ExtensibleInterface", extensibles);
-        return result;
-    }
-
     private static String namedComponentsJSON() {
         return """
             {

+ 0 - 4
distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/RemovePluginActionTests.java

@@ -140,10 +140,6 @@ public class RemovePluginActionTests extends ESTestCase {
         assertRemoveCleaned(env);
     }
 
-    private static Version minimumCompatibleVersion(Version v) {
-        return Version.fromString((v.major - 1) + ".0.0");
-    }
-
     public void testBin() throws Exception {
         createPlugin("fake");
         Path binDir = env.binFile().resolve("fake");

+ 0 - 76
libs/lz4/src/test/java/org/elasticsearch/lz4/ESLZ4Tests.java

@@ -1898,80 +1898,4 @@ public class ESLZ4Tests extends AbstractLZ4TestCase {
         testRoundTrip(data, 9, data.length - 9);
     }
 
-    private static void assertCompressedArrayEquals(String message, byte[] expected, byte[] actual) {
-        int off = 0;
-        int decompressedOff = 0;
-        while (true) {
-            if (off == expected.length) {
-                break;
-            }
-            final Sequence sequence1 = readSequence(expected, off);
-            final Sequence sequence2 = readSequence(actual, off);
-            assertEquals(message + ", off=" + off + ", decompressedOff=" + decompressedOff, sequence1, sequence2);
-            off += sequence1.length;
-            decompressedOff += sequence1.literalLen + sequence1.matchLen;
-        }
-    }
-
-    private static Sequence readSequence(byte[] buf, int off) {
-        final int start = off;
-        final int token = buf[off++] & 0xFF;
-        int literalLen = token >>> 4;
-        if (literalLen >= 0x0F) {
-            int len;
-            while ((len = buf[off++] & 0xFF) == 0xFF) {
-                literalLen += 0xFF;
-            }
-            literalLen += len;
-        }
-        off += literalLen;
-        if (off == buf.length) {
-            return new Sequence(literalLen, -1, -1, off - start);
-        }
-        int matchDec = (buf[off++] & 0xFF) | ((buf[off++] & 0xFF) << 8);
-        int matchLen = token & 0x0F;
-        if (matchLen >= 0x0F) {
-            int len;
-            while ((len = buf[off++] & 0xFF) == 0xFF) {
-                matchLen += 0xFF;
-            }
-            matchLen += len;
-        }
-        matchLen += 4;
-        return new Sequence(literalLen, matchDec, matchLen, off - start);
-    }
-
-    private static class Sequence {
-        final int literalLen, matchDec, matchLen, length;
-
-        private Sequence(int literalLen, int matchDec, int matchLen, int length) {
-            this.literalLen = literalLen;
-            this.matchDec = matchDec;
-            this.matchLen = matchLen;
-            this.length = length;
-        }
-
-        @Override
-        public String toString() {
-            return "Sequence [literalLen=" + literalLen + ", matchDec=" + matchDec + ", matchLen=" + matchLen + "]";
-        }
-
-        @Override
-        public int hashCode() {
-            return 42;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (obj == null) return false;
-            if (getClass() != obj.getClass()) return false;
-            Sequence other = (Sequence) obj;
-            if (literalLen != other.literalLen) return false;
-            if (matchDec != other.matchDec) return false;
-            if (matchLen != other.matchLen) return false;
-            return true;
-        }
-
-    }
 }

+ 0 - 4
modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java

@@ -222,10 +222,6 @@ public final class Walker extends PainlessParserBaseVisitor<ANode> {
         return new Location(sourceName, ctx.getStart().getStartIndex());
     }
 
-    private Location location(TerminalNode tn) {
-        return new Location(sourceName, tn.getSymbol().getStartIndex());
-    }
-
     @Override
     public ANode visitSource(SourceContext ctx) {
         List<SFunction> functions = new ArrayList<>();

+ 0 - 11
modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java

@@ -130,17 +130,6 @@ public class LegacyGeoShapeFieldMapper extends AbstractShapeGeometryFieldMapper<
         public static final String GEOHASH = "geohash";
     }
 
-    @Deprecated
-    public static class DeprecatedParameters {
-
-        private static void checkPrefixTreeSupport(String fieldName) {
-            if (ShapesAvailability.JTS_AVAILABLE == false || ShapesAvailability.SPATIAL4J_AVAILABLE == false) {
-                throw new ElasticsearchParseException("Field parameter [{}] is not supported for [{}] field type", fieldName, CONTENT_TYPE);
-            }
-
-        }
-    }
-
     private static Builder builder(FieldMapper in) {
         return ((LegacyGeoShapeFieldMapper) in).builder;
     }

+ 0 - 34
modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStore.java

@@ -759,38 +759,4 @@ class GoogleCloudStorageBlobStore implements BlobStore {
         }
     }
 
-    private static final class PrivilegedWriteChannelStream extends OutputStream {
-
-        private final OutputStream stream;
-
-        PrivilegedWriteChannelStream(WritableByteChannel channel) {
-            stream = Channels.newOutputStream(channel);
-        }
-
-        @Override
-        public void write(int b) throws IOException {
-            SocketAccess.doPrivilegedVoidIOException(() -> stream.write(b));
-        }
-
-        @Override
-        public void write(byte[] b) throws IOException {
-            SocketAccess.doPrivilegedVoidIOException(() -> stream.write(b));
-        }
-
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            SocketAccess.doPrivilegedVoidIOException(() -> stream.write(b, off, len));
-        }
-
-        @Override
-        public void flush() throws IOException {
-            SocketAccess.doPrivilegedVoidIOException(stream::flush);
-        }
-
-        @Override
-        public void close() throws IOException {
-            SocketAccess.doPrivilegedVoidIOException(stream::close);
-        }
-    }
-
 }

+ 0 - 4
server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java

@@ -609,10 +609,6 @@ public class IndicesRequestIT extends ESIntegTestCase {
         assertSameIndices(originalRequest, false, actions);
     }
 
-    private static void assertSameIndicesOptionalRequests(IndicesRequest originalRequest, String... actions) {
-        assertSameIndices(originalRequest, true, actions);
-    }
-
     private static void assertSameIndices(IndicesRequest originalRequest, boolean optional, String... actions) {
         for (String action : actions) {
             List<TransportRequest> requests = consumeTransportRequests(action);

+ 0 - 8
server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java

@@ -356,14 +356,6 @@ public abstract class TransportTasksAction<
             this.exceptions = exceptions;
         }
 
-        public String getNodeId() {
-            return nodeId;
-        }
-
-        public List<TaskOperationFailure> getExceptions() {
-            return exceptions;
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             out.writeString(nodeId);

+ 0 - 4
server/src/main/java/org/elasticsearch/env/NodeMetadata.java

@@ -155,10 +155,6 @@ public final class NodeMetadata {
             this.nodeVersion = Version.fromId(nodeVersionId);
         }
 
-        public void setPreviousNodeVersionId(int previousNodeVersionId) {
-            this.previousNodeVersion = Version.fromId(previousNodeVersionId);
-        }
-
         public void setOldestIndexVersion(int oldestIndexVersion) {
             this.oldestIndexVersion = IndexVersion.fromId(oldestIndexVersion);
         }

+ 0 - 2
server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java

@@ -131,8 +131,6 @@ public final class HealthMetadata extends AbstractNamedDiffable<ClusterState.Cus
         private Disk disk;
         private ShardLimits shardLimits;
 
-        private Builder() {}
-
         private Builder(HealthMetadata healthMetadata) {
             this.disk = healthMetadata.diskMetadata;
             this.shardLimits = healthMetadata.shardLimitsMetadata;

+ 0 - 4
server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java

@@ -113,10 +113,6 @@ public final class FlattenedFieldMapper extends FieldMapper {
         public static final int DEPTH_LIMIT = 20;
     }
 
-    private static FlattenedFieldMapper toType(FieldMapper in) {
-        return (FlattenedFieldMapper) in;
-    }
-
     private static Builder builder(Mapper in) {
         return ((FlattenedFieldMapper) in).builder;
     }

+ 0 - 4
server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSyntheticWriterHelper.java

@@ -188,10 +188,6 @@ class FlattenedFieldSyntheticWriterHelper {
             this(value, new Prefix(key), new Suffix(key));
         }
 
-        public Prefix prefix() {
-            return this.prefix;
-        }
-
         public Suffix suffix() {
             return this.suffix;
         }

+ 0 - 6
server/src/main/java/org/elasticsearch/index/query/Operator.java

@@ -12,7 +12,6 @@ import org.apache.lucene.search.BooleanClause;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
-import org.elasticsearch.common.util.CollectionUtils;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -48,9 +47,4 @@ public enum Operator implements Writeable {
         return valueOf(op.toUpperCase(Locale.ROOT));
     }
 
-    private static IllegalArgumentException newOperatorException(String op) {
-        return new IllegalArgumentException(
-            "operator needs to be either " + CollectionUtils.arrayAsArrayList(values()) + ", but not [" + op + "]"
-        );
-    }
 }

+ 0 - 4
server/src/main/java/org/elasticsearch/tasks/TaskManager.java

@@ -658,10 +658,6 @@ public class TaskManager implements ClusterStateApplier {
             ExceptionsHelper.reThrowIfNotNull(rootException);
         }
 
-        public boolean hasParent(TaskId parentTaskId) {
-            return task.getParentTaskId().equals(parentTaskId);
-        }
-
         public CancellableTask getTask() {
             return task;
         }

+ 0 - 3
server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java

@@ -1078,7 +1078,4 @@ public class NodeStatsTests extends ESTestCase {
         }
     }
 
-    private IngestStats.Stats getPipelineStats(List<IngestStats.PipelineStat> pipelineStats, String id) {
-        return pipelineStats.stream().filter(p1 -> p1.pipelineId().equals(id)).findFirst().map(p2 -> p2.stats()).orElse(null);
-    }
 }

+ 0 - 10
server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java

@@ -438,14 +438,4 @@ public class TransportNodesActionTests extends ESTestCase {
         }
     }
 
-    private static class OtherNodeResponse extends BaseNodeResponse {
-        OtherNodeResponse() {
-            super(mock(DiscoveryNode.class));
-        }
-
-        protected OtherNodeResponse(StreamInput in) throws IOException {
-            super(in);
-        }
-    }
-
 }

+ 0 - 8
server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java

@@ -1557,14 +1557,6 @@ public class IndexNameExpressionResolverTests extends ESTestCase {
         }
     }
 
-    private static Metadata metadataBuilder(String... indices) {
-        Metadata.Builder mdBuilder = Metadata.builder();
-        for (String concreteIndex : indices) {
-            mdBuilder.put(indexBuilder(concreteIndex));
-        }
-        return mdBuilder.build();
-    }
-
     public void testFilterClosedIndicesOnAliases() {
         Metadata.Builder mdBuilder = Metadata.builder()
             .put(indexBuilder("test-0").state(State.OPEN).putAlias(AliasMetadata.builder("alias-0")))

+ 0 - 11
server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

@@ -3435,17 +3435,6 @@ public class InternalEngineTests extends EngineTestCase {
         }
     }
 
-    private Path[] filterExtraFSFiles(Path[] files) {
-        List<Path> paths = new ArrayList<>();
-        for (Path p : files) {
-            if (p.getFileName().toString().startsWith("extra")) {
-                continue;
-            }
-            paths.add(p);
-        }
-        return paths.toArray(new Path[0]);
-    }
-
     public void testTranslogReplay() throws IOException {
         final LongSupplier inSyncGlobalCheckpointSupplier = () -> this.engine.getProcessedLocalCheckpoint();
         final int numDocs = randomIntBetween(1, 10);

+ 0 - 5
server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java

@@ -43,7 +43,6 @@ import org.elasticsearch.script.field.DateNanosDocValuesField;
 import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 
 import java.io.IOException;
-import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.Collections;
@@ -333,10 +332,6 @@ public class DateFieldTypeTests extends FieldTypeTestCase {
         dir.close();
     }
 
-    private Instant instant(String str) {
-        return DateFormatters.from(DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.parse(str)).toInstant();
-    }
-
     private static DateFieldType fieldType(Resolution resolution, String format, String nullValue) {
         DateFormatter formatter = DateFormatter.forPattern(format);
         return new DateFieldType("field", true, false, true, formatter, resolution, nullValue, null, Collections.emptyMap());

+ 0 - 17
server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java

@@ -70,7 +70,6 @@ import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBooleanSubQuery;
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.instanceOf;
 
@@ -1427,22 +1426,6 @@ public class QueryStringQueryBuilderTests extends AbstractQueryTestCase<QueryStr
         return IndexMetadata.builder(name).settings(build).build();
     }
 
-    private void assertQueryWithAllFieldsWildcard(Query query) {
-        assertEquals(DisjunctionMaxQuery.class, query.getClass());
-        DisjunctionMaxQuery disjunctionMaxQuery = (DisjunctionMaxQuery) query;
-        int noMatchNoDocsQueries = 0;
-        for (Query q : disjunctionMaxQuery.getDisjuncts()) {
-            if (q.getClass() == MatchNoDocsQuery.class) {
-                noMatchNoDocsQueries++;
-            }
-        }
-        assertEquals(9, noMatchNoDocsQueries);
-        assertThat(
-            disjunctionMaxQuery.getDisjuncts(),
-            hasItems(new TermQuery(new Term(TEXT_FIELD_NAME, "hello")), new TermQuery(new Term(KEYWORD_FIELD_NAME, "hello")))
-        );
-    }
-
     public void testWhitespaceKeywordQueries() throws IOException {
         String query = "\"query with spaces\"";
         QueryStringQueryBuilder b = new QueryStringQueryBuilder(query);

+ 0 - 4
server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java

@@ -2649,10 +2649,6 @@ public class IngestServiceTests extends ESTestCase {
 
         private final IngestDocument ingestDocument;
 
-        IngestDocumentMatcher(String index, String type, String id, Map<String, Object> source) {
-            this.ingestDocument = new IngestDocument(index, id, 1, null, null, source);
-        }
-
         IngestDocumentMatcher(String index, String type, String id, long version, VersionType versionType, Map<String, Object> source) {
             this.ingestDocument = new IngestDocument(index, id, version, null, versionType, source);
         }

+ 0 - 8
server/src/test/java/org/elasticsearch/plugins/scanners/NamedComponentReaderTests.java

@@ -12,7 +12,6 @@ import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.test.ESTestCase;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -94,11 +93,4 @@ public class NamedComponentReaderTests extends ESTestCase {
         );
     }
 
-    private URL toURL(Path p) {
-        try {
-            return p.toUri().toURL();
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }

+ 0 - 26
server/src/test/java/org/elasticsearch/repositories/SnapshotIndexCommitTests.java

@@ -15,7 +15,6 @@ import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.test.ESTestCase;
 
 import java.io.IOException;
-import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -73,31 +72,6 @@ public class SnapshotIndexCommitTests extends ESTestCase {
         assertOnCompletionBehaviour(throwOnClose, outerException, indexCommitRef);
     }
 
-    private void runConcurrentTest(boolean throwOnClose) throws Exception {
-        final var isClosed = new AtomicBoolean();
-        final var indexCommitRef = getSnapshotIndexCommit(throwOnClose, isClosed);
-        final var completeFuture = new PlainActionFuture<String>();
-        final var closingActionListener = indexCommitRef.closingBefore(completeFuture);
-
-        final var barrier = new CyclicBarrier(2);
-        final var completeThread = new Thread(() -> {
-            safeAwait(barrier);
-            closingActionListener.onResponse("success");
-        });
-        completeThread.start();
-
-        final var abortThread = new Thread(() -> {
-            safeAwait(barrier);
-            indexCommitRef.onAbort();
-        });
-        abortThread.start();
-
-        completeThread.join();
-        abortThread.join();
-
-        assertOnCompletionFuture(throwOnClose, null, completeFuture);
-    }
-
     private SnapshotIndexCommit getSnapshotIndexCommit(boolean throwOnClose, AtomicBoolean isClosed) {
         return new SnapshotIndexCommit(new Engine.IndexCommitRef(null, () -> {
             assertTrue(isClosed.compareAndSet(false, true));

+ 0 - 48
server/src/test/java/org/elasticsearch/search/SearchModuleTests.java

@@ -7,8 +7,6 @@
  */
 package org.elasticsearch.search;
 
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.util.CharsRefBuilder;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.CheckedBiConsumer;
@@ -28,11 +26,9 @@ import org.elasticsearch.index.query.TypeQueryV7Builder;
 import org.elasticsearch.index.query.functionscore.GaussDecayFunctionBuilder;
 import org.elasticsearch.plugins.SearchPlugin;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationReduceContext;
 import org.elasticsearch.search.aggregations.AggregatorFactories.Builder;
 import org.elasticsearch.search.aggregations.AggregatorFactory;
 import org.elasticsearch.search.aggregations.BaseAggregationBuilder;
-import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.heuristic.ChiSquare;
 import org.elasticsearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder;
@@ -56,12 +52,8 @@ import org.elasticsearch.search.rescore.QueryRescorerBuilder;
 import org.elasticsearch.search.rescore.RescoreContext;
 import org.elasticsearch.search.rescore.RescorerBuilder;
 import org.elasticsearch.search.suggest.Suggest.Suggestion;
-import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry;
-import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry.Option;
-import org.elasticsearch.search.suggest.Suggester;
 import org.elasticsearch.search.suggest.SuggestionBuilder;
 import org.elasticsearch.search.suggest.SuggestionSearchContext;
-import org.elasticsearch.search.suggest.SuggestionSearchContext.SuggestionContext;
 import org.elasticsearch.search.suggest.term.TermSuggestion;
 import org.elasticsearch.search.suggest.term.TermSuggestionBuilder;
 import org.elasticsearch.test.ESTestCase;
@@ -590,10 +582,6 @@ public class SearchModuleTests extends ESTestCase {
             return null;
         }
 
-        private static TestPipelineAggregationBuilder fromXContent(String name, XContentParser p) {
-            return null;
-        }
-
         @Override
         protected void validate(ValidationContext context) {}
 
@@ -603,20 +591,6 @@ public class SearchModuleTests extends ESTestCase {
         }
     }
 
-    /**
-     * Dummy test {@link PipelineAggregator} used to test registering aggregation builders.
-     */
-    private static class TestPipelineAggregator extends PipelineAggregator {
-        TestPipelineAggregator() {
-            super("test", new String[] {}, null);
-        }
-
-        @Override
-        public InternalAggregation reduce(InternalAggregation aggregation, AggregationReduceContext reduceContext) {
-            return null;
-        }
-    }
-
     private static class TestRescorerBuilder extends RescorerBuilder<TestRescorerBuilder> {
         public static TestRescorerBuilder fromXContent(XContentParser parser) {
             return null;
@@ -653,28 +627,6 @@ public class SearchModuleTests extends ESTestCase {
         }
     }
 
-    private static class TestSuggester extends Suggester<SuggestionSearchContext.SuggestionContext> {
-
-        @Override
-        protected Suggestion<? extends Suggestion.Entry<? extends Suggestion.Entry.Option>> innerExecute(
-            String name,
-            SuggestionSearchContext.SuggestionContext suggestion,
-            IndexSearcher searcher,
-            CharsRefBuilder spare
-        ) throws IOException {
-            return null;
-        }
-
-        @Override
-        protected Suggestion<? extends Entry<? extends Option>> emptySuggestion(
-            String name,
-            SuggestionContext suggestion,
-            CharsRefBuilder spare
-        ) throws IOException {
-            return null;
-        }
-    }
-
     private static class TestSuggestionBuilder extends SuggestionBuilder<TestSuggestionBuilder> {
 
         public static final String SUGGESTION_NAME = "test";

+ 0 - 12
server/src/test/java/org/elasticsearch/search/aggregations/bucket/prefix/IpPrefixAggregatorTests.java

@@ -65,26 +65,14 @@ public class IpPrefixAggregatorTests extends AggregatorTestCase {
             this.time = time;
         }
 
-        public String getIpAddressAsString() {
-            return ipAddressAsString;
-        }
-
         public InetAddress getIpAddress() {
             return ipAddress;
         }
 
-        public InetAddress getSubnet() {
-            return subnet;
-        }
-
         public String getSubnetAsString() {
             return subnetAsString;
         }
 
-        public int getPrefixLength() {
-            return prefixLength;
-        }
-
         public long getTime() {
             return time;
         }

+ 0 - 6
server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java

@@ -706,12 +706,6 @@ public class SignificantTermsAggregatorTests extends AggregatorTestCase {
         }
     }
 
-    private void addFields(Document doc, List<Field> createFields) {
-        for (Field field : createFields) {
-            doc.add(field);
-        }
-    }
-
     public String randomExecutionHint() {
         return randomBoolean() ? null : randomFrom(ExecutionMode.values()).toString();
     }

+ 0 - 26
server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java

@@ -35,12 +35,10 @@ import org.apache.lucene.store.Directory;
 import org.apache.lucene.tests.index.RandomIndexWriter;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.NumericUtils;
-import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.network.InetAddresses;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.common.util.MockBigArrays;
 import org.elasticsearch.common.util.MockPageCacheRecycler;
 import org.elasticsearch.core.CheckedConsumer;
@@ -87,7 +85,6 @@ import org.elasticsearch.search.aggregations.AggregatorTestCase;
 import org.elasticsearch.search.aggregations.BucketOrder;
 import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation;
-import org.elasticsearch.search.aggregations.MultiBucketConsumerService;
 import org.elasticsearch.search.aggregations.MultiBucketConsumerService.TooManyBucketsException;
 import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
@@ -2248,29 +2245,6 @@ public class TermsAggregatorTests extends AggregatorTestCase {
         return searchAndReduce(reader, new AggTestConfig(builder, fieldType));
     }
 
-    private <T extends InternalAggregation> T reduce(AggregationBuilder builder, Aggregator agg, BigArrays bigArrays) throws IOException {
-        // now do the final reduce
-        MultiBucketConsumerService.MultiBucketConsumer reduceBucketConsumer = new MultiBucketConsumerService.MultiBucketConsumer(
-            Integer.MAX_VALUE,
-            new NoneCircuitBreakerService().getBreaker(CircuitBreaker.REQUEST)
-        );
-        AggregationReduceContext context = new AggregationReduceContext.ForFinal(
-            bigArrays,
-            getMockScriptService(),
-            () -> false,
-            builder,
-            reduceBucketConsumer,
-            PipelineTree.EMPTY
-        );
-
-        @SuppressWarnings("unchecked")
-        T topLevel = (T) agg.buildTopLevel();
-        @SuppressWarnings("unchecked")
-        T result = (T) topLevel.reduce(Collections.singletonList(topLevel), context);
-        doAssertReducedMultiBucketConsumer(result, reduceBucketConsumer);
-        return result;
-    }
-
     @Override
     protected List<ObjectMapper> objectMappers() {
         return List.of(NestedAggregatorTests.nestedObject("nested_object"));

+ 0 - 8
test/external-modules/die-with-dignity/src/javaRestTest/java/org/elasticsearch/qa/die_with_dignity/DieWithDignityIT.java

@@ -24,8 +24,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -144,12 +142,6 @@ public class DieWithDignityIT extends ESRestTestCase {
         return true;
     }
 
-    private void debugLogs(Path path) throws IOException {
-        try (BufferedReader reader = Files.newBufferedReader(path)) {
-            reader.lines().forEach(line -> logger.info(line));
-        }
-    }
-
     @Override
     protected boolean preserveClusterUponCompletion() {
         // as the cluster is dead its state can not be wiped successfully so we have to bypass wiping the cluster

+ 0 - 7
test/framework/src/main/java/org/elasticsearch/cluster/DiskUsageIntegTestCase.java

@@ -12,7 +12,6 @@ import org.apache.lucene.tests.mockfile.FilterFileStore;
 import org.apache.lucene.tests.mockfile.FilterFileSystemProvider;
 import org.apache.lucene.tests.mockfile.FilterPath;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.PathUtils;
 import org.elasticsearch.core.PathUtilsForTesting;
 import org.elasticsearch.env.Environment;
@@ -231,11 +230,5 @@ public class DiskUsageIntegTestCase extends ESIntegTestCase {
             return trackedPaths.get(containingPaths.iterator().next());
         }
 
-        void clearTrackedPaths() throws IOException {
-            for (Path path : trackedPaths.keySet()) {
-                IOUtils.rm(path);
-            }
-            trackedPaths.clear();
-        }
     }
 }

+ 0 - 4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java

@@ -1130,10 +1130,6 @@ public final class Authentication implements ToXContentObject {
             return API_KEY_REALM_NAME.equals(name) && API_KEY_REALM_TYPE.equals(type);
         }
 
-        private boolean isServiceAccountRealm() {
-            return ServiceAccountSettings.REALM_NAME.equals(name) && ServiceAccountSettings.REALM_TYPE.equals(type);
-        }
-
         private boolean isCrossClusterAccessRealm() {
             return CROSS_CLUSTER_ACCESS_REALM_NAME.equals(name) && CROSS_CLUSTER_ACCESS_REALM_TYPE.equals(type);
         }

+ 0 - 5
x-pack/plugin/core/src/test/java/org/elasticsearch/license/ClusterStateLicenseServiceTests.java

@@ -240,11 +240,6 @@ public class ClusterStateLicenseServiceTests extends ESTestCase {
         return clusterService;
     }
 
-    @SuppressWarnings("unchecked")
-    private static <T extends ClusterStateTaskListener> MasterServiceTaskQueue<T> newMockTaskQueue() {
-        return mock(MasterServiceTaskQueue.class);
-    }
-
     private void assertRegisterValidLicense(Settings baseSettings, License.LicenseType licenseType) throws IOException {
         tryRegisterLicense(baseSettings, licenseType, future -> assertThat(future.actionGet().status(), equalTo(LicensesStatus.VALID)));
     }

+ 0 - 4
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequestTests.java

@@ -246,10 +246,6 @@ public class PutRoleRequestTests extends ESTestCase {
         return request;
     }
 
-    private PutRoleRequest buildRandomRequest() {
-        return buildRandomRequest(true);
-    }
-
     private PutRoleRequest buildRandomRequest(boolean allowRemoteIndices) {
         final PutRoleRequest request = new PutRoleRequest();
         request.name(randomAlphaOfLengthBetween(4, 9));

+ 0 - 29
x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/analysis/VerifierTests.java

@@ -6,14 +6,11 @@
  */
 package org.elasticsearch.xpack.eql.analysis;
 
-import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.tasks.TaskId;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.eql.parser.EqlParser;
 import org.elasticsearch.xpack.eql.parser.ParsingException;
 import org.elasticsearch.xpack.eql.plan.logical.KeyedFilter;
 import org.elasticsearch.xpack.eql.plan.logical.Sample;
-import org.elasticsearch.xpack.eql.session.EqlConfiguration;
 import org.elasticsearch.xpack.ql.expression.EmptyAttribute;
 import org.elasticsearch.xpack.ql.index.EsIndex;
 import org.elasticsearch.xpack.ql.index.IndexResolution;
@@ -21,11 +18,8 @@ import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.ql.type.EsField;
 import org.elasticsearch.xpack.ql.type.TypesTests;
 
-import java.util.Collection;
 import java.util.Map;
-import java.util.function.Function;
 
-import static java.util.Collections.emptyMap;
 import static org.elasticsearch.xpack.eql.analysis.AnalyzerTestUtils.analyzer;
 import static org.hamcrest.Matchers.startsWith;
 
@@ -452,29 +446,6 @@ public class VerifierTests extends ESTestCase {
         );
     }
 
-    private LogicalPlan analyzeWithVerifierFunction(Function<String, Collection<String>> versionIncompatibleClusters) {
-        PreAnalyzer preAnalyzer = new PreAnalyzer();
-        EqlConfiguration eqlConfiguration = new EqlConfiguration(
-            new String[] { "none" },
-            org.elasticsearch.xpack.ql.util.DateUtils.UTC,
-            "nobody",
-            "cluster",
-            null,
-            emptyMap(),
-            null,
-            TimeValue.timeValueSeconds(30),
-            null,
-            123,
-            1,
-            "",
-            new TaskId("test", 123),
-            null
-        );
-        Analyzer analyzer = analyzer(eqlConfiguration);
-        IndexResolution resolution = IndexResolution.valid(new EsIndex("irrelevant", loadEqlMapping("mapping-default.json")));
-        return analyzer.analyze(preAnalyzer.preAnalyze(new EqlParser().createStatement("any where true"), resolution));
-    }
-
     public void testIgnoredTimestampAndTiebreakerInSamples() {
         LogicalPlan plan = accept("sample by hostname [any where true] [any where true]");
 

+ 0 - 25
x-pack/plugin/frozen-indices/src/test/java/org/elasticsearch/index/engine/frozen/FrozenEngineTests.java

@@ -28,8 +28,6 @@ import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
 import org.hamcrest.Matchers;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
@@ -277,29 +275,6 @@ public class FrozenEngineTests extends EngineTestCase {
         }
     }
 
-    private static void checkOverrideMethods(Class<?> clazz) throws NoSuchMethodException, SecurityException {
-        final Class<?> superClazz = clazz.getSuperclass();
-        for (Method m : superClazz.getMethods()) {
-            final int mods = m.getModifiers();
-            if (Modifier.isStatic(mods)
-                || Modifier.isAbstract(mods)
-                || Modifier.isFinal(mods)
-                || m.isSynthetic()
-                || m.getName().equals("attributes")
-                || m.getName().equals("getStats")) {
-                continue;
-            }
-            // The point of these checks is to ensure that methods from the super class
-            // are overwritten to make sure we never miss a method from FilterLeafReader / FilterDirectoryReader
-            final Method subM = clazz.getMethod(m.getName(), m.getParameterTypes());
-            if (subM.getDeclaringClass() == superClazz
-                && m.getDeclaringClass() != Object.class
-                && m.getDeclaringClass() == subM.getDeclaringClass()) {
-                fail(clazz + " doesn't override" + m + " although it has been declared by it's superclass");
-            }
-        }
-    }
-
     private class CountingRefreshListener implements ReferenceManager.RefreshListener {
 
         final AtomicInteger afterRefresh = new AtomicInteger(0);

+ 0 - 2
x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetTrainedModelsStatsAction.java

@@ -493,6 +493,4 @@ public class TransportGetTrainedModelsStatsAction extends HandledTransportAction
         }
     }
 
-    private record ModelAndDeployment(String modelId, String deploymentId) {}
-
 }

+ 0 - 5
x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/aggs/changepoint/ChangePointAggregatorTests.java

@@ -24,7 +24,6 @@ import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter;
 import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 import org.elasticsearch.xpack.ml.MachineLearning;
-import org.elasticsearch.xpack.ml.aggs.MlAggsHelper;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -231,8 +230,4 @@ public class ChangePointAggregatorTests extends AggregatorTestCase {
         }
     }
 
-    private static MlAggsHelper.DoubleBucketValues values(double[] values) {
-        return new MlAggsHelper.DoubleBucketValues(new long[0], values, new int[0]);
-    }
-
 }

+ 0 - 17
x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobManagerTests.java

@@ -443,17 +443,6 @@ public class JobManagerTests extends ESTestCase {
         return builder;
     }
 
-    private Job.Builder createJob() {
-        Detector.Builder d = new Detector.Builder("info_content", "domain").setOverFieldName("client");
-        AnalysisConfig.Builder ac = new AnalysisConfig.Builder(Collections.singletonList(d.build()));
-
-        Job.Builder builder = new Job.Builder();
-        builder.setId("foo");
-        builder.setAnalysisConfig(ac);
-        builder.setDataDescription(new DataDescription.Builder());
-        return builder;
-    }
-
     private JobManager createJobManager(Client client) {
         return new JobManager(
             jobResultsProvider,
@@ -469,12 +458,6 @@ public class JobManagerTests extends ESTestCase {
         );
     }
 
-    private ClusterState createClusterState() {
-        ClusterState.Builder builder = ClusterState.builder(new ClusterName("_name"));
-        builder.metadata(Metadata.builder());
-        return builder.build();
-    }
-
     private BytesReference toBytesReference(ToXContent content) throws IOException {
         try (XContentBuilder xContentBuilder = XContentFactory.jsonBuilder()) {
             content.toXContent(xContentBuilder, ToXContent.EMPTY_PARAMS);

+ 0 - 51
x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterIT.java

@@ -16,7 +16,6 @@ import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.support.ActionTestUtils;
 import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexTemplateMetadata;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -37,12 +36,7 @@ import org.elasticsearch.test.ESIntegTestCase.Scope;
 import org.elasticsearch.test.http.MockRequest;
 import org.elasticsearch.test.http.MockResponse;
 import org.elasticsearch.test.http.MockWebServer;
-import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentFactory;
-import org.elasticsearch.xcontent.XContentParser;
-import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.xcontent.json.JsonXContent;
 import org.elasticsearch.xpack.core.monitoring.exporter.MonitoringDoc;
 import org.elasticsearch.xpack.core.ssl.SSLService;
 import org.elasticsearch.xpack.monitoring.LocalStateMonitoring;
@@ -519,41 +513,6 @@ public class HttpExporterIT extends MonitoringIntegTestCase {
         }
     }
 
-    private void assertMonitorVersionResource(
-        final MockWebServer webServer,
-        final boolean alreadyExists,
-        final String resourcePrefix,
-        final List<Tuple<String, String>> resources,
-        @Nullable final Map<String, String[]> customHeaders,
-        @Nullable final String basePath
-    ) throws Exception {
-        final String pathPrefix = basePathToAssertablePrefix(basePath);
-
-        for (Tuple<String, String> resource : resources) {
-            final MockRequest getRequest = webServer.takeRequest();
-
-            assertThat(getRequest.getMethod(), equalTo("GET"));
-            assertThat(getRequest.getUri().getPath(), equalTo(pathPrefix + resourcePrefix + resource.v1()));
-            assertMonitorVersionQueryString(getRequest.getUri().getQuery(), Collections.emptyMap());
-            assertHeaders(getRequest, customHeaders);
-
-            if (alreadyExists == false) {
-                final MockRequest putRequest = webServer.takeRequest();
-
-                assertThat(putRequest.getMethod(), equalTo("PUT"));
-                assertThat(putRequest.getUri().getPath(), equalTo(pathPrefix + resourcePrefix + resource.v1()));
-                Map<String, String> parameters = Collections.emptyMap();
-                assertMonitorVersionQueryString(putRequest.getUri().getQuery(), parameters);
-                if (resourcePrefix.startsWith("/_template")) {
-                    assertThat(putRequest.getBody(), equalTo(getExternalTemplateRepresentation(resource.v2())));
-                } else {
-                    assertThat(putRequest.getBody(), equalTo(resource.v2()));
-                }
-                assertHeaders(putRequest, customHeaders);
-            }
-        }
-    }
-
     private void assertMonitorVersionQueryString(String query, final Map<String, String> parameters) {
         Map<String, String> expectedQueryStringMap = new HashMap<>();
         RestUtils.decodeQueryString(query, 0, expectedQueryStringMap);
@@ -941,14 +900,4 @@ public class HttpExporterIT extends MonitoringIntegTestCase {
         return server;
     }
 
-    private String getExternalTemplateRepresentation(String internalRepresentation) throws IOException {
-        try (
-            XContentParser parser = XContentFactory.xContent(XContentType.JSON)
-                .createParser(XContentParserConfiguration.EMPTY, internalRepresentation)
-        ) {
-            XContentBuilder builder = JsonXContent.contentBuilder();
-            IndexTemplateMetadata.Builder.removeType(IndexTemplateMetadata.Builder.fromXContent(parser, ""), builder);
-            return BytesReference.bytes(builder).utf8ToString();
-        }
-    }
 }

+ 0 - 7
x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterResourceTests.java

@@ -695,13 +695,6 @@ public class HttpExporterResourceTests extends AbstractPublishableHttpResourceTe
         );
     }
 
-    private void verifyPutTemplates(final int called) {
-        verify(client, times(called)).performRequestAsync(
-            argThat(new RequestMatcher(is("PUT"), startsWith("/_template/"))::matches),
-            any(ResponseListener.class)
-        );
-    }
-
     private void verifyWatcherCheck() {
         verify(client).performRequestAsync(argThat(new RequestMatcher(is("GET"), is("/_xpack"))::matches), any(ResponseListener.class));
     }

+ 0 - 4
x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/util/Graphviz.java

@@ -305,10 +305,6 @@ public abstract class Graphviz {
         return "\"" + value + "\"";
     }
 
-    private static String escapeGraphviz(String value) {
-        return value.replace("<", "\\<").replace(">", "\\>").replace("\"", "\\\"");
-    }
-
     private static void indent(StringBuilder sb, int indent) {
         for (int i = 0; i < indent; i++) {
             sb.append(" ");

+ 0 - 12
x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupIndexerStateTests.java

@@ -191,18 +191,6 @@ public class RollupIndexerStateTests extends ESTestCase {
         final BiConsumer<IndexerState, Map<String, Object>> saveStateCheck;
         private CountDownLatch latch;
 
-        NonEmptyRollupIndexer(
-            ThreadPool threadPool,
-            RollupJob job,
-            AtomicReference<IndexerState> initialState,
-            Map<String, Object> initialPosition,
-            Function<SearchRequest, SearchResponse> searchFunction,
-            Function<BulkRequest, BulkResponse> bulkFunction,
-            Consumer<Exception> failureConsumer
-        ) {
-            this(threadPool, job, initialState, initialPosition, searchFunction, bulkFunction, failureConsumer, (i, m) -> {});
-        }
-
         NonEmptyRollupIndexer(
             ThreadPool threadPool,
             RollupJob job,

+ 0 - 4
x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DlsFlsRequestCacheTests.java

@@ -48,7 +48,6 @@ import static org.elasticsearch.action.support.WriteRequest.RefreshPolicy.WAIT_U
 import static org.elasticsearch.test.SecuritySettingsSource.TEST_PASSWORD_HASHED;
 import static org.elasticsearch.test.SecuritySettingsSourceField.TEST_PASSWORD;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -482,7 +481,4 @@ public class DlsFlsRequestCacheTests extends SecuritySingleNodeTestCase {
         );
     }
 
-    private void clearCache() {
-        assertNoFailures(client().admin().indices().prepareClearCache(DLS_INDEX, FLS_INDEX, INDEX).setRequestCache(true).get());
-    }
 }

+ 0 - 8
x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/ssl/SSLTrustRestrictionsTests.java

@@ -276,18 +276,10 @@ public class SSLTrustRestrictionsTests extends SecurityIntegTestCase {
             this.certPath = certPath;
         }
 
-        private PrivateKey getKey() {
-            return key;
-        }
-
         private Path getKeyPath() {
             return keyPath;
         }
 
-        private X509Certificate getCertificate() {
-            return certificate;
-        }
-
         private Path getCertPath() {
             return certPath;
         }

+ 0 - 10
x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrailTests.java

@@ -31,7 +31,6 @@ import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.network.NetworkAddress;
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.SecureString;
-import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.core.TimeValue;
@@ -145,11 +144,9 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Clock;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
@@ -2978,13 +2975,6 @@ public class LoggingAuditTrailTests extends ESTestCase {
         };
     }
 
-    private ClusterSettings mockClusterSettings() {
-        final List<Setting<?>> settingsList = new ArrayList<>();
-        LoggingAuditTrail.registerSettings(settingsList);
-        settingsList.addAll(ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
-        return new ClusterSettings(settings, new HashSet<>(settingsList));
-    }
-
     private Authentication createApiKeyAuthenticationAndMaybeWithRunAs(Authentication authentication) throws Exception {
         authentication = createApiKeyAuthentication(apiKeyService, authentication);
         if (randomBoolean()) {

+ 0 - 150
x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/service/ElasticServiceAccountsTests.java

@@ -26,7 +26,6 @@ import org.elasticsearch.action.get.MultiGetAction;
 import org.elasticsearch.action.index.IndexAction;
 import org.elasticsearch.action.search.MultiSearchAction;
 import org.elasticsearch.action.search.SearchAction;
-import org.elasticsearch.action.update.UpdateAction;
 import org.elasticsearch.cluster.metadata.IndexAbstraction;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
@@ -34,68 +33,6 @@ import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.transport.TransportRequest;
 import org.elasticsearch.xpack.core.ilm.action.GetLifecycleAction;
 import org.elasticsearch.xpack.core.ilm.action.PutLifecycleAction;
-import org.elasticsearch.xpack.core.ml.action.CloseJobAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteCalendarAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteCalendarEventAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteDatafeedAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteExpiredDataAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteFilterAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteForecastAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteJobAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteModelSnapshotAction;
-import org.elasticsearch.xpack.core.ml.action.DeleteTrainedModelAction;
-import org.elasticsearch.xpack.core.ml.action.EstimateModelMemoryAction;
-import org.elasticsearch.xpack.core.ml.action.EvaluateDataFrameAction;
-import org.elasticsearch.xpack.core.ml.action.ExplainDataFrameAnalyticsAction;
-import org.elasticsearch.xpack.core.ml.action.FinalizeJobExecutionAction;
-import org.elasticsearch.xpack.core.ml.action.FlushJobAction;
-import org.elasticsearch.xpack.core.ml.action.ForecastJobAction;
-import org.elasticsearch.xpack.core.ml.action.GetBucketsAction;
-import org.elasticsearch.xpack.core.ml.action.GetCalendarEventsAction;
-import org.elasticsearch.xpack.core.ml.action.GetCalendarsAction;
-import org.elasticsearch.xpack.core.ml.action.GetCategoriesAction;
-import org.elasticsearch.xpack.core.ml.action.GetDataFrameAnalyticsAction;
-import org.elasticsearch.xpack.core.ml.action.GetDataFrameAnalyticsStatsAction;
-import org.elasticsearch.xpack.core.ml.action.GetDatafeedsAction;
-import org.elasticsearch.xpack.core.ml.action.GetDatafeedsStatsAction;
-import org.elasticsearch.xpack.core.ml.action.GetFiltersAction;
-import org.elasticsearch.xpack.core.ml.action.GetInfluencersAction;
-import org.elasticsearch.xpack.core.ml.action.GetJobsAction;
-import org.elasticsearch.xpack.core.ml.action.GetJobsStatsAction;
-import org.elasticsearch.xpack.core.ml.action.GetModelSnapshotsAction;
-import org.elasticsearch.xpack.core.ml.action.GetOverallBucketsAction;
-import org.elasticsearch.xpack.core.ml.action.GetRecordsAction;
-import org.elasticsearch.xpack.core.ml.action.GetTrainedModelsAction;
-import org.elasticsearch.xpack.core.ml.action.GetTrainedModelsStatsAction;
-import org.elasticsearch.xpack.core.ml.action.InferModelAction;
-import org.elasticsearch.xpack.core.ml.action.IsolateDatafeedAction;
-import org.elasticsearch.xpack.core.ml.action.KillProcessAction;
-import org.elasticsearch.xpack.core.ml.action.MlInfoAction;
-import org.elasticsearch.xpack.core.ml.action.OpenJobAction;
-import org.elasticsearch.xpack.core.ml.action.PersistJobAction;
-import org.elasticsearch.xpack.core.ml.action.PostCalendarEventsAction;
-import org.elasticsearch.xpack.core.ml.action.PostDataAction;
-import org.elasticsearch.xpack.core.ml.action.PreviewDatafeedAction;
-import org.elasticsearch.xpack.core.ml.action.PutCalendarAction;
-import org.elasticsearch.xpack.core.ml.action.PutDataFrameAnalyticsAction;
-import org.elasticsearch.xpack.core.ml.action.PutDatafeedAction;
-import org.elasticsearch.xpack.core.ml.action.PutFilterAction;
-import org.elasticsearch.xpack.core.ml.action.PutJobAction;
-import org.elasticsearch.xpack.core.ml.action.PutTrainedModelAction;
-import org.elasticsearch.xpack.core.ml.action.RevertModelSnapshotAction;
-import org.elasticsearch.xpack.core.ml.action.SetUpgradeModeAction;
-import org.elasticsearch.xpack.core.ml.action.StartDataFrameAnalyticsAction;
-import org.elasticsearch.xpack.core.ml.action.StartDatafeedAction;
-import org.elasticsearch.xpack.core.ml.action.StopDataFrameAnalyticsAction;
-import org.elasticsearch.xpack.core.ml.action.StopDatafeedAction;
-import org.elasticsearch.xpack.core.ml.action.UpdateCalendarJobAction;
-import org.elasticsearch.xpack.core.ml.action.UpdateDatafeedAction;
-import org.elasticsearch.xpack.core.ml.action.UpdateFilterAction;
-import org.elasticsearch.xpack.core.ml.action.UpdateJobAction;
-import org.elasticsearch.xpack.core.ml.action.UpdateModelSnapshotAction;
-import org.elasticsearch.xpack.core.ml.action.UpdateProcessAction;
-import org.elasticsearch.xpack.core.ml.action.ValidateDetectorAction;
-import org.elasticsearch.xpack.core.ml.action.ValidateJobConfigAction;
 import org.elasticsearch.xpack.core.monitoring.action.MonitoringBulkAction;
 import org.elasticsearch.xpack.core.security.action.apikey.CreateApiKeyAction;
 import org.elasticsearch.xpack.core.security.action.apikey.CreateApiKeyRequest;
@@ -117,7 +54,6 @@ import org.elasticsearch.xpack.core.security.user.KibanaSystemUser;
 import org.elasticsearch.xpack.core.security.user.User;
 import org.elasticsearch.xpack.security.authc.service.ElasticServiceAccounts.ElasticServiceAccount;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -454,90 +390,4 @@ public class ElasticServiceAccountsTests extends ESTestCase {
         return mock;
     }
 
-    private void assertNoAccessAllowed(Role role, Collection<String> indices) {
-        for (String index : indices) {
-            assertNoAccessAllowed(role, index);
-        }
-    }
-
-    private void assertNoAccessAllowed(Role role, String index) {
-        assertThat(role.indices().allowedIndicesMatcher(DeleteIndexAction.NAME).test(mockIndexAbstraction(index)), is(false));
-        assertThat(role.indices().allowedIndicesMatcher(CreateIndexAction.NAME).test(mockIndexAbstraction(index)), is(false));
-        assertThat(role.indices().allowedIndicesMatcher(UpdateSettingsAction.NAME).test(mockIndexAbstraction(index)), is(false));
-        assertThat(role.indices().allowedIndicesMatcher(SearchAction.NAME).test(mockIndexAbstraction(index)), is(false));
-        assertThat(role.indices().allowedIndicesMatcher(GetAction.NAME).test(mockIndexAbstraction(index)), is(false));
-        assertThat(role.indices().allowedIndicesMatcher(IndexAction.NAME).test(mockIndexAbstraction(index)), is(false));
-        assertThat(role.indices().allowedIndicesMatcher(UpdateAction.NAME).test(mockIndexAbstraction(index)), is(false));
-        assertThat(role.indices().allowedIndicesMatcher(DeleteAction.NAME).test(mockIndexAbstraction(index)), is(false));
-        assertThat(role.indices().allowedIndicesMatcher(BulkAction.NAME).test(mockIndexAbstraction(index)), is(false));
-    }
-
-    private void assertRoleHasManageMl(Role role) {
-        final TransportRequest request = mock(TransportRequest.class);
-        final Authentication authentication = AuthenticationTestHelper.builder().serviceAccount().build();
-
-        assertThat(role.cluster().check(CloseJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteCalendarAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteCalendarEventAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteDatafeedAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteExpiredDataAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteFilterAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteForecastAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteModelSnapshotAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(DeleteTrainedModelAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(EstimateModelMemoryAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(EvaluateDataFrameAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(ExplainDataFrameAnalyticsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(FinalizeJobExecutionAction.NAME, request, authentication), is(false)); // internal use only
-        assertThat(role.cluster().check(FlushJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(ForecastJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetBucketsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetCalendarEventsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetCalendarsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetCategoriesAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetDatafeedsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetDatafeedsStatsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetDataFrameAnalyticsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetDataFrameAnalyticsStatsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetFiltersAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetInfluencersAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetJobsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetJobsStatsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetModelSnapshotsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetOverallBucketsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetRecordsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetTrainedModelsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(GetTrainedModelsStatsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(InferModelAction.EXTERNAL_NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(InferModelAction.NAME, request, authentication), is(false)); // internal use only
-        assertThat(role.cluster().check(IsolateDatafeedAction.NAME, request, authentication), is(false)); // internal use only
-        assertThat(role.cluster().check(KillProcessAction.NAME, request, authentication), is(false)); // internal use only
-        assertThat(role.cluster().check(MlInfoAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(OpenJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PersistJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PostCalendarEventsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PostDataAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PreviewDatafeedAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PutCalendarAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PutDatafeedAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PutDataFrameAnalyticsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PutFilterAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PutJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(PutTrainedModelAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(RevertModelSnapshotAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(SetUpgradeModeAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(StartDatafeedAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(StartDataFrameAnalyticsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(StopDatafeedAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(StopDataFrameAnalyticsAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(UpdateCalendarJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(UpdateDatafeedAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(UpdateFilterAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(UpdateJobAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(UpdateModelSnapshotAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(UpdateProcessAction.NAME, request, authentication), is(false)); // internal use only
-        assertThat(role.cluster().check(ValidateDetectorAction.NAME, request, authentication), is(true));
-        assertThat(role.cluster().check(ValidateJobConfigAction.NAME, request, authentication), is(true));
-    }
 }

+ 0 - 3
x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregatorTests.java

@@ -547,9 +547,6 @@ public class GeoLineAggregatorTests extends AggregatorTestCase {
             return GeoEncodingUtils.decodeLatitude((int) (encoded & 0xffffffffL));
         }
 
-        private void reset(int index) {
-            super.reset(index, this.x(), this.y());
-        }
     }
 
     /** Allow test to use own objects for internal use in geometry simplifier, so we can track the sort-fields together with the points */

+ 0 - 24
x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcDatabaseMetaData.java

@@ -728,26 +728,6 @@ class JdbcDatabaseMetaData implements DatabaseMetaData, JdbcWrapper {
         );
     }
 
-    // return the cluster name as the catalog (database)
-    // helps with the various UIs
-    private String defaultCatalog() throws SQLException {
-        return con.client.serverInfo().cluster;
-    }
-
-    private boolean isDefaultCatalog(String catalog) throws SQLException {
-        // null means catalog info is irrelevant
-        // % means return all catalogs
-        // EMPTY means return those without a catalog
-        return catalog == null || catalog.equals(EMPTY) || catalog.equals(WILDCARD) || catalog.equals(defaultCatalog());
-    }
-
-    private boolean isDefaultSchema(String schema) {
-        // null means schema info is irrelevant
-        // % means return all schemas`
-        // EMPTY means return those without a schema
-        return schema == null || schema.equals(EMPTY) || schema.equals(WILDCARD);
-    }
-
     @Override
     public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException {
         String statement = "SYS TABLES CATALOG LIKE ? ESCAPE '\\' LIKE ? ESCAPE '\\' ";
@@ -1373,10 +1353,6 @@ class JdbcDatabaseMetaData implements DatabaseMetaData, JdbcWrapper {
         return new JdbcResultSet(cfg, null, new InMemoryCursor(columnInfo(tableName, cols), null));
     }
 
-    private static ResultSet emptySet(JdbcConfiguration cfg, List<JdbcColumnInfo> columns) {
-        return memorySet(cfg, columns, null);
-    }
-
     private static ResultSet memorySet(JdbcConfiguration cfg, List<JdbcColumnInfo> columns, Object[][] data) {
         return new JdbcResultSet(cfg, null, new InMemoryCursor(columns, data));
     }

+ 0 - 5
x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcPreparedStatement.java

@@ -42,7 +42,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
-import java.util.Locale;
 
 import static java.time.ZoneOffset.UTC;
 import static org.elasticsearch.xpack.sql.jdbc.TypeUtils.scaleOrLength;
@@ -464,10 +463,6 @@ class JdbcPreparedStatement extends JdbcStatement implements PreparedStatement {
         }
     }
 
-    private Calendar getDefaultCalendar() {
-        return Calendar.getInstance(cfg.timeZone(), Locale.ROOT);
-    }
-
     @Override
     public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
         throw new SQLFeatureNotSupportedException("AsciiStream not supported");

+ 0 - 49
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java

@@ -31,7 +31,6 @@ import org.elasticsearch.xpack.ql.expression.UnresolvedStar;
 import org.elasticsearch.xpack.ql.expression.function.FunctionResolutionStrategy;
 import org.elasticsearch.xpack.ql.expression.function.Functions;
 import org.elasticsearch.xpack.ql.expression.function.UnresolvedFunction;
-import org.elasticsearch.xpack.ql.expression.predicate.operator.arithmetic.ArithmeticOperation;
 import org.elasticsearch.xpack.ql.index.IndexResolution;
 import org.elasticsearch.xpack.ql.plan.TableIdentifier;
 import org.elasticsearch.xpack.ql.plan.logical.Aggregate;
@@ -44,7 +43,6 @@ import org.elasticsearch.xpack.ql.plan.logical.UnaryPlan;
 import org.elasticsearch.xpack.ql.plan.logical.UnresolvedRelation;
 import org.elasticsearch.xpack.ql.rule.ParameterizedRuleExecutor;
 import org.elasticsearch.xpack.ql.rule.RuleExecutor;
-import org.elasticsearch.xpack.ql.type.DataType;
 import org.elasticsearch.xpack.ql.type.DataTypes;
 import org.elasticsearch.xpack.ql.util.CollectionUtils;
 import org.elasticsearch.xpack.ql.util.Holder;
@@ -56,7 +54,6 @@ import org.elasticsearch.xpack.sql.plan.logical.LocalRelation;
 import org.elasticsearch.xpack.sql.plan.logical.Pivot;
 import org.elasticsearch.xpack.sql.plan.logical.SubQueryAlias;
 import org.elasticsearch.xpack.sql.plan.logical.With;
-import org.elasticsearch.xpack.sql.type.SqlDataTypeConverter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -97,7 +94,6 @@ public final class Analyzer extends ParameterizedRuleExecutor<LogicalPlan, Analy
             new HavingOverProject(),
             new ResolveAggsInHaving(),
             new ResolveAggsInOrderBy()
-            // new ImplicitCasting()
         );
         var finish = new Batch<>(
             "Finish Analysis",
@@ -1096,51 +1092,6 @@ public final class Analyzer extends ParameterizedRuleExecutor<LogicalPlan, Analy
         }
     }
 
-    private static class ImplicitCasting extends AnalyzerRule<LogicalPlan> {
-
-        @Override
-        protected boolean skipResolved() {
-            return false;
-        }
-
-        @Override
-        protected LogicalPlan rule(LogicalPlan plan) {
-            return plan.transformExpressionsDown(ImplicitCasting::implicitCast);
-        }
-
-        private static Expression implicitCast(Expression e) {
-            if (e.childrenResolved() == false) {
-                return e;
-            }
-
-            Expression left = null, right = null;
-
-            // BinaryOperations are ignored as they are pushed down to ES
-            // and casting (and thus Aliasing when folding) gets in the way
-
-            if (e instanceof ArithmeticOperation f) {
-                left = f.left();
-                right = f.right();
-            }
-
-            if (left != null) {
-                DataType l = left.dataType();
-                DataType r = right.dataType();
-                if (l != r) {
-                    DataType common = SqlDataTypeConverter.commonType(l, r);
-                    if (common == null) {
-                        return e;
-                    }
-                    left = l == common ? left : new Cast(left.source(), left, common);
-                    right = r == common ? right : new Cast(right.source(), right, common);
-                    return e.replaceChildrenSameSize(Arrays.asList(left, right));
-                }
-            }
-
-            return e;
-        }
-    }
-
     public static class ReplaceSubQueryAliases extends AnalyzerRule<UnaryPlan> {
 
         @Override