From 9511c269c6e9bce8e2020cce268693a3fedd9cf8 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Thu, 21 Apr 2016 11:06:19 -0400 Subject: [PATCH] Remove from Writeable It isn't needed any more! Hurray! Closes #17085 --- .../src/main/resources/checkstyle_suppressions.xml | 1 - .../org/elasticsearch/action/TaskOperationFailure.java | 2 +- .../allocation/ClusterAllocationExplanation.java | 2 +- .../action/admin/cluster/node/tasks/list/TaskInfo.java | 2 +- .../action/admin/cluster/stats/ClusterStatsNodes.java | 10 +++++----- .../elasticsearch/action/bulk/BulkItemResponse.java | 2 +- .../action/ingest/SimulateDocumentBaseResult.java | 2 +- .../action/ingest/SimulateDocumentResult.java | 2 +- .../action/ingest/SimulateDocumentVerboseResult.java | 2 +- .../action/ingest/SimulatePipelineResponse.java | 2 +- .../action/ingest/SimulateProcessorResult.java | 2 +- .../action/ingest/WriteableIngestDocument.java | 2 +- .../action/support/tasks/TransportTasksAction.java | 8 ++++---- .../main/java/org/elasticsearch/cluster/Diffable.java | 2 +- .../org/elasticsearch/cluster/node/DiscoveryNode.java | 2 +- .../elasticsearch/cluster/routing/UnassignedInfo.java | 2 +- .../routing/allocation/command/AllocationCommand.java | 2 +- .../java/org/elasticsearch/common/geo/GeoDistance.java | 2 +- .../org/elasticsearch/common/geo/ShapeRelation.java | 2 +- .../org/elasticsearch/common/geo/SpatialStrategy.java | 2 +- .../common/geo/builders/ShapeBuilder.java | 2 +- .../elasticsearch/common/io/stream/NamedWriteable.java | 2 +- .../io/stream/NamedWriteableAwareStreamInput.java | 2 +- .../common/io/stream/NamedWriteableRegistry.java | 1 - .../elasticsearch/common/io/stream/StreamInput.java | 4 ++-- .../elasticsearch/common/io/stream/StreamOutput.java | 8 ++++---- .../org/elasticsearch/common/io/stream/Writeable.java | 2 +- .../common/lucene/search/function/CombineFunction.java | 2 +- .../search/function/FieldValueFactorFunction.java | 2 +- .../search/function/FiltersFunctionScoreQuery.java | 2 +- .../common/transport/TransportAddress.java | 2 +- .../org/elasticsearch/common/unit/DistanceUnit.java | 2 +- .../java/org/elasticsearch/common/unit/Fuzziness.java | 2 +- .../common/util/concurrent/ThreadContext.java | 2 +- core/src/main/java/org/elasticsearch/index/Index.java | 2 +- .../main/java/org/elasticsearch/index/VersionType.java | 2 +- .../org/elasticsearch/index/query/GeoExecType.java | 2 +- .../elasticsearch/index/query/GeoValidationMethod.java | 2 +- .../index/query/MoreLikeThisQueryBuilder.java | 2 +- .../index/query/MultiMatchQueryBuilder.java | 2 +- .../java/org/elasticsearch/index/query/Operator.java | 2 +- .../org/elasticsearch/index/query/QueryBuilder.java | 2 +- .../query/functionscore/FunctionScoreQueryBuilder.java | 2 +- .../query/functionscore/ScoreFunctionBuilder.java | 2 +- .../index/query/support/InnerHitBuilder.java | 2 +- .../index/query/support/InnerHitsBuilder.java | 2 +- .../org/elasticsearch/index/search/MatchQuery.java | 4 ++-- .../main/java/org/elasticsearch/index/store/Store.java | 2 +- .../java/org/elasticsearch/indices/TermsLookup.java | 2 +- .../java/org/elasticsearch/ingest/IngestStats.java | 4 ++-- .../java/org/elasticsearch/ingest/core/IngestInfo.java | 2 +- .../org/elasticsearch/ingest/core/ProcessorInfo.java | 2 +- .../java/org/elasticsearch/search/DocValueFormat.java | 2 +- .../java/org/elasticsearch/search/MultiValueMode.java | 2 +- .../org/elasticsearch/search/SearchShardTarget.java | 2 +- .../elasticsearch/search/aggregations/Aggregator.java | 2 +- .../search/aggregations/AggregatorBuilder.java | 3 +-- .../search/aggregations/AggregatorFactories.java | 2 +- .../aggregations/bucket/filters/FiltersAggregator.java | 2 +- .../bucket/histogram/DateHistogramInterval.java | 2 +- .../aggregations/bucket/histogram/ExtendedBounds.java | 2 +- .../aggregations/bucket/range/RangeAggregator.java | 2 +- .../significant/heuristics/SignificanceHeuristic.java | 2 +- .../aggregations/bucket/terms/TermsAggregator.java | 2 +- .../bucket/terms/support/IncludeExclude.java | 2 +- .../metrics/percentiles/PercentilesMethod.java | 2 +- .../pipeline/PipelineAggregatorBuilder.java | 2 +- .../pipeline/movavg/models/MovAvgModel.java | 2 +- .../search/aggregations/support/ValueType.java | 6 +++--- .../search/builder/SearchSourceBuilder.java | 4 ++-- .../search/highlight/AbstractHighlighterBuilder.java | 3 +-- .../search/highlight/HighlightBuilder.java | 2 +- .../search/profile/InternalProfileShardResults.java | 2 +- .../elasticsearch/search/profile/ProfileResult.java | 2 +- .../search/profile/ProfileShardResult.java | 2 +- .../elasticsearch/search/rescore/QueryRescoreMode.java | 2 +- .../elasticsearch/search/rescore/RescoreBuilder.java | 2 +- .../search/searchafter/SearchAfterBuilder.java | 2 +- .../elasticsearch/search/sort/ScriptSortBuilder.java | 2 +- .../org/elasticsearch/search/sort/SortBuilder.java | 2 +- .../java/org/elasticsearch/search/sort/SortMode.java | 2 +- .../java/org/elasticsearch/search/sort/SortOrder.java | 2 +- .../java/org/elasticsearch/search/suggest/SortBy.java | 2 +- .../elasticsearch/search/suggest/SuggestBuilder.java | 2 +- .../search/suggest/SuggestionBuilder.java | 2 +- .../search/suggest/completion/FuzzyOptions.java | 2 +- .../search/suggest/completion/RegexOptions.java | 2 +- .../phrase/DirectCandidateGeneratorBuilder.java | 3 +-- .../search/suggest/phrase/PhraseSuggestionBuilder.java | 2 +- .../search/suggest/phrase/SmoothingModel.java | 2 +- .../search/suggest/term/TermSuggestionBuilder.java | 4 ++-- core/src/main/java/org/elasticsearch/tasks/Task.java | 2 +- core/src/main/java/org/elasticsearch/tasks/TaskId.java | 2 +- .../admin/cluster/node/tasks/TestTaskPlugin.java | 2 +- .../cluster/node/tasks/TransportTasksActionTests.java | 2 +- .../io/stream/AbstractWriteableEnumTestCase.java | 4 ++-- .../common/io/stream/BytesStreamsTests.java | 4 ++-- .../java/org/elasticsearch/ingest/IngestClientIT.java | 1 - 98 files changed, 114 insertions(+), 120 deletions(-) diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml index 2f64153a051..7d3322cc603 100644 --- a/buildSrc/src/main/resources/checkstyle_suppressions.xml +++ b/buildSrc/src/main/resources/checkstyle_suppressions.xml @@ -739,7 +739,6 @@ - diff --git a/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java b/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java index b1b5bc52fcf..67436f31772 100644 --- a/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java +++ b/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java @@ -37,7 +37,7 @@ import static org.elasticsearch.ExceptionsHelper.detailedMessage; * * The class is final due to serialization limitations */ -public final class TaskOperationFailure implements Writeable, ToXContent { +public final class TaskOperationFailure implements Writeable, ToXContent { private final String nodeId; diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java index e0bc99445b8..83612309841 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java @@ -40,7 +40,7 @@ import java.util.Map; * A {@code ClusterAllocationExplanation} is an explanation of why a shard may or may not be allocated to nodes. It also includes weights * for where the shard is likely to be assigned. It is an immutable class */ -public final class ClusterAllocationExplanation implements ToXContent, Writeable { +public final class ClusterAllocationExplanation implements ToXContent, Writeable { private final ShardId shard; private final boolean primary; diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskInfo.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskInfo.java index 5a155dca6db..adc3afb1bcd 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskInfo.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskInfo.java @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; * and use in APIs. Instead, immutable and streamable TaskInfo objects are used to represent * snapshot information about currently running tasks. */ -public class TaskInfo implements Writeable, ToXContent { +public class TaskInfo implements Writeable, ToXContent { private final DiscoveryNode node; diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java index 9d2a7995020..05b7753ef3a 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java @@ -48,7 +48,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -public class ClusterStatsNodes implements ToXContent, Writeable { +public class ClusterStatsNodes implements ToXContent, Writeable { private final Counts counts; private final Set versions; @@ -200,7 +200,7 @@ public class ClusterStatsNodes implements ToXContent, Writeable, ToXContent { + public static class Counts implements Writeable, ToXContent { static final String COORDINATING_ONLY = "coordinating_only"; private final int total; @@ -263,7 +263,7 @@ public class ClusterStatsNodes implements ToXContent, Writeable { + public static class OsStats implements ToXContent, Writeable { final int availableProcessors; final int allocatedProcessors; final ObjectIntHashMap names; @@ -343,7 +343,7 @@ public class ClusterStatsNodes implements ToXContent, Writeable { + public static class ProcessStats implements ToXContent, Writeable { final int count; final int cpuPercent; @@ -456,7 +456,7 @@ public class ClusterStatsNodes implements ToXContent, Writeable, ToXContent { + public static class JvmStats implements Writeable, ToXContent { private final ObjectIntHashMap versions; private final long threads; diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java index ca2c0fc9f32..512d2c505a9 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java @@ -78,7 +78,7 @@ public class BulkItemResponse implements Streamable, StatusToXContent { /** * Represents a failure. */ - public static class Failure implements Writeable, ToXContent { + public static class Failure implements Writeable, ToXContent { static final String INDEX_FIELD = "index"; static final String TYPE_FIELD = "type"; static final String ID_FIELD = "id"; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java index 590c5b546ce..d444922cfc3 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java @@ -29,7 +29,7 @@ import java.io.IOException; /** * Holds the end result of what a pipeline did to sample document provided via the simulate api. */ -public final class SimulateDocumentBaseResult implements SimulateDocumentResult { +public final class SimulateDocumentBaseResult implements SimulateDocumentResult { private final WriteableIngestDocument ingestDocument; private final Exception failure; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java index 7e7682bc250..f1ec4360635 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java @@ -21,6 +21,6 @@ package org.elasticsearch.action.ingest; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ToXContent; -public interface SimulateDocumentResult extends Writeable, ToXContent { +public interface SimulateDocumentResult extends Writeable, ToXContent { } diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java index d472cd0fe1c..21e80298185 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java @@ -30,7 +30,7 @@ import java.util.List; * Holds the result of what a pipeline did to a sample document via the simulate api, but instead of {@link SimulateDocumentBaseResult} * this result class holds the intermediate result each processor did to the sample document. */ -public final class SimulateDocumentVerboseResult implements SimulateDocumentResult { +public final class SimulateDocumentVerboseResult implements SimulateDocumentResult { private final List processorResults; public SimulateDocumentVerboseResult(List processorResults) { diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java index ad2da3e57b8..180fce7c762 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java @@ -76,7 +76,7 @@ public class SimulatePipelineResponse extends ActionResponse implements ToXConte int responsesLength = in.readVInt(); results = new ArrayList<>(); for (int i = 0; i < responsesLength; i++) { - SimulateDocumentResult simulateDocumentResult; + SimulateDocumentResult simulateDocumentResult; if (verbose) { simulateDocumentResult = new SimulateDocumentVerboseResult(in); } else { diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java index ad915eaadab..ba7ef195aad 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java @@ -29,7 +29,7 @@ import org.elasticsearch.ingest.core.IngestDocument; import java.io.IOException; -public class SimulateProcessorResult implements Writeable, ToXContent { +public class SimulateProcessorResult implements Writeable, ToXContent { private final String processorTag; private final WriteableIngestDocument ingestDocument; private final Exception failure; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java b/core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java index dd436f376c0..a0416fe8338 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.util.Map; import java.util.Objects; -final class WriteableIngestDocument implements Writeable, ToXContent { +final class WriteableIngestDocument implements Writeable, ToXContent { private final IngestDocument ingestDocument; diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java b/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java index b1bdb5b2b84..45c3a0d8620 100644 --- a/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java @@ -61,10 +61,10 @@ import java.util.function.Supplier; * The base class for transport actions that are interacting with currently running tasks. */ public abstract class TransportTasksAction< - OperationTask extends Task, - TasksRequest extends BaseTasksRequest, - TasksResponse extends BaseTasksResponse, - TaskResponse extends Writeable + OperationTask extends Task, + TasksRequest extends BaseTasksRequest, + TasksResponse extends BaseTasksResponse, + TaskResponse extends Writeable > extends HandledTransportAction { protected final ClusterName clusterName; diff --git a/core/src/main/java/org/elasticsearch/cluster/Diffable.java b/core/src/main/java/org/elasticsearch/cluster/Diffable.java index 52d325547da..b039f5e9b8b 100644 --- a/core/src/main/java/org/elasticsearch/cluster/Diffable.java +++ b/core/src/main/java/org/elasticsearch/cluster/Diffable.java @@ -27,7 +27,7 @@ import java.io.IOException; /** * Cluster state part, changes in which can be serialized */ -public interface Diffable extends Writeable { +public interface Diffable extends Writeable { /** * Returns serializable object representing differences between this and previousState diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java index 3964cd4baa2..ff37b6e6d4c 100644 --- a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java +++ b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java @@ -44,7 +44,7 @@ import static org.elasticsearch.common.transport.TransportAddressSerializers.add /** * A discovery node represents a node that is part of the cluster. */ -public class DiscoveryNode implements Writeable, ToXContent { +public class DiscoveryNode implements Writeable, ToXContent { public static boolean isLocalNode(Settings settings) { if (Node.NODE_LOCAL_SETTING.exists(settings)) { diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java b/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java index aea416e9132..92f42e2bc4f 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java @@ -40,7 +40,7 @@ import java.io.IOException; /** * Holds additional information as to why the shard is in unassigned state. */ -public class UnassignedInfo implements ToXContent, Writeable { +public class UnassignedInfo implements ToXContent, Writeable { public static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern("dateOptionalTime"); private static final TimeValue DEFAULT_DELAYED_NODE_LEFT_TIMEOUT = TimeValue.timeValueMinutes(1); diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java index 539cfdfdf0e..736018531fa 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java @@ -30,7 +30,7 @@ import java.io.IOException; /** * This interface defines the basic methods of commands for allocation */ -public interface AllocationCommand extends NamedWriteable, ToXContent { +public interface AllocationCommand extends NamedWriteable, ToXContent { interface Parser { /** * Reads an {@link AllocationCommand} of type T from a {@link XContentParser}. diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java b/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java index 317c5cad794..0eda7b92412 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java +++ b/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java @@ -38,7 +38,7 @@ import java.util.Locale; /** * Geo distance calculation. */ -public enum GeoDistance implements Writeable { +public enum GeoDistance implements Writeable { /** * Calculates distance as points on a plane. Faster, but less accurate than {@link #ARC}. */ diff --git a/core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java b/core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java index df70db54b1d..e9966834a01 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java +++ b/core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java @@ -30,7 +30,7 @@ import java.util.Locale; * Enum representing the relationship between a Query / Filter Shape and indexed Shapes * that will be used to determine if a Document should be matched or not */ -public enum ShapeRelation implements Writeable{ +public enum ShapeRelation implements Writeable { INTERSECTS("intersects"), DISJOINT("disjoint"), diff --git a/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java b/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java index c5869f98918..e1b0356b686 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java +++ b/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java @@ -27,7 +27,7 @@ import java.io.IOException; /** * */ -public enum SpatialStrategy implements Writeable { +public enum SpatialStrategy implements Writeable { TERM("term"), RECURSIVE("recursive"); diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java index a0d77d004da..adb4de83c8f 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java +++ b/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java @@ -51,7 +51,7 @@ import java.util.Locale; /** * Basic class for building GeoJSON shapes like Polygons, Linestrings, etc */ -public abstract class ShapeBuilder extends ToXContentToBytes implements NamedWriteable { +public abstract class ShapeBuilder extends ToXContentToBytes implements NamedWriteable { protected static final ESLogger LOGGER = ESLoggerFactory.getLogger(ShapeBuilder.class.getName()); diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java b/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java index 9396d50a986..f3403ecb837 100644 --- a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java +++ b/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java @@ -24,7 +24,7 @@ package org.elasticsearch.common.io.stream; * To be used for arbitrary serializable objects (e.g. queries); when reading them, their name tells * which specific object needs to be created. */ -public interface NamedWriteable extends Writeable { +public interface NamedWriteable extends Writeable { /** * Returns the name of the writeable object diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java index ccfb2bbdd8d..55da169e620 100644 --- a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java +++ b/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java @@ -34,7 +34,7 @@ public class NamedWriteableAwareStreamInput extends FilterStreamInput { } @Override - public > C readNamedWriteable(Class categoryClass) throws IOException { + public C readNamedWriteable(Class categoryClass) throws IOException { String name = readString(); Writeable.Reader reader = namedWriteableRegistry.getReader(categoryClass, name); C c = reader.read(this); diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java b/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java index 2e8fe303b29..d445c07edea 100644 --- a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java +++ b/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java @@ -36,7 +36,6 @@ public class NamedWriteableRegistry { * This method suppresses the rawtypes warning because it intentionally using NamedWriteable instead of {@code NamedWriteable} so it * is easier to use and because we might be able to drop the type parameter from NamedWriteable entirely some day. */ - @SuppressWarnings("rawtypes") public synchronized void register(Class categoryClass, String name, Writeable.Reader reader) { @SuppressWarnings("unchecked") diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java index 20171342ba8..520db360522 100644 --- a/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java +++ b/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java @@ -714,14 +714,14 @@ public abstract class StreamInput extends InputStream { * Use {@link FilterInputStream} instead which wraps a stream and supports a {@link NamedWriteableRegistry} too. */ @Nullable - public > C readNamedWriteable(@SuppressWarnings("unused") Class categoryClass) throws IOException { + public C readNamedWriteable(@SuppressWarnings("unused") Class categoryClass) throws IOException { throw new UnsupportedOperationException("can't read named writeable from StreamInput"); } /** * Reads an optional {@link NamedWriteable}. */ - public > C readOptionalNamedWriteable(Class categoryClass) throws IOException { + public C readOptionalNamedWriteable(Class categoryClass) throws IOException { if (readBoolean()) { return readNamedWriteable(categoryClass); } diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java index 3caf1183801..dabb183831e 100644 --- a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java +++ b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java @@ -544,7 +544,7 @@ public abstract class StreamOutput extends OutputStream { } } - public void writeOptionalWriteable(@Nullable Writeable writeable) throws IOException { + public void writeOptionalWriteable(@Nullable Writeable writeable) throws IOException { if (writeable != null) { writeBoolean(true); writeable.writeTo(this); @@ -675,7 +675,7 @@ public abstract class StreamOutput extends OutputStream { /** * Writes a {@link NamedWriteable} to the current stream, by first writing its name and then the object itself */ - public void writeNamedWriteable(NamedWriteable namedWriteable) throws IOException { + public void writeNamedWriteable(NamedWriteable namedWriteable) throws IOException { writeString(namedWriteable.getWriteableName()); namedWriteable.writeTo(this); } @@ -683,7 +683,7 @@ public abstract class StreamOutput extends OutputStream { /** * Write an optional {@link NamedWriteable} to the stream. */ - public void writeOptionalNamedWriteable(@Nullable NamedWriteable namedWriteable) throws IOException { + public void writeOptionalNamedWriteable(@Nullable NamedWriteable namedWriteable) throws IOException { if (namedWriteable == null) { writeBoolean(false); } else { @@ -722,7 +722,7 @@ public abstract class StreamOutput extends OutputStream { /** * Writes a list of {@link Writeable} objects */ - public > void writeList(List list) throws IOException { + public void writeList(List list) throws IOException { writeVInt(list.size()); for (T obj: list) { obj.writeTo(this); diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java b/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java index 6cd934e6291..55ab419881f 100644 --- a/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java +++ b/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java @@ -32,7 +32,7 @@ import java.io.IOException; * Prefer implementing this interface over implementing {@link Streamable} where possible. Lots of code depends on {@linkplain Streamable} * so this isn't always possible. */ -public interface Writeable { // TODO remove +public interface Writeable { /** * Write this into the {@linkplain StreamOutput}. */ diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java index e8a2ef0e8e4..e8bd2887998 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.io.stream.Writeable; import java.io.IOException; import java.util.Locale; -public enum CombineFunction implements Writeable { +public enum CombineFunction implements Writeable { MULTIPLY { @Override public float combine(double queryScore, double funcScore, double maxBoost) { diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java index 8a5f61a1b8a..3bc5542c2aa 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java @@ -125,7 +125,7 @@ public class FieldValueFactorFunction extends ScoreFunction { * The Type class encapsulates the modification types that can be applied * to the score/value product. */ - public enum Modifier implements Writeable { + public enum Modifier implements Writeable { NONE { @Override public double apply(double n) { diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java index 22b1a71a1fe..e62f3f6665a 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java @@ -75,7 +75,7 @@ public class FiltersFunctionScoreQuery extends Query { } } - public enum ScoreMode implements Writeable { + public enum ScoreMode implements Writeable { FIRST, AVG, MAX, SUM, MIN, MULTIPLY; @Override diff --git a/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java b/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java index f68bbfa0dd8..99ba37a4f60 100644 --- a/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java +++ b/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.io.stream.Writeable; /** * */ -public interface TransportAddress extends Writeable { +public interface TransportAddress extends Writeable { /** * Returns the host string for this transport address diff --git a/core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java b/core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java index b34c1101f9b..b597725726c 100644 --- a/core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java +++ b/core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java @@ -33,7 +33,7 @@ import java.io.IOException; * the earth ellipsoid defined in {@link GeoUtils}. The default unit used within * this project is METERS which is defined by DEFAULT */ -public enum DistanceUnit implements Writeable { +public enum DistanceUnit implements Writeable { INCH(0.0254, "in", "inch"), YARD(0.9144, "yd", "yards"), FEET(0.3048, "ft", "feet"), diff --git a/core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java b/core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java index afe37e221a0..8dbb949806a 100644 --- a/core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java +++ b/core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java @@ -35,7 +35,7 @@ import java.util.Objects; * parsing and conversion from similarities to edit distances * etc. */ -public final class Fuzziness implements ToXContent, Writeable { +public final class Fuzziness implements ToXContent, Writeable { public static final String X_FIELD_NAME = "fuzziness"; public static final Fuzziness ZERO = new Fuzziness(0); diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java index ef8d29be8e4..512690595ef 100644 --- a/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java +++ b/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java @@ -60,7 +60,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * * */ -public final class ThreadContext implements Closeable, Writeable { +public final class ThreadContext implements Closeable, Writeable { public static final String PREFIX = "request.headers"; public static final Setting DEFAULT_HEADERS_SETTING = Setting.groupSetting(PREFIX + ".", Property.NodeScope); diff --git a/core/src/main/java/org/elasticsearch/index/Index.java b/core/src/main/java/org/elasticsearch/index/Index.java index 0dbf522dc9a..de0cf287229 100644 --- a/core/src/main/java/org/elasticsearch/index/Index.java +++ b/core/src/main/java/org/elasticsearch/index/Index.java @@ -29,7 +29,7 @@ import java.io.IOException; /** * */ -public class Index implements Writeable { +public class Index implements Writeable { public static final Index[] EMPTY_ARRAY = new Index[0]; diff --git a/core/src/main/java/org/elasticsearch/index/VersionType.java b/core/src/main/java/org/elasticsearch/index/VersionType.java index 7cf9adf1a6a..1c88a703ba6 100644 --- a/core/src/main/java/org/elasticsearch/index/VersionType.java +++ b/core/src/main/java/org/elasticsearch/index/VersionType.java @@ -28,7 +28,7 @@ import java.io.IOException; /** * */ -public enum VersionType implements Writeable { +public enum VersionType implements Writeable { INTERNAL((byte) 0) { @Override public boolean isVersionConflictForWrites(long currentVersion, long expectedVersion, boolean deleted) { diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoExecType.java b/core/src/main/java/org/elasticsearch/index/query/GeoExecType.java index afc1ef5eebb..4dce625621b 100644 --- a/core/src/main/java/org/elasticsearch/index/query/GeoExecType.java +++ b/core/src/main/java/org/elasticsearch/index/query/GeoExecType.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.io.stream.Writeable; import java.io.IOException; /** Specifies how a geo query should be run. */ -public enum GeoExecType implements Writeable { +public enum GeoExecType implements Writeable { MEMORY(0), INDEXED(1); diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java b/core/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java index ad6775a99cd..e9828413c41 100644 --- a/core/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java +++ b/core/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java @@ -34,7 +34,7 @@ import java.io.IOException; * On IGNORE_MALFORMED invalid coordinates are being accepted. * On COERCE invalid coordinates are being corrected to the most likely valid coordinate. * */ -public enum GeoValidationMethod implements Writeable{ +public enum GeoValidationMethod implements Writeable { COERCE, IGNORE_MALFORMED, STRICT; public static final GeoValidationMethod DEFAULT = STRICT; diff --git a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java index 1e03ae20d45..c71db8c22a5 100644 --- a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java @@ -147,7 +147,7 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder { + public static final class Item implements ToXContent, Writeable { public static final Item[] EMPTY_ARRAY = new Item[0]; public interface Field { diff --git a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java index 89d6d9e055c..173acff6d00 100644 --- a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java @@ -93,7 +93,7 @@ public class MultiMatchQueryBuilder extends AbstractQueryBuilder { + public enum Type implements Writeable { /** * Uses the best matching boolean field as main score and uses diff --git a/core/src/main/java/org/elasticsearch/index/query/Operator.java b/core/src/main/java/org/elasticsearch/index/query/Operator.java index 48e671218cd..7972dbb49ad 100644 --- a/core/src/main/java/org/elasticsearch/index/query/Operator.java +++ b/core/src/main/java/org/elasticsearch/index/query/Operator.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.util.CollectionUtils; import java.io.IOException; import java.util.Locale; -public enum Operator implements Writeable { +public enum Operator implements Writeable { OR, AND; public BooleanClause.Occur toBooleanClauseOccur() { diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java index f8010e7b523..dcedd0f1d5e 100644 --- a/core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.ToXContent; import java.io.IOException; -public interface QueryBuilder> extends NamedWriteable, ToXContent { +public interface QueryBuilder> extends NamedWriteable, ToXContent { /** * Converts this QueryBuilder to a lucene {@link Query}. diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java index 49962477581..bf5b8baff81 100644 --- a/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java @@ -331,7 +331,7 @@ public class FunctionScoreQueryBuilder extends AbstractQueryBuilder { + public static class FilterFunctionBuilder implements ToXContent, Writeable { private final QueryBuilder filter; private final ScoreFunctionBuilder scoreFunction; diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java index 23df69a160b..3088a39f942 100644 --- a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java @@ -31,7 +31,7 @@ import org.elasticsearch.index.query.QueryShardContext; import java.io.IOException; import java.util.Objects; -public abstract class ScoreFunctionBuilder> implements ToXContent, NamedWriteable { +public abstract class ScoreFunctionBuilder> implements ToXContent, NamedWriteable { private Float weight; diff --git a/core/src/main/java/org/elasticsearch/index/query/support/InnerHitBuilder.java b/core/src/main/java/org/elasticsearch/index/query/support/InnerHitBuilder.java index e4553cc08b2..94307cd0b98 100644 --- a/core/src/main/java/org/elasticsearch/index/query/support/InnerHitBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/support/InnerHitBuilder.java @@ -59,7 +59,7 @@ import java.util.Optional; import static org.elasticsearch.common.xcontent.XContentParser.Token.END_OBJECT; -public final class InnerHitBuilder extends ToXContentToBytes implements Writeable { +public final class InnerHitBuilder extends ToXContentToBytes implements Writeable { public static final ParseField NAME_FIELD = new ParseField("name"); public static final ParseField NESTED_PATH_FIELD = new ParseField("path"); diff --git a/core/src/main/java/org/elasticsearch/index/query/support/InnerHitsBuilder.java b/core/src/main/java/org/elasticsearch/index/query/support/InnerHitsBuilder.java index cf8adfa3ded..64355083906 100644 --- a/core/src/main/java/org/elasticsearch/index/query/support/InnerHitsBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/support/InnerHitsBuilder.java @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -public final class InnerHitsBuilder extends ToXContentToBytes implements Writeable { +public final class InnerHitsBuilder extends ToXContentToBytes implements Writeable { private final Map innerHitsBuilders; public InnerHitsBuilder() { diff --git a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java index bb167a8ccbe..14b6e120fb7 100644 --- a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java +++ b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java @@ -48,7 +48,7 @@ import java.io.IOException; public class MatchQuery { - public static enum Type implements Writeable { + public static enum Type implements Writeable { /** * The text is analyzed and terms are added to a boolean query. */ @@ -84,7 +84,7 @@ public class MatchQuery { } } - public static enum ZeroTermsQuery implements Writeable { + public static enum ZeroTermsQuery implements Writeable { NONE(0), ALL(1); diff --git a/core/src/main/java/org/elasticsearch/index/store/Store.java b/core/src/main/java/org/elasticsearch/index/store/Store.java index d6dbe8bb14e..d3aa93b6434 100644 --- a/core/src/main/java/org/elasticsearch/index/store/Store.java +++ b/core/src/main/java/org/elasticsearch/index/store/Store.java @@ -729,7 +729,7 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref * * @see StoreFileMetaData */ - public final static class MetadataSnapshot implements Iterable, Writeable { + public final static class MetadataSnapshot implements Iterable, Writeable { private final Map metadata; public static final MetadataSnapshot EMPTY = new MetadataSnapshot(); diff --git a/core/src/main/java/org/elasticsearch/indices/TermsLookup.java b/core/src/main/java/org/elasticsearch/indices/TermsLookup.java index 26f8d3e0b67..6d334277b7e 100644 --- a/core/src/main/java/org/elasticsearch/indices/TermsLookup.java +++ b/core/src/main/java/org/elasticsearch/indices/TermsLookup.java @@ -34,7 +34,7 @@ import java.util.Objects; /** * Encapsulates the parameters needed to fetch terms. */ -public class TermsLookup implements Writeable, ToXContent { +public class TermsLookup implements Writeable, ToXContent { private String index; private final String type; private final String id; diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestStats.java b/core/src/main/java/org/elasticsearch/ingest/IngestStats.java index 7214bc3a0b0..dee806e0230 100644 --- a/core/src/main/java/org/elasticsearch/ingest/IngestStats.java +++ b/core/src/main/java/org/elasticsearch/ingest/IngestStats.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -public class IngestStats implements Writeable, ToXContent { +public class IngestStats implements Writeable, ToXContent { private final Stats totalStats; private final Map statsPerPipeline; @@ -93,7 +93,7 @@ public class IngestStats implements Writeable, ToXContent { return builder; } - public static class Stats implements Writeable, ToXContent { + public static class Stats implements Writeable, ToXContent { private final long ingestCount; private final long ingestTimeInMillis; diff --git a/core/src/main/java/org/elasticsearch/ingest/core/IngestInfo.java b/core/src/main/java/org/elasticsearch/ingest/core/IngestInfo.java index efa425c9497..1d72c6f86a1 100644 --- a/core/src/main/java/org/elasticsearch/ingest/core/IngestInfo.java +++ b/core/src/main/java/org/elasticsearch/ingest/core/IngestInfo.java @@ -31,7 +31,7 @@ import java.util.Objects; import java.util.Set; import java.util.TreeSet; -public class IngestInfo implements Writeable, ToXContent { +public class IngestInfo implements Writeable, ToXContent { private final Set processors; diff --git a/core/src/main/java/org/elasticsearch/ingest/core/ProcessorInfo.java b/core/src/main/java/org/elasticsearch/ingest/core/ProcessorInfo.java index 984123427d9..a98b446fce0 100644 --- a/core/src/main/java/org/elasticsearch/ingest/core/ProcessorInfo.java +++ b/core/src/main/java/org/elasticsearch/ingest/core/ProcessorInfo.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; -public class ProcessorInfo implements Writeable, ToXContent, Comparable { +public class ProcessorInfo implements Writeable, ToXContent, Comparable { private final String type; diff --git a/core/src/main/java/org/elasticsearch/search/DocValueFormat.java b/core/src/main/java/org/elasticsearch/search/DocValueFormat.java index 98cb388c16f..78f8460f1cc 100644 --- a/core/src/main/java/org/elasticsearch/search/DocValueFormat.java +++ b/core/src/main/java/org/elasticsearch/search/DocValueFormat.java @@ -46,7 +46,7 @@ import java.util.Objects; import java.util.concurrent.Callable; /** A formatter for values as returned by the fielddata/doc-values APIs. */ -public interface DocValueFormat extends NamedWriteable { +public interface DocValueFormat extends NamedWriteable { String format(long value); diff --git a/core/src/main/java/org/elasticsearch/search/MultiValueMode.java b/core/src/main/java/org/elasticsearch/search/MultiValueMode.java index 489ff7edc04..483426fce16 100644 --- a/core/src/main/java/org/elasticsearch/search/MultiValueMode.java +++ b/core/src/main/java/org/elasticsearch/search/MultiValueMode.java @@ -45,7 +45,7 @@ import java.util.Locale; /** * Defines what values to pick in the case a document contains multiple values for a particular field. */ -public enum MultiValueMode implements Writeable { +public enum MultiValueMode implements Writeable { /** * Pick the sum of all the values. diff --git a/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java b/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java index 6c2e876f211..9fb83227188 100644 --- a/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java +++ b/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java @@ -33,7 +33,7 @@ import java.io.IOException; /** * The target that the search request was executed on. */ -public class SearchShardTarget implements Writeable, Comparable { +public class SearchShardTarget implements Writeable, Comparable { private Text nodeId; private Text index; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java index 02641207325..426f148e38e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java @@ -102,7 +102,7 @@ public abstract class Aggregator extends BucketCollector implements Releasable { public abstract InternalAggregation buildEmptyAggregation(); /** Aggregation mode for sub aggregations. */ - public enum SubAggCollectionMode implements Writeable { + public enum SubAggCollectionMode implements Writeable { /** * Creates buckets and delegates to child aggregators in a single pass over diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java index 7b1fcba9725..159ab5a8a10 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java @@ -36,8 +36,7 @@ import java.util.Objects; /** * A factory that knows how to create an {@link Aggregator} of a specific type. */ -public abstract class AggregatorBuilder> extends ToXContentToBytes - implements NamedWriteable, ToXContent { +public abstract class AggregatorBuilder> extends ToXContentToBytes implements NamedWriteable, ToXContent { protected String name; protected Type type; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java index 6bb2dd59db9..f1236cd5cce 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java @@ -122,7 +122,7 @@ public class AggregatorFactories { } } - public static class Builder extends ToXContentToBytes implements Writeable { + public static class Builder extends ToXContentToBytes implements Writeable { private final Set names = new HashSet<>(); private final List> aggregatorBuilders = new ArrayList<>(); private final List> pipelineAggregatorBuilders = new ArrayList<>(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java index 8da2d006be6..ca071d7cfc9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java @@ -57,7 +57,7 @@ public class FiltersAggregator extends BucketsAggregator { public static final ParseField OTHER_BUCKET_FIELD = new ParseField("other_bucket"); public static final ParseField OTHER_BUCKET_KEY_FIELD = new ParseField("other_bucket_key"); - public static class KeyedFilter implements Writeable, ToXContent { + public static class KeyedFilter implements Writeable, ToXContent { private final String key; private final QueryBuilder filter; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java index d1694c4a40d..9310142aa9c 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java @@ -29,7 +29,7 @@ import java.util.Objects; /** * The interval the date histogram is based on. */ -public class DateHistogramInterval implements Writeable { +public class DateHistogramInterval implements Writeable { public static final DateHistogramInterval SECOND = new DateHistogramInterval("1s"); public static final DateHistogramInterval MINUTE = new DateHistogramInterval("1m"); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java index 59758d8c093..1c6183c59ee 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java @@ -36,7 +36,7 @@ import org.elasticsearch.search.internal.SearchContext; import java.io.IOException; import java.util.Objects; -public class ExtendedBounds implements ToXContent, Writeable { +public class ExtendedBounds implements ToXContent, Writeable { static final ParseField EXTENDED_BOUNDS_FIELD = new ParseField("extended_bounds"); static final ParseField MIN_FIELD = new ParseField("min"); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java index eeb37dfa991..6a99295f754 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java @@ -57,7 +57,7 @@ public class RangeAggregator extends BucketsAggregator { public static final ParseField RANGES_FIELD = new ParseField("ranges"); public static final ParseField KEYED_FIELD = new ParseField("keyed"); - public static class Range implements Writeable, ToXContent { + public static class Range implements Writeable, ToXContent { public static final ParseField KEY_FIELD = new ParseField("key"); public static final ParseField FROM_FIELD = new ParseField("from"); public static final ParseField TO_FIELD = new ParseField("to"); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java index 972696ba993..d2d085a2c0e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.internal.SearchContext; -public abstract class SignificanceHeuristic implements NamedWriteable, ToXContent { +public abstract class SignificanceHeuristic implements NamedWriteable, ToXContent { /** * @param subsetFreq The frequency of the term in the selected sample * @param subsetSize The size of the selected sample (typically number of docs) diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java index d1a8fcba01a..1c59711b646 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java @@ -45,7 +45,7 @@ import java.util.Set; public abstract class TermsAggregator extends BucketsAggregator { - public static class BucketCountThresholds implements Writeable, ToXContent { + public static class BucketCountThresholds implements Writeable, ToXContent { private long minDocCount; private long shardMinDocCount; private int requiredSize; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java index 9b21844834e..101291d01e1 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java @@ -58,7 +58,7 @@ import java.util.TreeSet; * Defines the include/exclude regular expression filtering for string terms aggregation. In this filtering logic, * exclusion has precedence, where the {@code include} is evaluated first and then the {@code exclude}. */ -public class IncludeExclude implements Writeable, ToXContent { +public class IncludeExclude implements Writeable, ToXContent { private static final ParseField INCLUDE_FIELD = new ParseField("include"); private static final ParseField EXCLUDE_FIELD = new ParseField("exclude"); private static final ParseField PATTERN_FIELD = new ParseField("pattern"); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java index 45e106d1929..97b8a727be3 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java @@ -28,7 +28,7 @@ import java.io.IOException; /** * An enum representing the methods for calculating percentiles */ -public enum PercentilesMethod implements Writeable { +public enum PercentilesMethod implements Writeable { /** * The TDigest method for calculating percentiles */ diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java index 6e9a1919428..bdcefa054fc 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java @@ -37,7 +37,7 @@ import java.util.Objects; * specific type. */ public abstract class PipelineAggregatorBuilder> extends ToXContentToBytes - implements NamedWriteable> { + implements NamedWriteable { /** * Field shared by many parsers. diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java index cacda969ba8..0837eca38bd 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java @@ -31,7 +31,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Map; -public abstract class MovAvgModel implements NamedWriteable, ToXContent { +public abstract class MovAvgModel implements NamedWriteable, ToXContent { /** * Should this model be fit to the data via a cost minimizing algorithm by default? diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java index 1eb2376fac9..021cdfb3a00 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java @@ -34,7 +34,7 @@ import java.io.IOException; /** * */ -public enum ValueType implements Writeable { +public enum ValueType implements Writeable { STRING((byte) 1, "string", "string", ValuesSourceType.BYTES, IndexFieldData.class, DocValueFormat.RAW), @@ -96,8 +96,8 @@ public enum ValueType implements Writeable { private final byte id; private String preferredName; - private ValueType(byte id, String description, String preferredName, ValuesSourceType valuesSourceType, Class fieldDataType, - DocValueFormat defaultFormat) { + private ValueType(byte id, String description, String preferredName, ValuesSourceType valuesSourceType, + Class fieldDataType, DocValueFormat defaultFormat) { this.id = id; this.description = description; this.preferredName = preferredName; diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index e02b508f889..d834c251e10 100644 --- a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -71,7 +71,7 @@ import java.util.Objects; * * @see org.elasticsearch.action.search.SearchRequest#source(SearchSourceBuilder) */ -public final class SearchSourceBuilder extends ToXContentToBytes implements Writeable { +public final class SearchSourceBuilder extends ToXContentToBytes implements Writeable { public static final ParseField FROM_FIELD = new ParseField("from"); public static final ParseField SIZE_FIELD = new ParseField("size"); @@ -1264,7 +1264,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ } } - public static class ScriptField implements Writeable, ToXContent { + public static class ScriptField implements Writeable, ToXContent { private final boolean ignoreFailure; private final String fieldName; diff --git a/core/src/main/java/org/elasticsearch/search/highlight/AbstractHighlighterBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/AbstractHighlighterBuilder.java index 225403d9417..e19dd33efc8 100644 --- a/core/src/main/java/org/elasticsearch/search/highlight/AbstractHighlighterBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/highlight/AbstractHighlighterBuilder.java @@ -46,8 +46,7 @@ import static org.elasticsearch.common.xcontent.ObjectParser.fromList; * This abstract class holds parameters shared by {@link HighlightBuilder} and {@link HighlightBuilder.Field} * and provides the common setters, equality, hashCode calculation and common serialization */ -public abstract class AbstractHighlighterBuilder> extends ToXContentToBytes - implements Writeable { +public abstract class AbstractHighlighterBuilder> extends ToXContentToBytes implements Writeable { public static final ParseField PRE_TAGS_FIELD = new ParseField("pre_tags"); public static final ParseField POST_TAGS_FIELD = new ParseField("post_tags"); public static final ParseField FIELDS_FIELD = new ParseField("fields"); diff --git a/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java index d24d3f67a5d..046bea64c91 100644 --- a/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java @@ -494,7 +494,7 @@ public class HighlightBuilder extends AbstractHighlighterBuilder { + public enum Order implements Writeable { NONE, SCORE; public static Order readFromStream(StreamInput in) throws IOException { diff --git a/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java b/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java index 20471c2fb62..5aa42c45da3 100644 --- a/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java +++ b/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * A container class to hold all the profile results across all shards. Internally * holds a map of shard ID -> Profiled results */ -public final class InternalProfileShardResults implements Writeable, ToXContent{ +public final class InternalProfileShardResults implements Writeable, ToXContent{ private Map> shardResults; diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java b/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java index c756cfbaf10..dc47f982a3c 100644 --- a/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java +++ b/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java @@ -43,7 +43,7 @@ import java.util.Map; * Each InternalProfileResult has a List of InternalProfileResults, which will contain * "children" queries if applicable */ -final class ProfileResult implements Writeable, ToXContent { +final class ProfileResult implements Writeable, ToXContent { private static final ParseField QUERY_TYPE = new ParseField("query_type"); private static final ParseField LUCENE_DESCRIPTION = new ParseField("lucene"); diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java b/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java index 06fe2164a1d..1353bb505ee 100644 --- a/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java +++ b/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java @@ -34,7 +34,7 @@ import java.util.List; * A container class to hold the profile results for a single shard in the request. * Contains a list of query profiles, a collector tree and a total rewrite tree. */ -public final class ProfileShardResult implements Writeable, ToXContent { +public final class ProfileShardResult implements Writeable, ToXContent { private final List profileResults; diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java b/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java index 959bd51270b..70718b56c0c 100644 --- a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java +++ b/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.io.stream.Writeable; import java.io.IOException; import java.util.Locale; -public enum QueryRescoreMode implements Writeable { +public enum QueryRescoreMode implements Writeable { Avg { @Override public float combine(float primary, float secondary) { diff --git a/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java b/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java index 5b33769af44..e29e7dcd6e9 100644 --- a/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java @@ -38,7 +38,7 @@ import java.util.Objects; /** * The abstract base builder for instances of {@link RescoreBuilder}. */ -public abstract class RescoreBuilder> extends ToXContentToBytes implements NamedWriteable { +public abstract class RescoreBuilder> extends ToXContentToBytes implements NamedWriteable { protected Integer windowSize; diff --git a/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java b/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java index 70e9600e5d4..6d72efdf368 100644 --- a/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java @@ -46,7 +46,7 @@ import java.util.Objects; /** * */ -public class SearchAfterBuilder implements ToXContent, Writeable { +public class SearchAfterBuilder implements ToXContent, Writeable { public static final ParseField SEARCH_AFTER = new ParseField("search_after"); private static final Object[] EMPTY_SORT_VALUES = new Object[0]; diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java index 5c58d10b67f..e6a12421336 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java @@ -396,7 +396,7 @@ public class ScriptSortBuilder extends SortBuilder { return NAME; } - public enum ScriptSortType implements Writeable { + public enum ScriptSortType implements Writeable { /** script sort for a string value **/ STRING, /** script sort for a numeric value **/ diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java index 4bd708d9af9..805d6e90c47 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java @@ -48,7 +48,7 @@ import static java.util.Collections.unmodifiableMap; /** * */ -public abstract class SortBuilder> extends ToXContentToBytes implements NamedWriteable { +public abstract class SortBuilder> extends ToXContentToBytes implements NamedWriteable { protected SortOrder order = SortOrder.ASC; public static final ParseField ORDER_FIELD = new ParseField("order"); diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortMode.java b/core/src/main/java/org/elasticsearch/search/sort/SortMode.java index c6b3e1b10b4..21495798a89 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/SortMode.java +++ b/core/src/main/java/org/elasticsearch/search/sort/SortMode.java @@ -38,7 +38,7 @@ import java.util.Objects; *
  • median - Use the median of all values as sort value. Only applicable for number based array fields.
    • * */ -public enum SortMode implements Writeable { +public enum SortMode implements Writeable { /** pick the lowest value **/ MIN, /** pick the highest value **/ diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java b/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java index a84a456775b..cd0a3bb6d46 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java @@ -31,7 +31,7 @@ import java.util.Locale; * * */ -public enum SortOrder implements Writeable { +public enum SortOrder implements Writeable { /** * Ascending order. */ diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java b/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java index bab2b1ce61f..3cd19c5c2fb 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java @@ -30,7 +30,7 @@ import java.util.Objects; /** * An enum representing the valid sorting options */ -public enum SortBy implements Writeable { +public enum SortBy implements Writeable { /** Sort should first be based on score, then document frequency and then the term itself. */ SCORE, /** Sort should first be based on document frequency, then score and then the term itself. */ diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java index 6095a4de70f..332d18f256d 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java @@ -46,7 +46,7 @@ import java.util.Objects; * Suggesting works by suggesting terms/phrases that appear in the suggest text that are similar compared * to the terms in provided text. These suggestions are based on several options described in this class. */ -public class SuggestBuilder extends ToXContentToBytes implements Writeable { +public class SuggestBuilder extends ToXContentToBytes implements Writeable { protected static final ParseField GLOBAL_TEXT_FIELD = new ParseField("text"); private String globalText; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java index c38febab323..59555e049c2 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java @@ -43,7 +43,7 @@ import java.util.Objects; /** * Base class for the different suggestion implementations. */ -public abstract class SuggestionBuilder> extends ToXContentToBytes implements NamedWriteable { +public abstract class SuggestionBuilder> extends ToXContentToBytes implements NamedWriteable { protected final String field; protected String text; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java index 2977e8ad9a2..1187754d151 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java @@ -39,7 +39,7 @@ import java.util.Objects; /** * Fuzzy options for completion suggester */ -public class FuzzyOptions implements ToXContent, Writeable { +public class FuzzyOptions implements ToXContent, Writeable { static final ParseField FUZZY_OPTIONS = new ParseField("fuzzy"); private static final ParseField TRANSPOSITION_FIELD = new ParseField("transpositions"); private static final ParseField MIN_LENGTH_FIELD = new ParseField("min_length"); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java index 59ca2a6da14..a9209044c8b 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java @@ -38,7 +38,7 @@ import java.io.IOException; /** * Regular expression options for completion suggester */ -public class RegexOptions implements ToXContent, Writeable { +public class RegexOptions implements ToXContent, Writeable { static final ParseField REGEX_OPTIONS = new ParseField("regex"); private static final ParseField FLAGS_VALUE = new ParseField("flags", "flags_value"); private static final ParseField MAX_DETERMINIZED_STATES = new ParseField("max_determinized_states"); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java index 0d4e269a5c4..fb59f2eddb0 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java @@ -40,8 +40,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -public final class DirectCandidateGeneratorBuilder - implements CandidateGenerator { +public final class DirectCandidateGeneratorBuilder implements CandidateGenerator { private static final String TYPE = "direct_generator"; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java index 2d625e3e5de..ce9dc746008 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java @@ -708,7 +708,7 @@ public class PhraseSuggestionBuilder extends SuggestionBuilder, ToXContent { + public interface CandidateGenerator extends Writeable, ToXContent { String getType(); PhraseSuggestionContext.DirectCandidateGenerator build(MapperService mapperService) throws IOException; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java index f20d498d0d5..0f55c9ed8fe 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java @@ -30,7 +30,7 @@ import org.elasticsearch.search.suggest.phrase.WordScorer.WordScorerFactory; import java.io.IOException; -public abstract class SmoothingModel implements NamedWriteable, ToXContent { +public abstract class SmoothingModel implements NamedWriteable, ToXContent { @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java index 41a6e61301c..d7ec7e6cae7 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java @@ -491,7 +491,7 @@ public class TermSuggestionBuilder extends SuggestionBuilder { + public enum SuggestMode implements Writeable { /** Only suggest terms in the suggest text that aren't in the index. This is the default. */ MISSING { @Override @@ -536,7 +536,7 @@ public class TermSuggestionBuilder extends SuggestionBuilder { + public enum StringDistanceImpl implements Writeable { /** This is the default and is based on damerau_levenshtein, but highly optimized * for comparing string distance for terms inside the index. */ INTERNAL { diff --git a/core/src/main/java/org/elasticsearch/tasks/Task.java b/core/src/main/java/org/elasticsearch/tasks/Task.java index e3eba1dd1e4..b2a756b2efd 100644 --- a/core/src/main/java/org/elasticsearch/tasks/Task.java +++ b/core/src/main/java/org/elasticsearch/tasks/Task.java @@ -135,5 +135,5 @@ public class Task { return null; } - public interface Status extends ToXContent, NamedWriteable {} + public interface Status extends ToXContent, NamedWriteable {} } diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskId.java b/core/src/main/java/org/elasticsearch/tasks/TaskId.java index 26562483c12..eaab8d16b4d 100644 --- a/core/src/main/java/org/elasticsearch/tasks/TaskId.java +++ b/core/src/main/java/org/elasticsearch/tasks/TaskId.java @@ -29,7 +29,7 @@ import java.io.IOException; /** * Task id that consists of node id and id of the task on the node */ -public final class TaskId implements Writeable { +public final class TaskId implements Writeable { public final static TaskId EMPTY_TASK_ID = new TaskId(); diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java index 547eda836cb..5ecc14a4b1a 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java @@ -322,7 +322,7 @@ public class TestTaskPlugin extends Plugin { } - public static class UnblockTestTaskResponse implements Writeable { + public static class UnblockTestTaskResponse implements Writeable { public UnblockTestTaskResponse() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java index 1dc62f85713..fca799eecee 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java @@ -187,7 +187,7 @@ public class TransportTasksActionTests extends TaskManagerTestCase { } } - static class TestTaskResponse implements Writeable { + static class TestTaskResponse implements Writeable { private final String status; diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java b/core/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java index 635e8ba1e3c..a4d15173a7c 100644 --- a/core/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java +++ b/core/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java @@ -57,7 +57,7 @@ public abstract class AbstractWriteableEnumTestCase extends ESTestCase { public abstract void testWriteTo() throws IOException; // a convenience method for testing the write of a writeable enum - protected static void assertWriteToStream(final Writeable writeableEnum, final int ordinal) throws IOException { + protected static void assertWriteToStream(final Writeable writeableEnum, final int ordinal) throws IOException { try (BytesStreamOutput out = new BytesStreamOutput()) { writeableEnum.writeTo(out); try (StreamInput in = StreamInput.wrap(out.bytes())) { @@ -67,7 +67,7 @@ public abstract class AbstractWriteableEnumTestCase extends ESTestCase { } // a convenience method for testing the read of a writeable enum - protected > void assertReadFromStream(final int ordinal, final Writeable expected) throws IOException { + protected void assertReadFromStream(final int ordinal, final Writeable expected) throws IOException { try (BytesStreamOutput out = new BytesStreamOutput()) { out.writeVInt(ordinal); try (StreamInput in = StreamInput.wrap(out.bytes())) { diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java index 071ed5a7c66..381120fdc0f 100644 --- a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java +++ b/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java @@ -431,11 +431,11 @@ public class BytesStreamsTests extends ESTestCase { endsWith(" claims to have a different name [intentionally-broken] than it was read from [test-named-writeable].")); } - private static abstract class BaseNamedWriteable implements NamedWriteable { + private static abstract class BaseNamedWriteable implements NamedWriteable { } - private static class TestNamedWriteable extends BaseNamedWriteable { + private static class TestNamedWriteable extends BaseNamedWriteable { private static final String NAME = "test-named-writeable"; diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java b/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java index 2945a6ce269..e5f20499435 100644 --- a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java +++ b/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java @@ -40,7 +40,6 @@ import org.elasticsearch.ingest.core.IngestDocument; import org.elasticsearch.node.NodeModule; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.transport.RemoteTransportException; import java.util.Collection; import java.util.Collections;