diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/common')
17 files changed, 20 insertions, 21 deletions
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 317c5cad79..0eda7b9241 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<GeoDistance> { +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 df70db54b1..e9966834a0 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<ShapeRelation>{ +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 c5869f9891..e1b0356b68 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<SpatialStrategy> { +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 a0d77d004d..adb4de83c8 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<ShapeBuilder> { +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 9396d50a98..f3403ecb83 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<T> extends Writeable<T> { +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 ccfb2bbdd8..55da169e62 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 extends NamedWriteable<?>> C readNamedWriteable(Class<C> categoryClass) throws IOException { + public <C extends NamedWriteable> C readNamedWriteable(Class<C> categoryClass) throws IOException { String name = readString(); Writeable.Reader<? extends C> 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 2e8fe303b2..d445c07ede 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<T>} 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 <T extends NamedWriteable> void register(Class<T> categoryClass, String name, Writeable.Reader<? extends T> 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 20171342ba..520db36052 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 extends NamedWriteable<?>> C readNamedWriteable(@SuppressWarnings("unused") Class<C> categoryClass) throws IOException { + public <C extends NamedWriteable> C readNamedWriteable(@SuppressWarnings("unused") Class<C> categoryClass) throws IOException { throw new UnsupportedOperationException("can't read named writeable from StreamInput"); } /** * Reads an optional {@link NamedWriteable}. */ - public <C extends NamedWriteable<?>> C readOptionalNamedWriteable(Class<C> categoryClass) throws IOException { + public <C extends NamedWriteable> C readOptionalNamedWriteable(Class<C> 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 3caf118380..dabb183831 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 <T extends Writeable<T>> void writeList(List<T> list) throws IOException { + public <T extends Writeable> void writeList(List<T> 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 6cd934e629..55ab419881 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<T> { // TODO remove <T> +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 e8a2ef0e8e..e8bd288799 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<CombineFunction> { +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 8a5f61a1b8..3bc5542c2a 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<Modifier> { + 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 22b1a71a1f..e62f3f6665 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<ScoreMode> { + 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 f68bbfa0dd..99ba37a4f6 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<TransportAddress> { +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 b34c1101f9..b597725726 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 <code>METERS</code> which is defined by <code>DEFAULT</code> */ -public enum DistanceUnit implements Writeable<DistanceUnit> { +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 afe37e221a..8dbb949806 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<Fuzziness> { +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 ef8d29be8e..512690595e 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; * </pre> * */ -public final class ThreadContext implements Closeable, Writeable<ThreadContext> { +public final class ThreadContext implements Closeable, Writeable { public static final String PREFIX = "request.headers"; public static final Setting<Settings> DEFAULT_HEADERS_SETTING = Setting.groupSetting(PREFIX + ".", Property.NodeScope); |