Remove remaining redundant overrides (#97134)

Follow-up to #97130, removing all remaining redundant overrides outside
the server package.
This commit is contained in:
Armin Braun 2023-06-27 13:08:13 +02:00 committed by GitHub
parent 3726113f06
commit 1a34568a8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
96 changed files with 2 additions and 573 deletions

View file

@ -751,11 +751,6 @@ public class GeoIpDownloaderIT extends AbstractGeoIpIT {
return NON_GEO_PROCESSOR_TYPE; return NON_GEO_PROCESSOR_TYPE;
} }
@Override
public boolean isAsync() {
return false;
}
}); });
return procMap; return procMap;
} }

View file

@ -18,11 +18,6 @@ public class RankEvalRequestBuilder extends ActionRequestBuilder<RankEvalRequest
super(client, action, request); super(client, action, request);
} }
@Override
public RankEvalRequest request() {
return request;
}
public void setRankEvalSpec(RankEvalSpec spec) { public void setRankEvalSpec(RankEvalSpec spec) {
this.request.setRankEvalSpec(spec); this.request.setRankEvalSpec(spec);
} }

View file

@ -48,9 +48,6 @@ public class HttpResponseInputStream extends FilterInputStream {
@Override @Override
public void close() {} public void close() {}
@Override
public void mark(final int readLimit) {}
@Override @Override
public boolean markSupported() { public boolean markSupported() {
return true; return true;

View file

@ -27,11 +27,6 @@ import static org.hamcrest.Matchers.equalTo;
@ClusterScope(scope = Scope.SUITE, supportsDedicatedMasters = false, numDataNodes = 1) @ClusterScope(scope = Scope.SUITE, supportsDedicatedMasters = false, numDataNodes = 1)
public class ResponseHeaderPluginIT extends HttpSmokeTestCase { public class ResponseHeaderPluginIT extends HttpSmokeTestCase {
@Override
protected boolean addMockHttpTransport() {
return false; // enable http
}
@Override @Override
protected Collection<Class<? extends Plugin>> nodePlugins() { protected Collection<Class<? extends Plugin>> nodePlugins() {
return CollectionUtils.appendToCopy(super.nodePlugins(), TestResponseHeaderPlugin.class); return CollectionUtils.appendToCopy(super.nodePlugins(), TestResponseHeaderPlugin.class);

View file

@ -51,10 +51,6 @@ public class ClusterServiceIT extends ESIntegTestCase {
clusterService.submitUnbatchedStateUpdateTask( clusterService.submitUnbatchedStateUpdateTask(
"test", "test",
new AckedClusterStateUpdateTask(MasterServiceTests.ackedRequest(TEN_SECONDS, TEN_SECONDS), null) { new AckedClusterStateUpdateTask(MasterServiceTests.ackedRequest(TEN_SECONDS, TEN_SECONDS), null) {
@Override
public boolean mustAck(DiscoveryNode discoveryNode) {
return true;
}
@Override @Override
public void onAllNodesAcked() { public void onAllNodesAcked() {
@ -207,9 +203,6 @@ public class ClusterServiceIT extends ESIntegTestCase {
latch.countDown(); latch.countDown();
} }
@Override
public void clusterStateProcessed(ClusterState oldState, ClusterState newState) {}
@Override @Override
public ClusterState execute(ClusterState currentState) throws Exception { public ClusterState execute(ClusterState currentState) throws Exception {
executed.set(true); executed.set(true);

View file

@ -128,9 +128,6 @@ public class UpdateSettingsIT extends ESIntegTestCase {
Setting.Property.Final Setting.Property.Final
); );
@Override
public void onIndexModule(IndexModule indexModule) {}
@Override @Override
public List<Setting<?>> getSettings() { public List<Setting<?>> getSettings() {
return Collections.singletonList(FINAL_SETTING); return Collections.singletonList(FINAL_SETTING);

View file

@ -102,14 +102,6 @@ public class DoubleTermsIT extends AbstractTermsTestCase {
return scripts; return scripts;
} }
@Override
protected Map<String, Function<Map<String, Object>, Object>> nonDeterministicPluginScripts() {
Map<String, Function<Map<String, Object>, Object>> scripts = new HashMap<>();
scripts.put("Math.random()", vars -> DoubleTermsIT.randomDouble());
return scripts;
}
} }
private static final int NUM_DOCS = 5; // TODO: randomize the size? private static final int NUM_DOCS = 5; // TODO: randomize the size?

View file

@ -90,14 +90,6 @@ public class LongTermsIT extends AbstractTermsTestCase {
return scripts; return scripts;
} }
@Override
protected Map<String, Function<Map<String, Object>, Object>> nonDeterministicPluginScripts() {
Map<String, Function<Map<String, Object>, Object>> scripts = new HashMap<>();
scripts.put("Math.random()", vars -> LongTermsIT.randomDouble());
return scripts;
}
} }
private static final int NUM_DOCS = 5; // TODO randomize the size? private static final int NUM_DOCS = 5; // TODO randomize the size?

View file

@ -82,14 +82,6 @@ public class RangeIT extends ESIntegTestCase {
return scripts; return scripts;
} }
@Override
protected Map<String, Function<Map<String, Object>, Object>> nonDeterministicPluginScripts() {
Map<String, Function<Map<String, Object>, Object>> scripts = new HashMap<>();
scripts.put("Math.random()", vars -> RangeIT.randomDouble());
return scripts;
}
} }
@Override @Override

View file

@ -115,14 +115,6 @@ public class StringTermsIT extends AbstractTermsTestCase {
return scripts; return scripts;
} }
@Override
protected Map<String, Function<Map<String, Object>, Object>> nonDeterministicPluginScripts() {
Map<String, Function<Map<String, Object>, Object>> scripts = new HashMap<>();
scripts.put("Math.random()", vars -> StringTermsIT.randomDouble());
return scripts;
}
} }
@Override @Override

View file

@ -8,7 +8,6 @@
package org.elasticsearch.test.seektracker; package org.elasticsearch.test.seektracker;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.nodes.BaseNodesRequest; import org.elasticsearch.action.support.nodes.BaseNodesRequest;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
@ -40,8 +39,4 @@ public class SeekStatsRequest extends BaseNodesRequest<SeekStatsRequest> {
return indices; return indices;
} }
@Override
public ActionRequestValidationException validate() {
return null;
}
} }

View file

@ -484,10 +484,6 @@ public class MockScriptEngine implements ScriptEngine {
return (boolean) script.apply(ctx); return (boolean) script.apply(ctx);
} }
@Override
public void setDocument(int doc) {
docReader.setDocument(doc);
}
}; };
} }
} }

View file

@ -17,8 +17,6 @@ import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xcontent.XContentFactory; import org.elasticsearch.xcontent.XContentFactory;
import org.elasticsearch.xcontent.XContentType; import org.elasticsearch.xcontent.XContentType;
import java.io.ByteArrayOutputStream;
import static org.elasticsearch.index.query.QueryBuilders.geoBoundingBoxQuery; import static org.elasticsearch.index.query.QueryBuilders.geoBoundingBoxQuery;
import static org.elasticsearch.index.query.QueryBuilders.geoDistanceQuery; import static org.elasticsearch.index.query.QueryBuilders.geoDistanceQuery;
import static org.elasticsearch.index.query.QueryBuilders.geoShapeQuery; import static org.elasticsearch.index.query.QueryBuilders.geoShapeQuery;
@ -101,11 +99,6 @@ public abstract class GeoShapeIntegTestCase extends BaseShapeIntegTestCase<GeoSh
} }
} }
/** Override this method if there is need to modify the test data for specific tests */
protected byte[] convertTestData(ByteArrayOutputStream out) {
return out.toByteArray();
}
private double distance(double lat1, double lon1, double lat2, double lon2) { private double distance(double lat1, double lon1, double lat2, double lon2) {
return SloppyMath.haversinMeters(lat1, lon1, lat2, lon2); return SloppyMath.haversinMeters(lat1, lon1, lat2, lon2);
} }

View file

@ -8,7 +8,6 @@
package org.elasticsearch.xpack.analytics.multiterms; package org.elasticsearch.xpack.analytics.multiterms;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.DocValueFormat;
@ -627,8 +626,4 @@ public class InternalMultiTerms extends AbstractInternalTerms<InternalMultiTerms
); );
} }
@Override
public String toString() {
return Strings.toString(this);
}
} }

View file

@ -531,12 +531,6 @@ public class ReactiveStorageIT extends AutoscalingStorageIntegTestCase {
refreshClusterInfo(); refreshClusterInfo();
} }
public GetAutoscalingCapacityAction.Response capacity() {
GetAutoscalingCapacityAction.Request request = new GetAutoscalingCapacityAction.Request();
GetAutoscalingCapacityAction.Response response = client().execute(GetAutoscalingCapacityAction.INSTANCE, request).actionGet();
return response;
}
private void putAutoscalingPolicy(String policyName, String role) { private void putAutoscalingPolicy(String policyName, String role) {
final PutAutoscalingPolicyAction.Request request = new PutAutoscalingPolicyAction.Request( final PutAutoscalingPolicyAction.Request request = new PutAutoscalingPolicyAction.Request(
policyName, policyName,

View file

@ -24,11 +24,6 @@ import static org.hamcrest.Matchers.nullValue;
public class PutAutoFollowPatternRequestTests extends AbstractXContentSerializingTestCase<PutAutoFollowPatternAction.Request> { public class PutAutoFollowPatternRequestTests extends AbstractXContentSerializingTestCase<PutAutoFollowPatternAction.Request> {
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected PutAutoFollowPatternAction.Request doParseInstance(XContentParser parser) throws IOException { protected PutAutoFollowPatternAction.Request doParseInstance(XContentParser parser) throws IOException {
return PutAutoFollowPatternAction.Request.fromXContent(parser, null); return PutAutoFollowPatternAction.Request.fromXContent(parser, null);

View file

@ -98,8 +98,4 @@ public class PutFollowActionRequestTests extends AbstractXContentSerializingTest
return request; return request;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
} }

View file

@ -58,11 +58,6 @@ public class ResumeFollowActionRequestTests extends AbstractXContentSerializingT
return ResumeFollowAction.Request.fromXContent(parser, null); return ResumeFollowAction.Request.fromXContent(parser, null);
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
static void generateFollowParameters(FollowParameters followParameters) { static void generateFollowParameters(FollowParameters followParameters) {
if (randomBoolean()) { if (randomBoolean()) {
followParameters.setMaxReadRequestOperationCount(randomIntBetween(1, Integer.MAX_VALUE)); followParameters.setMaxReadRequestOperationCount(randomIntBetween(1, Integer.MAX_VALUE));

View file

@ -7,7 +7,6 @@
package org.elasticsearch.xpack.core.ccr.action; package org.elasticsearch.xpack.core.ccr.action;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionType; import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.action.support.broadcast.BroadcastRequest;
import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.action.support.broadcast.BroadcastResponse;
@ -152,11 +151,6 @@ public class ForgetFollowerAction extends ActionType<BroadcastResponse> {
out.writeString(followerIndexUUID); out.writeString(followerIndexUUID);
} }
@Override
public ActionRequestValidationException validate() {
return null;
}
@Override @Override
public boolean includeDataStreams() { public boolean includeDataStreams() {
return false; return false;

View file

@ -6,7 +6,6 @@
*/ */
package org.elasticsearch.xpack.core.downsample; package org.elasticsearch.xpack.core.downsample;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionType; import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.IndicesRequest;
import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.IndicesOptions;
@ -115,11 +114,6 @@ public class DownsampleIndexerAction extends ActionType<DownsampleIndexerAction.
out.writeStringArray(labelFields); out.writeStringArray(labelFields);
} }
@Override
public ActionRequestValidationException validate() {
return null;
}
@Override @Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(); builder.startObject();

View file

@ -12,7 +12,6 @@ import org.elasticsearch.action.ActionType;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.StatusToXContentObject;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.xcontent.ObjectParser; import org.elasticsearch.xcontent.ObjectParser;
import org.elasticsearch.xcontent.ToXContentObject; import org.elasticsearch.xcontent.ToXContentObject;
import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentBuilder;
@ -149,11 +148,6 @@ public class GetCalendarsAction extends ActionType<GetCalendarsAction.Response>
super(in); super(in);
} }
@Override
public RestStatus status() {
return RestStatus.OK;
}
public QueryPage<Calendar> getCalendars() { public QueryPage<Calendar> getCalendars() {
return getResources(); return getResources();
} }

View file

@ -9,7 +9,6 @@ package org.elasticsearch.xpack.core.ml.action;
import org.elasticsearch.action.ActionType; import org.elasticsearch.action.ActionType;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.StatusToXContentObject;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.xpack.core.action.AbstractGetResourcesRequest; import org.elasticsearch.xpack.core.action.AbstractGetResourcesRequest;
import org.elasticsearch.xpack.core.action.AbstractGetResourcesResponse; import org.elasticsearch.xpack.core.action.AbstractGetResourcesResponse;
import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.action.util.QueryPage;
@ -68,11 +67,6 @@ public class GetFiltersAction extends ActionType<GetFiltersAction.Response> {
return getResources(); return getResources();
} }
@Override
public RestStatus status() {
return RestStatus.OK;
}
@Override @Override
protected Reader<MlFilter> getReader() { protected Reader<MlFilter> getReader() {
return MlFilter::new; return MlFilter::new;

View file

@ -7,7 +7,6 @@
package org.elasticsearch.xpack.core.ml.action; package org.elasticsearch.xpack.core.ml.action;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ActionType; import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.FailedNodeException; import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.action.support.nodes.BaseNodeResponse;
@ -49,11 +48,6 @@ public class TrainedModelCacheInfoAction extends ActionType<TrainedModelCacheInf
super.writeTo(out); super.writeTo(out);
} }
@Override
public ActionRequestValidationException validate() {
return null;
}
@Override @Override
public int hashCode() { public int hashCode() {
return Arrays.hashCode(concreteNodes()); return Arrays.hashCode(concreteNodes());

View file

@ -128,11 +128,6 @@ public class TermsEnumRequest extends BroadcastRequest<TermsEnumRequest> impleme
return true; return true;
} }
@Override
public boolean includeDataStreams() {
return true;
}
/** /**
* The field to look inside for values * The field to look inside for values
*/ */

View file

@ -6,7 +6,6 @@
*/ */
package org.elasticsearch.xpack.core.watcher.transport.actions.stats; package org.elasticsearch.xpack.core.watcher.transport.actions.stats;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.nodes.BaseNodesRequest; import org.elasticsearch.action.support.nodes.BaseNodesRequest;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
@ -58,11 +57,6 @@ public class WatcherStatsRequest extends BaseNodesRequest<WatcherStatsRequest> {
this.includeStats = includeStats; this.includeStats = includeStats;
} }
@Override
public ActionRequestValidationException validate() {
return null;
}
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out); super.writeTo(out);

View file

@ -6,16 +6,11 @@
*/ */
package org.elasticsearch.license; package org.elasticsearch.license;
import org.elasticsearch.analysis.common.CommonAnalysisPlugin;
import org.elasticsearch.cluster.node.DiscoveryNodeRole; import org.elasticsearch.cluster.node.DiscoveryNodeRole;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.TimeValue; import org.elasticsearch.core.TimeValue;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin;
import java.util.Arrays;
import java.util.Collection;
import java.util.Set; import java.util.Set;
import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST; import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST;
@ -34,11 +29,6 @@ public class ClusterStateLicenseServiceClusterTests extends AbstractLicensesInte
return Settings.builder().put(addRoles(super.nodeSettings(nodeOrdinal, otherSettings), Set.of(DiscoveryNodeRole.DATA_ROLE))); return Settings.builder().put(addRoles(super.nodeSettings(nodeOrdinal, otherSettings), Set.of(DiscoveryNodeRole.DATA_ROLE)));
} }
@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return Arrays.asList(LocalStateCompositeXPackPlugin.class, CommonAnalysisPlugin.class);
}
public void testClusterRestartWithLicense() throws Exception { public void testClusterRestartWithLicense() throws Exception {
wipeAllLicenses(); wipeAllLicenses();

View file

@ -23,11 +23,6 @@ public class SetResetModeActionRequestTests extends AbstractXContentSerializingT
return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Writeable.Reader<SetResetModeActionRequest> instanceReader() { protected Writeable.Reader<SetResetModeActionRequest> instanceReader() {
return SetResetModeActionRequest::new; return SetResetModeActionRequest::new;

View file

@ -259,11 +259,6 @@ public class ClusterStateWaitUntilThresholdStepTests extends AbstractStepTestCas
return new Result(false, new SingleMessageFieldInfo("")); return new Result(false, new SingleMessageFieldInfo(""));
} }
@Override
public boolean isCompletable() {
return true;
}
@Override @Override
public boolean isRetryable() { public boolean isRetryable() {
return true; return true;

View file

@ -51,11 +51,6 @@ public class ExplainLifecycleResponseTests extends AbstractXContentSerializingTe
return ExplainLifecycleResponse.fromXContent(parser); return ExplainLifecycleResponse.fromXContent(parser);
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected boolean assertToXContentEquivalence() { protected boolean assertToXContentEquivalence() {
return false; return false;

View file

@ -40,11 +40,6 @@ public class MoveToStepRequestTests extends AbstractXContentSerializingTestCase<
return Request.parseRequest(index, parser); return Request.parseRequest(index, parser);
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request mutateInstance(Request request) { protected Request mutateInstance(Request request) {
String indexName = request.getIndex(); String indexName = request.getIndex();

View file

@ -124,10 +124,6 @@ public class PutLifecycleRequestTests extends AbstractXContentSerializingTestCas
return new NamedXContentRegistry(entries); return new NamedXContentRegistry(entries);
} }
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request mutateInstance(Request request) { protected Request mutateInstance(Request request) {
String name = randomBoolean() ? lifecycleName : randomAlphaOfLength(5); String name = randomBoolean() ? lifecycleName : randomAlphaOfLength(5);

View file

@ -45,11 +45,6 @@ public class RemoveIndexLifecyclePolicyResponseTests extends AbstractXContentSer
return Response.PARSER.apply(parser, null); return Response.PARSER.apply(parser, null);
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
public void testNullFailedIndices() { public void testNullFailedIndices() {
IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> new Response((List<String>) null)); IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> new Response((List<String>) null));
assertEquals("failed_indexes cannot be null", exception.getMessage()); assertEquals("failed_indexes cannot be null", exception.getMessage());

View file

@ -28,11 +28,6 @@ public class CancelJobModelSnapshotUpgradeActionRequestTests extends AbstractXCo
return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Writeable.Reader<Request> instanceReader() { protected Writeable.Reader<Request> instanceReader() {
return Request::new; return Request::new;

View file

@ -34,11 +34,6 @@ public class CloseJobActionRequestTests extends AbstractXContentSerializingTestC
return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Writeable.Reader<Request> instanceReader() { protected Writeable.Reader<Request> instanceReader() {
return Request::new; return Request::new;

View file

@ -80,11 +80,6 @@ public class EvaluateDataFrameActionRequestTests extends AbstractXContentSeriali
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(parser); return Request.parseRequest(parser);

View file

@ -23,11 +23,6 @@ public class ForecastJobActionRequestTests extends AbstractXContentSerializingTe
return Request.parseRequest(null, parser); return Request.parseRequest(null, parser);
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request createTestInstance() { protected Request createTestInstance() {
Request request = new Request(randomAlphaOfLengthBetween(1, 20)); Request request = new Request(randomAlphaOfLengthBetween(1, 20));

View file

@ -62,11 +62,6 @@ public class GetBucketActionRequestTests extends AbstractXContentSerializingTest
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return GetBucketsAction.Request.parseRequest(null, parser); return GetBucketsAction.Request.parseRequest(null, parser);

View file

@ -48,11 +48,6 @@ public class GetCalendarEventsActionRequestTests extends AbstractXContentSeriali
return GetCalendarEventsAction.Request.parseRequest(null, parser); return GetCalendarEventsAction.Request.parseRequest(null, parser);
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
public void testValidate() { public void testValidate() {
GetCalendarEventsAction.Request request = new GetCalendarEventsAction.Request("cal-name"); GetCalendarEventsAction.Request request = new GetCalendarEventsAction.Request("cal-name");
request.setJobId("foo"); request.setJobId("foo");

View file

@ -40,8 +40,4 @@ public class GetCalendarsActionRequestTests extends AbstractXContentSerializingT
return GetCalendarsAction.Request.parseRequest(null, parser); return GetCalendarsAction.Request.parseRequest(null, parser);
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
} }

View file

@ -40,11 +40,6 @@ public class GetCategoriesRequestTests extends AbstractXContentSerializingTestCa
return GetCategoriesAction.Request::new; return GetCategoriesAction.Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected GetCategoriesAction.Request doParseInstance(XContentParser parser) { protected GetCategoriesAction.Request doParseInstance(XContentParser parser) {
return GetCategoriesAction.Request.parseRequest(null, parser); return GetCategoriesAction.Request.parseRequest(null, parser);

View file

@ -60,8 +60,4 @@ public class GetInfluencersActionRequestTests extends AbstractXContentSerializin
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
} }

View file

@ -52,8 +52,4 @@ public class GetModelSnapshotsActionRequestTests extends AbstractXContentSeriali
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
} }

View file

@ -50,11 +50,6 @@ public class GetOverallBucketsActionRequestTests extends AbstractXContentSeriali
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(null, parser); return Request.parseRequest(null, parser);

View file

@ -60,8 +60,4 @@ public class GetRecordsActionRequestTests extends AbstractXContentSerializingTes
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
} }

View file

@ -28,11 +28,6 @@ public class OpenJobActionRequestTests extends AbstractXContentSerializingTestCa
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(null, parser); return Request.parseRequest(null, parser);

View file

@ -31,11 +31,6 @@ public class PutCalendarActionRequestTests extends AbstractXContentSerializingTe
return PutCalendarAction.Request::new; return PutCalendarAction.Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected PutCalendarAction.Request doParseInstance(XContentParser parser) { protected PutCalendarAction.Request doParseInstance(XContentParser parser) {
return PutCalendarAction.Request.parseRequest(calendarId, parser); return PutCalendarAction.Request.parseRequest(calendarId, parser);

View file

@ -74,11 +74,6 @@ public class PutDataFrameAnalyticsActionRequestTests extends AbstractXContentSer
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(id, parser); return Request.parseRequest(id, parser);

View file

@ -44,11 +44,6 @@ public class PutDatafeedActionRequestTests extends AbstractXContentSerializingTe
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(datafeedId, SearchRequest.DEFAULT_INDICES_OPTIONS, parser); return Request.parseRequest(datafeedId, SearchRequest.DEFAULT_INDICES_OPTIONS, parser);

View file

@ -31,11 +31,6 @@ public class PutFilterActionRequestTests extends AbstractXContentSerializingTest
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return PutFilterAction.Request.parseRequest(filterId, parser); return PutFilterAction.Request.parseRequest(filterId, parser);

View file

@ -38,11 +38,6 @@ public class RevertModelSnapshotActionRequestTests extends AbstractXContentSeria
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return RevertModelSnapshotAction.Request.parseRequest(null, null, parser); return RevertModelSnapshotAction.Request.parseRequest(null, null, parser);

View file

@ -23,11 +23,6 @@ public class SetUpgradeModeActionRequestTests extends AbstractXContentSerializin
return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Writeable.Reader<Request> instanceReader() { protected Writeable.Reader<Request> instanceReader() {
return Request::new; return Request::new;

View file

@ -31,11 +31,6 @@ public class StartDatafeedActionRequestTests extends AbstractXContentSerializing
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(null, parser); return Request.parseRequest(null, parser);

View file

@ -37,11 +37,6 @@ public class StopDatafeedActionRequestTests extends AbstractXContentSerializingT
return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Writeable.Reader<Request> instanceReader() { protected Writeable.Reader<Request> instanceReader() {
return Request::new; return Request::new;

View file

@ -44,11 +44,6 @@ public class UpdateDatafeedActionRequestTests extends AbstractXContentSerializin
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(datafeedId, null, parser); return Request.parseRequest(datafeedId, null, parser);

View file

@ -53,11 +53,6 @@ public class UpdateFilterActionRequestTests extends AbstractXContentSerializingT
return strings; return strings;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(filterId, parser); return Request.parseRequest(filterId, parser);

View file

@ -40,8 +40,4 @@ public class UpdateModelSnapshotActionRequestTests extends AbstractXContentSeria
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
} }

View file

@ -33,11 +33,6 @@ public class UpgradeJobModelSnapshotRequestTests extends AbstractXContentSeriali
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(parser); return Request.parseRequest(parser);

View file

@ -28,11 +28,6 @@ public class UpgradeJobModelSnapshotResponseTests extends AbstractXContentSerial
return Response::new; return Response::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Response doParseInstance(XContentParser parser) { protected Response doParseInstance(XContentParser parser) {
return Response.parseRequest(parser); return Response.parseRequest(parser);

View file

@ -35,11 +35,6 @@ public class ValidateDetectorActionRequestTests extends AbstractXContentSerializ
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) { protected Request doParseInstance(XContentParser parser) {
return Request.parseRequest(parser); return Request.parseRequest(parser);

View file

@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Predicate;
import java.util.stream.Stream; import java.util.stream.Stream;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
@ -31,11 +30,6 @@ public class MultiTests extends PreProcessingTests<Multi> {
: Multi.fromXContentStrict(parser, PreProcessor.PreProcessorParseContext.DEFAULT); : Multi.fromXContentStrict(parser, PreProcessor.PreProcessorParseContext.DEFAULT);
} }
@Override
protected Predicate<String> getRandomFieldsExcludeFilter() {
return field -> field.isEmpty() == false;
}
@Override @Override
protected Multi createTestInstance() { protected Multi createTestInstance() {
return createRandom(); return createRandom();

View file

@ -47,11 +47,6 @@ public class QuestionAnsweringConfigUpdateTests extends AbstractNlpConfigUpdateT
return instance; return instance;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected QuestionAnsweringConfigUpdate doParseInstance(XContentParser parser) throws IOException { protected QuestionAnsweringConfigUpdate doParseInstance(XContentParser parser) throws IOException {
return QuestionAnsweringConfigUpdate.fromXContentStrict(parser); return QuestionAnsweringConfigUpdate.fromXContentStrict(parser);

View file

@ -46,11 +46,6 @@ public class TextSimilarityConfigUpdateTests extends AbstractNlpConfigUpdateTest
return instance; return instance;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected TextSimilarityConfigUpdate doParseInstance(XContentParser parser) throws IOException { protected TextSimilarityConfigUpdate doParseInstance(XContentParser parser) throws IOException {
return TextSimilarityConfigUpdate.fromXContentStrict(parser); return TextSimilarityConfigUpdate.fromXContentStrict(parser);

View file

@ -43,11 +43,6 @@ public class ZeroShotClassificationConfigUpdateTests extends AbstractNlpConfigUp
return instance; return instance;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected ZeroShotClassificationConfigUpdate doParseInstance(XContentParser parser) throws IOException { protected ZeroShotClassificationConfigUpdate doParseInstance(XContentParser parser) throws IOException {
return ZeroShotClassificationConfigUpdate.fromXContentStrict(parser); return ZeroShotClassificationConfigUpdate.fromXContentStrict(parser);

View file

@ -49,8 +49,4 @@ public class RollupIndexerJobStatsTests extends AbstractXContentSerializingTestC
); );
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
} }

View file

@ -45,11 +45,6 @@ public class PreviewTransformActionRequestTests extends AbstractSerializingTrans
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request createTestInstance() { protected Request createTestInstance() {
TransformConfig config = new TransformConfig( TransformConfig config = new TransformConfig(

View file

@ -50,8 +50,4 @@ public class PreviewTransformsActionResponseTests extends AbstractXContentSerial
return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929 return null;// TODO implement https://github.com/elastic/elasticsearch/issues/25929
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
} }

View file

@ -167,11 +167,6 @@ public class AnalyticsEvent implements Writeable, ToXContentObject {
&& payloadAsMap().equals(that.payloadAsMap()); && payloadAsMap().equals(that.payloadAsMap());
} }
@Override
public boolean isFragment() {
return false;
}
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(eventCollectionName, eventTime, xContentType, payloadAsMap()); return Objects.hash(eventCollectionName, eventTime, xContentType, payloadAsMap());

View file

@ -18,7 +18,6 @@ import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.AllocationService;
import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry.Entry;
import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting;
@ -145,7 +144,6 @@ import java.time.Clock;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.LongSupplier; import java.util.function.LongSupplier;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -292,11 +290,6 @@ public class IndexLifecycle extends Plugin implements ActionPlugin, HealthPlugin
return components; return components;
} }
@Override
public List<Entry> getNamedWriteables() {
return Collections.emptyList();
}
@Override @Override
public List<NamedXContentRegistry.Entry> getNamedXContent() { public List<NamedXContentRegistry.Entry> getNamedXContent() {
return NAMED_X_CONTENT_ENTRIES; return NAMED_X_CONTENT_ENTRIES;

View file

@ -24,9 +24,7 @@ import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchModule;
import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
import org.elasticsearch.xcontent.NamedXContentRegistry;
import org.elasticsearch.xpack.core.ml.action.EvaluateDataFrameAction; import org.elasticsearch.xpack.core.ml.action.EvaluateDataFrameAction;
import org.elasticsearch.xpack.core.ml.action.GetDataFrameAnalyticsStatsAction; import org.elasticsearch.xpack.core.ml.action.GetDataFrameAnalyticsStatsAction;
import org.elasticsearch.xpack.core.ml.action.GetTrainedModelsAction; import org.elasticsearch.xpack.core.ml.action.GetTrainedModelsAction;
@ -37,14 +35,12 @@ import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsDest;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsSource; import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsSource;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.BoostedTreeParams; import org.elasticsearch.xpack.core.ml.dataframe.analyses.BoostedTreeParams;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.Classification; import org.elasticsearch.xpack.core.ml.dataframe.analyses.Classification;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.MlDataFrameAnalysisNamedXContentProvider;
import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.Accuracy; import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.Accuracy;
import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.AucRoc; import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.AucRoc;
import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.MulticlassConfusionMatrix; import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.MulticlassConfusionMatrix;
import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.PerClassSingleValue; import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.PerClassSingleValue;
import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.Precision; import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.Precision;
import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.Recall; import org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification.Recall;
import org.elasticsearch.xpack.core.ml.inference.MlInferenceNamedXContentProvider;
import org.elasticsearch.xpack.core.ml.inference.TrainedModelConfig; import org.elasticsearch.xpack.core.ml.inference.TrainedModelConfig;
import org.elasticsearch.xpack.core.ml.inference.preprocessing.OneHotEncoding; import org.elasticsearch.xpack.core.ml.inference.preprocessing.OneHotEncoding;
import org.elasticsearch.xpack.core.ml.inference.preprocessing.PreProcessor; import org.elasticsearch.xpack.core.ml.inference.preprocessing.PreProcessor;
@ -118,15 +114,6 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase {
cleanUp(); cleanUp();
} }
@Override
protected NamedXContentRegistry xContentRegistry() {
SearchModule searchModule = new SearchModule(Settings.EMPTY, Collections.emptyList());
List<NamedXContentRegistry.Entry> entries = new ArrayList<>(searchModule.getNamedXContents());
entries.addAll(new MlInferenceNamedXContentProvider().getNamedXContentParsers());
entries.addAll(new MlDataFrameAnalysisNamedXContentProvider().getNamedXContentParsers());
return new NamedXContentRegistry(entries);
}
public void testSingleNumericFeatureAndMixedTrainingAndNonTrainingRows() throws Exception { public void testSingleNumericFeatureAndMixedTrainingAndNonTrainingRows() throws Exception {
initialize("classification_single_numeric_feature_and_mixed_data_set"); initialize("classification_single_numeric_feature_and_mixed_data_set");
String predictedClassField = KEYWORD_FIELD + "_prediction"; String predictedClassField = KEYWORD_FIELD + "_prediction";

View file

@ -19,16 +19,12 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.Strings; import org.elasticsearch.core.Strings;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchModule;
import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
import org.elasticsearch.xcontent.NamedXContentRegistry;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig; import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsDest; import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsDest;
import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsSource; import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsSource;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.BoostedTreeParams; import org.elasticsearch.xpack.core.ml.dataframe.analyses.BoostedTreeParams;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.MlDataFrameAnalysisNamedXContentProvider;
import org.elasticsearch.xpack.core.ml.dataframe.analyses.Regression; import org.elasticsearch.xpack.core.ml.dataframe.analyses.Regression;
import org.elasticsearch.xpack.core.ml.inference.MlInferenceNamedXContentProvider;
import org.elasticsearch.xpack.core.ml.inference.preprocessing.FrequencyEncoding; import org.elasticsearch.xpack.core.ml.inference.preprocessing.FrequencyEncoding;
import org.elasticsearch.xpack.core.ml.inference.preprocessing.Multi; import org.elasticsearch.xpack.core.ml.inference.preprocessing.Multi;
import org.elasticsearch.xpack.core.ml.inference.preprocessing.NGram; import org.elasticsearch.xpack.core.ml.inference.preprocessing.NGram;
@ -41,7 +37,6 @@ import org.junit.Before;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -91,15 +86,6 @@ public class DataFrameAnalysisCustomFeatureIT extends MlNativeDataFrameAnalytics
); );
} }
@Override
protected NamedXContentRegistry xContentRegistry() {
SearchModule searchModule = new SearchModule(Settings.EMPTY, Collections.emptyList());
List<NamedXContentRegistry.Entry> entries = new ArrayList<>(searchModule.getNamedXContents());
entries.addAll(new MlInferenceNamedXContentProvider().getNamedXContentParsers());
entries.addAll(new MlDataFrameAnalysisNamedXContentProvider().getNamedXContentParsers());
return new NamedXContentRegistry(entries);
}
public void testNGramCustomFeature() throws Exception { public void testNGramCustomFeature() throws Exception {
initialize("test_ngram_feature_processor"); initialize("test_ngram_feature_processor");
String predictedClassField = NUMERICAL_FIELD + "_prediction"; String predictedClassField = NUMERICAL_FIELD + "_prediction";

View file

@ -65,19 +65,6 @@ public class NativeAnalyticsProcess extends AbstractNativeAnalyticsProcess<Analy
return NAME; return NAME;
} }
@Override
public void persistState() {
// Nothing to persist
}
@Override
public void persistState(long snapshotTimestamp, String snapshotId, String snapshotDescription) {}
@Override
public void writeEndOfDataMessage() throws IOException {
new AnalyticsControlMessageWriter(recordWriter(), numberOfFields()).writeEndOfData();
}
@Override @Override
public AnalyticsProcessConfig getConfig() { public AnalyticsProcessConfig getConfig() {
return config; return config;

View file

@ -168,8 +168,6 @@ public class MonitoringServiceTests extends ESTestCase {
@Override @Override
protected void doStop() {} protected void doStop() {}
@Override
protected void doClose() {}
} }
class BlockingExporter extends CountingExporter { class BlockingExporter extends CountingExporter {
@ -193,13 +191,5 @@ public class MonitoringServiceTests extends ESTestCase {
} }
@Override
protected void doStart() {}
@Override
protected void doStop() {}
@Override
protected void doClose() {}
} }
} }

View file

@ -71,11 +71,6 @@ public class Literal extends LeafExpression {
return Objects.hash(dataType, value); return Objects.hash(dataType, value);
} }
@Override
protected Expression canonicalize() {
return this;
}
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) { if (this == obj) {

View file

@ -83,11 +83,6 @@ public class Order extends Expression {
return nulls; return nulls;
} }
@Override
public boolean foldable() {
return false;
}
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(child, direction, nulls); return Objects.hash(child, direction, nulls);

View file

@ -94,11 +94,6 @@ public class RRFRankCoordinatorCanMatchIT extends ESIntegTestCase {
return 5; return 5;
} }
@Override
protected int minimumNumberOfReplicas() {
return 0;
}
@Override @Override
protected int maximumNumberOfReplicas() { protected int maximumNumberOfReplicas() {
return 0; return 0;

View file

@ -48,11 +48,6 @@ public class RRFRankMultiShardIT extends ESIntegTestCase {
return 7; return 7;
} }
@Override
protected int minimumNumberOfReplicas() {
return 0;
}
@Override @Override
protected int maximumNumberOfReplicas() { protected int maximumNumberOfReplicas() {
return 0; return 0;

View file

@ -106,11 +106,6 @@ public class RRFRankShardCanMatchIT extends ESIntegTestCase {
return 5; return 5;
} }
@Override
protected int minimumNumberOfReplicas() {
return 0;
}
@Override @Override
protected int maximumNumberOfReplicas() { protected int maximumNumberOfReplicas() {
return 0; return 0;

View file

@ -12,9 +12,7 @@ import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.client.internal.Client; import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.cluster.routing.allocation.AllocationService;
import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.scheduler.SchedulerEngine; import org.elasticsearch.common.scheduler.SchedulerEngine;
import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.IndexScopedSettings;
@ -22,22 +20,15 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.common.settings.SettingsModule; import org.elasticsearch.common.settings.SettingsModule;
import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.env.Environment;
import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.persistent.PersistentTasksExecutor; import org.elasticsearch.persistent.PersistentTasksExecutor;
import org.elasticsearch.plugins.ActionPlugin; import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.PersistentTaskPlugin; import org.elasticsearch.plugins.PersistentTaskPlugin;
import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.repositories.RepositoriesService;
import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestHandler; import org.elasticsearch.rest.RestHandler;
import org.elasticsearch.script.ScriptService;
import org.elasticsearch.threadpool.ExecutorBuilder; import org.elasticsearch.threadpool.ExecutorBuilder;
import org.elasticsearch.threadpool.FixedExecutorBuilder; import org.elasticsearch.threadpool.FixedExecutorBuilder;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.tracing.Tracer;
import org.elasticsearch.watcher.ResourceWatcherService;
import org.elasticsearch.xcontent.NamedXContentRegistry;
import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction; import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction;
import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction; import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction;
import org.elasticsearch.xpack.core.downsample.DownsampleAction; import org.elasticsearch.xpack.core.downsample.DownsampleAction;
@ -74,13 +65,10 @@ import org.elasticsearch.xpack.rollup.rest.RestStopRollupJobAction;
import java.time.Clock; import java.time.Clock;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
import static java.util.Collections.emptyList;
public class Rollup extends Plugin implements ActionPlugin, PersistentTaskPlugin { public class Rollup extends Plugin implements ActionPlugin, PersistentTaskPlugin {
// Introduced in ES version 6.3 // Introduced in ES version 6.3
@ -103,25 +91,6 @@ public class Rollup extends Plugin implements ActionPlugin, PersistentTaskPlugin
this.settings = settings; this.settings = settings;
} }
@Override
public Collection<Object> createComponents(
Client client,
ClusterService clusterService,
ThreadPool threadPool,
ResourceWatcherService resourceWatcherService,
ScriptService scriptService,
NamedXContentRegistry xContentRegistry,
Environment environment,
NodeEnvironment nodeEnvironment,
NamedWriteableRegistry namedWriteableRegistry,
IndexNameExpressionResolver expressionResolver,
Supplier<RepositoriesService> repositoriesServiceSupplier,
Tracer tracer,
AllocationService allocationService
) {
return emptyList();
}
@Override @Override
public List<RestHandler> getRestHandlers( public List<RestHandler> getRestHandlers(
Settings unused, Settings unused,

View file

@ -39,11 +39,6 @@ public class PutJobActionRequestTests extends AbstractXContentSerializingTestCas
return Request::new; return Request::new;
} }
@Override
protected boolean supportsUnknownFields() {
return false;
}
@Override @Override
protected Request doParseInstance(XContentParser parser) throws IOException { protected Request doParseInstance(XContentParser parser) throws IOException {
return Request.fromXContent(parser, jobId); return Request.fromXContent(parser, jobId);

View file

@ -79,11 +79,6 @@ public class ClearRolesCacheTests extends NativeRealmIntegTestCase {
} }
} }
@Override
protected boolean addMockHttpTransport() {
return false; // enable http
}
public void testModifyingViaApiClearsCache() throws Exception { public void testModifyingViaApiClearsCache() throws Exception {
final TestSecurityClient securityClient = new TestSecurityClient(getRestClient(), SECURITY_REQUEST_OPTIONS); final TestSecurityClient securityClient = new TestSecurityClient(getRestClient(), SECURITY_REQUEST_OPTIONS);
int modifiedRolesCount = randomIntBetween(1, roles.length); int modifiedRolesCount = randomIntBetween(1, roles.length);

View file

@ -133,8 +133,4 @@ public class FileSettingsRoleMappingsStartupIT extends SecurityIntegTestCase {
); );
} }
@Override
protected boolean addMockTransportService() {
return false; // security has its own transport service
}
} }

View file

@ -51,11 +51,6 @@ public class ReservedRealmIntegTests extends NativeRealmIntegTestCase {
return settings; return settings;
} }
@Override
protected boolean addMockHttpTransport() {
return false;
}
public void testAuthenticate() { public void testAuthenticate() {
final List<String> usernames = Arrays.asList( final List<String> usernames = Arrays.asList(
ElasticUser.NAME, ElasticUser.NAME,

View file

@ -672,19 +672,7 @@ public class SetupPasswordToolTests extends CommandTestCase {
} }
private Command getSetupPasswordCommandWithKeyStore(KeyStoreWrapper keyStore) { private Command getSetupPasswordCommandWithKeyStore(KeyStoreWrapper keyStore) {
return new SetupPasswordTool(env -> httpClient, (e) -> keyStore) { return new SetupPasswordTool(env -> httpClient, (e) -> keyStore);
@Override
protected AutoSetup newAutoSetup() {
return new AutoSetup();
}
@Override
protected InteractiveSetup newInteractiveSetup() {
return new InteractiveSetup();
}
};
} }

View file

@ -758,12 +758,7 @@ public class BlobAnalyzeAction extends ActionType<BlobAnalyzeAction.Response> {
@Override @Override
public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) { public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers) { return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers);
@Override
public boolean shouldCancelChildrenOnCancellation() {
return true;
}
};
} }
public String getRepositoryName() { public String getRepositoryName() {

View file

@ -8,7 +8,6 @@ package org.elasticsearch.xpack.spatial.search.aggregations;
import org.apache.lucene.geo.GeoEncodingUtils; import org.apache.lucene.geo.GeoEncodingUtils;
import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersion;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.search.aggregations.AggregationReduceContext; import org.elasticsearch.search.aggregations.AggregationReduceContext;
@ -209,11 +208,6 @@ public class InternalGeoLine extends InternalAggregation implements GeoShapeMetr
} }
} }
@Override
public String toString() {
return Strings.toString(this);
}
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(super.hashCode(), Arrays.hashCode(line), Arrays.hashCode(sortVals), complete, includeSorts, sortOrder, size); return Objects.hash(super.hashCode(), Arrays.hashCode(line), Arrays.hashCode(sortVals), complete, includeSorts, sortOrder, size);

View file

@ -415,11 +415,6 @@ public class GeoShapeWithDocValuesFieldMapperTests extends GeoFieldMapperTests {
return toXContentString(mapper, true); return toXContentString(mapper, true);
} }
@Override
protected void assertSearchable(MappedFieldType fieldType) {
}
@Override @Override
protected Object generateRandomInputValue(MappedFieldType ft) { protected Object generateRandomInputValue(MappedFieldType ft) {
assumeFalse("Test implemented in a follow up", true); assumeFalse("Test implemented in a follow up", true);

View file

@ -73,11 +73,6 @@ public class JdbcDocCsvSpecIT extends SpecBaseIntegrationTestCase {
JdbcAssert.assertResultSets(expected, elastic, log, true, true); JdbcAssert.assertResultSets(expected, elastic, log, true, true);
} }
@Override
protected boolean logEsResultSet() {
return false;
}
@Override @Override
protected final void doTest() throws Throwable { protected final void doTest() throws Throwable {
try (Connection csv = csvConnection(testCase); Connection es = esJdbc()) { try (Connection csv = csvConnection(testCase); Connection es = esJdbc()) {

View file

@ -10,8 +10,6 @@ import org.elasticsearch.xpack.ql.expression.Expression;
import org.elasticsearch.xpack.ql.expression.function.aggregate.EnclosedAgg; import org.elasticsearch.xpack.ql.expression.function.aggregate.EnclosedAgg;
import org.elasticsearch.xpack.ql.tree.NodeInfo; import org.elasticsearch.xpack.ql.tree.NodeInfo;
import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.tree.Source;
import org.elasticsearch.xpack.ql.type.DataType;
import org.elasticsearch.xpack.ql.type.DataTypes;
import java.util.List; import java.util.List;
@ -39,8 +37,4 @@ public class Avg extends NumericAggregate implements EnclosedAgg {
return "avg"; return "avg";
} }
@Override
public DataType dataType() {
return DataTypes.DOUBLE;
}
} }

View file

@ -10,8 +10,6 @@ package org.elasticsearch.xpack.sql.expression.function.aggregate;
import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.expression.Expression;
import org.elasticsearch.xpack.ql.tree.NodeInfo; import org.elasticsearch.xpack.ql.tree.NodeInfo;
import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.tree.Source;
import org.elasticsearch.xpack.ql.type.DataType;
import org.elasticsearch.xpack.ql.type.DataTypes;
import java.util.List; import java.util.List;
@ -21,11 +19,6 @@ public class MedianAbsoluteDeviation extends NumericAggregate {
super(source, field); super(source, field);
} }
@Override
public DataType dataType() {
return DataTypes.DOUBLE;
}
@Override @Override
public Expression replaceChildren(List<Expression> newChildren) { public Expression replaceChildren(List<Expression> newChildren) {
return new MedianAbsoluteDeviation(source(), newChildren.get(0)); return new MedianAbsoluteDeviation(source(), newChildren.get(0));

View file

@ -159,11 +159,6 @@ abstract class PercentileAggregate extends NumericAggregate implements EnclosedA
return methodParameter; return methodParameter;
} }
@Override
public DataType dataType() {
return DataTypes.DOUBLE;
}
@Override @Override
public String innerName() { public String innerName() {
Double value = (Double) SqlDataTypeConverter.convert(Foldables.valueOf(parameter), DataTypes.DOUBLE); Double value = (Double) SqlDataTypeConverter.convert(Foldables.valueOf(parameter), DataTypes.DOUBLE);

View file

@ -48,11 +48,6 @@ abstract class BaseDateTimeFunction extends UnaryScalarFunction {
return field().foldable(); return field().foldable();
} }
@Override
public Object fold() {
return makeProcessor().process(field().fold());
}
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(getClass(), field(), zoneId()); return Objects.hash(getClass(), field(), zoneId());

View file

@ -7,7 +7,6 @@
package org.elasticsearch.xpack.sql.execution.search; package org.elasticsearch.xpack.sql.execution.search;
import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersion;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.io.stream.Writeable.Reader;
import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.xpack.ql.execution.search.extractor.ConstantExtractorTests; import org.elasticsearch.xpack.ql.execution.search.extractor.ConstantExtractorTests;
@ -60,11 +59,6 @@ public class SearchHitCursorTests extends AbstractSqlWireSerializingTestCase<Sea
); );
} }
@Override
protected NamedWriteableRegistry getNamedWriteableRegistry() {
return new NamedWriteableRegistry(Cursors.getNamedWriteables());
}
@Override @Override
protected SearchHitCursor createTestInstance() { protected SearchHitCursor createTestInstance() {
return randomSearchHitCursor(); return randomSearchHitCursor();

View file

@ -7,7 +7,6 @@
package org.elasticsearch.xpack.sql.session; package org.elasticsearch.xpack.sql.session;
import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersion;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.xpack.sql.AbstractSqlWireSerializingTestCase; import org.elasticsearch.xpack.sql.AbstractSqlWireSerializingTestCase;
import org.elasticsearch.xpack.sql.plugin.CursorTests; import org.elasticsearch.xpack.sql.plugin.CursorTests;
@ -35,11 +34,6 @@ public class ListCursorTests extends AbstractSqlWireSerializingTestCase<ListCurs
return new ListCursor(instance.data(), randomValueOtherThan(instance.pageSize(), () -> between(1, 20)), instance.columnCount()); return new ListCursor(instance.data(), randomValueOtherThan(instance.pageSize(), () -> between(1, 20)), instance.columnCount());
} }
@Override
protected NamedWriteableRegistry getNamedWriteableRegistry() {
return new NamedWriteableRegistry(Cursors.getNamedWriteables());
}
@Override @Override
protected ListCursor createTestInstance() { protected ListCursor createTestInstance() {
return randomPagingListCursor(); return randomPagingListCursor();

View file

@ -12,8 +12,6 @@ import org.apache.http.entity.StringEntity;
import org.elasticsearch.client.Request; import org.elasticsearch.client.Request;
import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.core.CheckedRunnable; import org.elasticsearch.core.CheckedRunnable;
import org.elasticsearch.core.TimeValue; import org.elasticsearch.core.TimeValue;
@ -25,13 +23,11 @@ import org.junit.Before;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.nio.charset.StandardCharsets;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.time.Instant; import java.time.Instant;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Base64;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -543,10 +539,4 @@ public class TransformContinuousIT extends TransformRestTestCase {
} }
} }
@Override
protected Settings restClientSettings() {
final String token = "Basic "
+ Base64.getEncoder().encodeToString(("x_pack_rest_user:x-pack-test-password").getBytes(StandardCharsets.UTF_8));
return Settings.builder().put(ThreadContext.PREFIX + ".Authorization", token).build();
}
} }

View file

@ -164,11 +164,6 @@ public class TransformIndexerFailureHandlingTests extends ESTestCase {
listener.onResponse(new TransformCheckpoint(getJobId(), timestamp, 1, Collections.emptyMap(), timestamp)); listener.onResponse(new TransformCheckpoint(getJobId(), timestamp, 1, Collections.emptyMap(), timestamp));
} }
@Override
protected String getJobId() {
return transformConfig.getId();
}
@Override @Override
protected void doNextSearch(long waitTimeInNanos, ActionListener<SearchResponse> nextPhase) { protected void doNextSearch(long waitTimeInNanos, ActionListener<SearchResponse> nextPhase) {
assert latch != null; assert latch != null;

View file

@ -46,12 +46,6 @@ public class ScheduleTriggerEngineMock extends ScheduleTriggerEngine {
return new ScheduleTrigger(scheduleRegistry.parse(context, parser)); return new ScheduleTrigger(scheduleRegistry.parse(context, parser));
} }
@Override
public ScheduleTriggerEvent parseTriggerEvent(TriggerService service, String watchId, String context, XContentParser parser)
throws IOException {
return ScheduleTriggerEvent.parse(parser, watchId, context, clock);
}
@Override @Override
public synchronized void start(Collection<Watch> jobs) { public synchronized void start(Collection<Watch> jobs) {
logger.info("starting scheduler"); logger.info("starting scheduler");